生产质量检验任务修改

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml

@@ -114,7 +114,7 @@
         -- 部门
         LEFT JOIN BLADE_DEPT bl_dept on t.CREATE_DEPT = bl_dept.ID
 
-        LEFT JOIN DS_PART dp on yo.PART_CODE = dp.PART_CODE
+        LEFT JOIN DS_PART_BASICS dp on yo.PART_CODE = dp.PART_CODE
 
         WHERE (
         t.IS_DELETED = 0 and t.ID = #{q.id}

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java

@@ -360,31 +360,38 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
             // 更新 WorkPlanItem
             wpItemService.updateById(wpItemDB);
             //
-            for (WorkPlanItemDetailVO wpItemDetailVO : wpItemVO.getWpItemDetailList()) {
+
-                WorkPlanItemDetail wpItemDetail = new WorkPlanItemDetail();
+            if(null != wpItemVO.getWpItemDetailList() && wpItemVO.getWpItemDetailList().size() > 0){
-                BeanUtil.copyProperties(wpItemDetailVO, wpItemDetail);
+                for (WorkPlanItemDetailVO wpItemDetailVO : wpItemVO.getWpItemDetailList()) {
-                wpItemDetail.setWorkPlanItemId(wpItemDB.getId());
+                    WorkPlanItemDetail wpItemDetail = new WorkPlanItemDetail();
-                if (IdUtil.isValid(wpItemDetail.getId())) {
+                    BeanUtil.copyProperties(wpItemDetailVO, wpItemDetail);
-                    // 更新 WorkPlanItemDetail
+                    wpItemDetail.setWorkPlanItemId(wpItemDB.getId());
-                    wpItemDetailService.updateById(wpItemDetail);
+                    if (IdUtil.isValid(wpItemDetail.getId())) {
-                } else {
+                        // 更新 WorkPlanItemDetail
-                    // 保存
+                        wpItemDetailService.updateById(wpItemDetail);
-                    wpItemDetailService.save(wpItemDetail);
+                    } else {
+                        // 保存
+                        wpItemDetailService.save(wpItemDetail);
+                    }
                 }
             }
 
-            for (WorkPlanItemThicknessVO wpItemDetailVO : wpItemVO.getThicknessList()) {
+
-                WorkPlanThicknessDetail wpItemDetail = new WorkPlanThicknessDetail();
+            if(null != wpItemVO.getThicknessList() && wpItemVO.getThicknessList().size() > 0){
-                BeanUtil.copyProperties(wpItemDetailVO, wpItemDetail);
+                for (WorkPlanItemThicknessVO wpItemDetailVO : wpItemVO.getThicknessList()) {
-                wpItemDetail.setWorkPlanItemId(wpItemDB.getId());
+                    WorkPlanThicknessDetail wpItemDetail = new WorkPlanThicknessDetail();
-                if (IdUtil.isValid(wpItemDetail.getId())) {
+                    BeanUtil.copyProperties(wpItemDetailVO, wpItemDetail);
-                    // 更新 WorkPlanItemDetail
+                    wpItemDetail.setWorkPlanItemId(wpItemDB.getId());
-                    wpItemThicknessService.updateById(wpItemDetail);
+                    if (IdUtil.isValid(wpItemDetail.getId())) {
-                } else {
+                        // 更新 WorkPlanItemDetail
-                    // 保存
+                        wpItemThicknessService.updateById(wpItemDetail);
-                    wpItemThicknessService.save(wpItemDetail);
+                    } else {
+                        // 保存
+                        wpItemThicknessService.save(wpItemDetail);
+                    }
                 }
             }
+
         }
         //
         refreshStatusAndQty(detailVO.getId());