封仓页面,质检记录需要增加所有类型的质检信息

src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -197,8 +197,18 @@ public class StorageQualitycheckController {
                 quality = mapper.readValue(qualityJson,  new TypeReference<List<StorageQualitycheckSon>>(){});
                 for (int i = 0; i < quality.size(); i++) {
                     quality.get(i).setQualitycheckId(qualitycheck.getId());
+                    if (quality.get(i).getEnumid().equals("2783")||quality.get(i).getEnumid().equals("2791")||quality.get(i).getEnumid().equals("2799")){
+                        qualitycheck.setWater(quality.get(i).getSetValue());//主表水分-用于储粮卡查看页面上的粮情质检记录
+                    }else if(quality.get(i).getEnumid().equals("2797")||quality.get(i).getEnumid().equals("2807")||quality.get(i).getEnumid().equals("2789")){
+                        qualitycheck.setEatScore(quality.get(i).getSetValue());//品尝分
+                    }else if (quality.get(i).getEnumid().equals("2790")){
+                        qualitycheck.setGlutenWaterCount(quality.get(i).getSetValue());//面筋吸水量
+                    }else if (quality.get(i).getEnumid().equals("6996")||quality.get(i).getEnumid().equals("2798")||quality.get(i).getEnumid().equals("2808")){
+                        qualitycheck.setFatIndex(quality.get(i).getSetValue());//脂肪酸值
+                    }
                     quality.get(i).setNumbering(Integer.valueOf(quality.get(i).getEnumid()));
                     storageQualitycheckService.saveOne(quality.get(i));
+                    storageQualitycheckService.save(qualitycheck);
                 }
             }
             // 修改fileIds对应附件的bid为当前质检的id.

src/main/java/com/chinaitop/depot/storage/service/impl/StorageQualitycheckServiceImpl.java

@@ -84,38 +84,38 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
 
         List<StorageQualitycheck> list = qualitycheckMapper.getQualitycheckListByFoodbasicinfoCheck(qualitycheck);
 
-        if(list.size()>0){
-            int i = 0;
-            for(;i<list.size();i++){
-                List<StorageQualitycheckSon> QualitycheckdList =  qualitycheckSonService.selectByQualitycheckId(list.get(i).getId());
-                for(StorageQualitycheckSon qc : QualitycheckdList){
-                    if(qc.getNumbering()== 2789 ){
-                        list.get(i).setEatScore(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering() == 2790 ){
-                        list.get(i).setGlutenWaterCount(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering() == 2798 ){
-                        list.get(i).setFatIndex(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering() == 2797 ){
-                        list.get(i).setEatScore(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering() == 2796 ){
-                        list.get(i).setColorsmell(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering() == 2795 ){
-                        list.get(i).setMildewCount(qc.getSetValue());
-                        continue;
-                    }
-                }
-            }
-        }
+//        if(list.size()>0){
+//            int i = 0;
+//            for(;i<list.size();i++){
+//                List<StorageQualitycheckSon> QualitycheckdList =  qualitycheckSonService.selectByQualitycheckId(list.get(i).getId());
+//                for(StorageQualitycheckSon qc : QualitycheckdList){
+//                    if(qc.getNumbering()== 2791 ){
+//                        list.get(i).setWater(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering() == 2790 ){
+//                        list.get(i).setGlutenWaterCount(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering() == 2798 ){
+//                        list.get(i).setFatIndex(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering() == 2797 ){
+//                        list.get(i).setEatScore(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering() == 2796 ){
+//                        list.get(i).setColorsmell(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering() == 2795 ){
+//                        list.get(i).setMildewCount(qc.getSetValue());
+//                        continue;
+//                    }
+//                }
+//            }
+//        }
 		return list;
 	}