生产质量检验任务修改

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,6 +360,8 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
             // 更新 WorkPlanItem
             wpItemService.updateById(wpItemDB);
             //
+
+            if(null != wpItemVO.getWpItemDetailList() && wpItemVO.getWpItemDetailList().size() > 0){
                 for (WorkPlanItemDetailVO wpItemDetailVO : wpItemVO.getWpItemDetailList()) {
                     WorkPlanItemDetail wpItemDetail = new WorkPlanItemDetail();
                     BeanUtil.copyProperties(wpItemDetailVO, wpItemDetail);
@@ -372,7 +374,10 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
                         wpItemDetailService.save(wpItemDetail);
                     }
                 }
+            }
+
 
+            if(null != wpItemVO.getThicknessList() && wpItemVO.getThicknessList().size() > 0){
                 for (WorkPlanItemThicknessVO wpItemDetailVO : wpItemVO.getThicknessList()) {
                     WorkPlanThicknessDetail wpItemDetail = new WorkPlanThicknessDetail();
                     BeanUtil.copyProperties(wpItemDetailVO, wpItemDetail);
@@ -386,6 +391,8 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
                     }
                 }
             }
+
+        }
         //
         refreshStatusAndQty(detailVO.getId());
         return R.success("检验填报");