生产管理修改

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java

@@ -684,7 +684,7 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         yieldOrder.setReleaseDate(this.dateParse(rr.getRecdate()));
         yieldOrder.setMemo(rr.getRemark());
         yieldOrder.setReworkMemo(rr.getDetail());
-        yieldOrder.setYieldType("1".equals(part.getIsSintering()) ? YieldOrder.YIELD_TYPE_2 : YieldOrder.YIELD_TYPE_1);
+        yieldOrder.setYieldType("1".equals(part.getIsSintering()) ? YieldOrderEnum.YIELD_TYPE_2.getCode() : YieldOrderEnum.YIELD_TYPE_1.getCode());
         yieldOrder.setYpQty(rr.getAmount());
         yieldOrder.setSiteWork(Boolean.FALSE);
         yieldOrder.setPrimaryCraft(rr.getDeptcode());
@@ -706,6 +706,7 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
             yc.setYoId(yieldOrder.getId());
             yc.setMakeTeam(rp.getMakeTeam());
             yc.setOcId(rp.getOcId());
+            yc.setIsOutsource(rp.getOcId() != null && rp.getMakeTeam() == null ? Boolean.TRUE : Boolean.FALSE);
             yc.setCaId(rp.getCaId());
             yc.setPpsId(rp.getPpsId());
             yc.setHourQuota(rp.getHourQuota().doubleValue());

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

@@ -635,40 +635,6 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
     @Override
     public R fill(ReviewSheetDetailVO vo, BladeUser bladeUser) {
         log.info("ReviewSheetDetailVO vo = {}", vo.toString());
-
-        // 删除
-        if (StringUtils.isNotBlank(vo.getFaultDeleteIds())) {
-            faultService.deleteLogic(Func.toLongList(vo.getFaultDeleteIds()));
-        }
-
-        List<ReviewFault> listF = null;
-
-        if (null != vo.getFaultList() && !vo.getFaultList().isEmpty()) {
-            // 关联rsId
-            for (ReviewFaultVO voF : vo.getFaultList()) {
-                voF.setReviewSheetId(vo.getId());
-            }
-            listF = BeanUtil.copyToList(vo.getFaultList(), ReviewFault.class);
-            // 保存 或 更新
-            faultService.saveOrUpdateBatch(listF);
-        }
-
-        // 删除
-        if (StringUtils.isNotBlank(vo.getDutyDeleteIds())) {
-            dutyService.deleteLogic(Func.toLongList(vo.getDutyDeleteIds()));
-        }
-
-        List<ReviewDuty> listD = null;
-        if (null != vo.getDutyList() && !vo.getDutyList().isEmpty()) {
-            // 关联rsId
-            for (ReviewDutyVO voD : vo.getDutyList()) {
-                voD.setReviewSheetId(vo.getId());
-            }
-            listD = BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class);
-            // 保存 或 更新
-            dutyService.saveOrUpdateBatch(listD);
-        }
-
         // 审理单
         ReviewSheet rs = getById(vo.getId()); // 从数据库中查到
         log.info("ReviewSheet rs = {}", rs);
@@ -713,6 +679,39 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
         rs.setHasSaved(BaseValue.YES);
         // 处置单
         saveOrUpdate(rs);
+
+        // 删除
+        if (StringUtils.isNotBlank(vo.getFaultDeleteIds())) {
+            faultService.deleteLogic(Func.toLongList(vo.getFaultDeleteIds()));
+        }
+
+        List<ReviewFault> listF = null;
+        if (null != vo.getFaultList() && !vo.getFaultList().isEmpty()) {
+            // 关联rsId
+            for (ReviewFaultVO voF : vo.getFaultList()) {
+                voF.setReviewSheetId(rs.getId());
+            }
+            listF = BeanUtil.copyToList(vo.getFaultList(), ReviewFault.class);
+            // 保存 或 更新
+            faultService.saveOrUpdateBatch(listF);
+        }
+
+        // 删除
+        if (StringUtils.isNotBlank(vo.getDutyDeleteIds())) {
+            dutyService.deleteLogic(Func.toLongList(vo.getDutyDeleteIds()));
+        }
+
+        List<ReviewDuty> listD = null;
+        if (null != vo.getDutyList() && !vo.getDutyList().isEmpty()) {
+            // 关联rsId
+            for (ReviewDutyVO voD : vo.getDutyList()) {
+                voD.setReviewSheetId(rs.getId());
+            }
+            listD = BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class);
+            // 保存 或 更新
+            dutyService.saveOrUpdateBatch(listD);
+        }
+
         if (ReviewSheetConst.BizType.T_ERP.equals(rs.getBizType())) {
             try {
                 JSONObject responseBody = saveReviewData(rs, listD, listF, bladeUser);