mengy лет назад: 5
Родитель
Сommit
2822c34192

+ 5 - 1
src/main/java/com/chinaitop/depot/storage/controller/StorageFoodbasicInfoController.java

@@ -155,7 +155,7 @@ public class StorageFoodbasicInfoController {
155
                 List<StorageQualitycheckSon> SqsList =  qualitycheckSonService.getQualitycheckSonByFoodbasicinfoCheck(list.get(0).getId());
155
                 List<StorageQualitycheckSon> SqsList =  qualitycheckSonService.getQualitycheckSonByFoodbasicinfoCheck(list.get(0).getId());
156
                 List<StorageQualitycheckInspection> SqciList =  qualitycheckInspectionService.getQualitycheckInByFoodbasicinfoCheck(list.get(0).getId());
156
                 List<StorageQualitycheckInspection> SqciList =  qualitycheckInspectionService.getQualitycheckInByFoodbasicinfoCheck(list.get(0).getId());
157
                 for(StorageQualitycheckSon sqk : SqsList){
157
                 for(StorageQualitycheckSon sqk : SqsList){
158
-                    if(sqk.getNumbering()== 6996 ){
158
+                    if(sqk.getNumbering()== 6996 || sqk.getNumbering()== 2798){
159
                         foodbasicinfo.setFatIndex(sqk.getSetValue());
159
                         foodbasicinfo.setFatIndex(sqk.getSetValue());
160
                         continue;
160
                         continue;
161
                     }
161
                     }
@@ -163,6 +163,10 @@ public class StorageFoodbasicInfoController {
163
                         foodbasicinfo.setPeroxideValue(sqk.getSetValue());
163
                         foodbasicinfo.setPeroxideValue(sqk.getSetValue());
164
                         continue;
164
                         continue;
165
                     }
165
                     }
166
+                    if(sqk.getNumbering()== 2797 ){
167
+                        foodbasicinfo.setEatScore(sqk.getSetValue());
168
+                        continue;
169
+                    }
166
                 }
170
                 }
167
                 for(StorageQualitycheckInspection sqki : SqciList){
171
                 for(StorageQualitycheckInspection sqki : SqciList){
168
                     if(sqki.getInsolubleImpurity()!=null && sqki.getInsolubleImpurity()!="" && !sqki.getInsolubleImpurity().equals("") ){
172
                     if(sqki.getInsolubleImpurity()!=null && sqki.getInsolubleImpurity()!="" && !sqki.getInsolubleImpurity().equals("") ){