jidj 5 年 前
コミット
b9e1daf0ed
共有1 個のファイルを変更した11 個の追加7 個の削除を含む
  1. 11 7
      src/main/java/com/chinaitop/depot/storage/service/impl/StorageQualitycheckServiceImpl.java

+ 11 - 7
src/main/java/com/chinaitop/depot/storage/service/impl/StorageQualitycheckServiceImpl.java

@@ -58,16 +58,20 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
58
         Integer qualityCheckId=0;
58
         Integer qualityCheckId=0;
59
 		if (qualitycheck.getId() == null) {
59
 		if (qualitycheck.getId() == null) {
60
 			qualitycheckMapper.insertSelective(qualitycheck);// 新增数据
60
 			qualitycheckMapper.insertSelective(qualitycheck);// 新增数据
61
-            qualityCheckId = qualitycheck.getId()+1;
62
-            //新增质检
63
-            qualityInspection.setQualitycheckId(qualityCheckId);
64
-            qualityInspectionMapper.insertSelective(qualityInspection);
61
+            if(qualityInspection != null){
62
+                qualityCheckId = qualitycheck.getId()+1;
63
+                //新增质检
64
+                qualityInspection.setQualitycheckId(qualityCheckId);
65
+                qualityInspectionMapper.insertSelective(qualityInspection);
66
+            }
65
         } else {
67
         } else {
66
             qualitycheckMapper.updateByPrimaryKeySelective(qualitycheck);// 修改数据
68
             qualitycheckMapper.updateByPrimaryKeySelective(qualitycheck);// 修改数据
67
-            qualityCheckId = qualitycheck.getId();
68
             //修改质检
69
             //修改质检
69
-            qualityInspection.setQualitycheckId(qualityCheckId);
70
-            qualityInspectionMapper.updateByPrimaryKeySelective(qualityInspection);
70
+            if(qualityInspection != null){
71
+                qualityCheckId = qualitycheck.getId();
72
+                qualityInspection.setQualitycheckId(qualityCheckId);
73
+                qualityInspectionMapper.updateByPrimaryKeySelective(qualityInspection);
74
+            }
71
 		}
75
 		}
72
 	}
76
 	}
73
 
77