Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -450,7 +450,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     /**
      * 解锁 锁定标识  n
      *
-     * @param blackOrderId 坯料计划ID
+     * @param
      * @return
      */
     @Transactional
@@ -1795,16 +1795,16 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         }
 
         if (checkLevel == 2 || checkLevel == 3) {
-            //如果坯料需求的是否备料=是，并且首道工序作业的是否坯料工序=是，错误提示：工艺路线错误，首道工序作业是坯料工序，备料不能作为输入物料
+            //如果坯料需求的坯料来源=备料，并且首道工序作业的是否坯料工序=是，错误提示：备料工艺路线首道工序作业不应该包含坯料工序：{首道工序作业的工序}
             //是否备料
-            if (apsBlankOrderDo.getPreparematerial().equals("是")) {
+            if (apsBlankOrderDo.getBlankcomefrom().equals("备料")) {
                 //查询坯料计划的工序作业
                 List<ApsProcessOperationDo> processOperationList = apsProcessOperationService.list(new QueryWrapper<ApsProcessOperationDo>().lambda().eq(ApsProcessOperationDo::getBlankid, apsBlankOrderDo.getId()));
                 for (ApsProcessOperationDo processOperationDo : processOperationList) {
                     //没有前道工序作业ID
                     if (ObjectUtil.isEmpty(processOperationDo.getPreviousprocessid())) {
                         if (processOperationDo.getIfblankprocess().equals("是")) {
-                            return R.error("工艺路线错误，首道工序作业是坯料工序，备料不能作为输入物料");
+                            return R.error("备料工艺路线首道工序作业不应该包含坯料工序：" + processOperationDo.getProcess());
                         }
                         break;
                     }
@@ -2254,18 +2254,20 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 return R.error("第" + j + "个坯料计划 工艺路线输出成品" + apsBlankOrderDo.getOutputmaterial() + "与坯料输出成品" + apsBlankOrderDo.getOutputfinishproduct() + "不一致");
             }
         }
-        //如果坯料需求的是否备料=是，并且首道工序作业的是否坯料工序=是，错误提示：工艺路线错误，首道工序作业是坯料工序，备料不能作为输入物料
-        //是否备料
-        if (apsBlankOrderDo.getPreparematerial().equals("是")) {
-            //查询坯料计划的工序作业
-            List<ApsProcessOperationDo> processOperationList = apsProcessOperationService.list(new QueryWrapper<ApsProcessOperationDo>().lambda().eq(ApsProcessOperationDo::getBlankid, apsBlankOrderDo.getId()));
-            for (ApsProcessOperationDo processOperationDo : processOperationList) {
-                //没有前道工序作业ID
-                if (ObjectUtil.isEmpty(processOperationDo.getPreviousprocessid())) {
-                    if (processOperationDo.getIfblankprocess().equals("是")) {
-                        return R.error("第" + j + "个坯料计划 工艺路线错误，首道工序作业是坯料工序，备料不能作为输入物料");
+        if (checkLevel == 2 || checkLevel == 3) {
+            //如果坯料需求的坯料来源=备料，并且首道工序作业的是否坯料工序=是，错误提示：备料工艺路线首道工序作业不应该包含坯料工序：{首道工序作业的工序}
+            //是否备料
+            if (apsBlankOrderDo.getBlankcomefrom().equals("备料")) {
+                //查询坯料计划的工序作业
+                List<ApsProcessOperationDo> processOperationList = apsProcessOperationService.list(new QueryWrapper<ApsProcessOperationDo>().lambda().eq(ApsProcessOperationDo::getBlankid, apsBlankOrderDo.getId()));
+                for (ApsProcessOperationDo processOperationDo : processOperationList) {
+                    //没有前道工序作业ID
+                    if (ObjectUtil.isEmpty(processOperationDo.getPreviousprocessid())) {
+                        if (processOperationDo.getIfblankprocess().equals("是")) {
+                            return R.error("第" + j + "个坯料计划 备料工艺路线首道工序作业不应该包含坯料工序：" + processOperationDo.getProcess());
+                        }
+                        break;
                     }
-                    break;
                 }
             }
         }

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ReportCheckServiceImpl.java

@@ -625,10 +625,10 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                     // 本次取消卷数
                     int cancelQty = toBeStartedQty >= value ? value : toBeStartedQty;
                     log.debug("工序作业:{}的本次取消卷数:{}", apsProcessOperationProcessEquDo.getId(), cancelQty);
+                    // 改为取消方法更新作业输入已取消卷数
+                    apsProcessOperationDo.setInputunqualifiedroll(cancelQty + apsProcessOperationDo.getInputunqualifiedroll());
                     //取消和更新作业明细
                     apsProcessOperationService.cancelProcessOperationEqu(cancelQty, apsProcessOperationDo, apsProcessOperationProcessEquDo);
-                    // 改为取消方法更新作业输入已取消卷数
-                    apsProcessOperationDo.setInputunqualifiedroll(cancelQty+apsProcessOperationDo.getInputunqualifiedroll());
                     //取消和更新工序作业
                     cancelProcessOperationVo = new CancelProcessOperationVo();
                     cancelProcessOperationVo.setCraftrouteid(null);