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

@@ -1695,6 +1695,13 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             if (!haveProductDetail && apsProcessOutputProductDo.getPlanoutputonerollweight().compareTo(new BigDecimal(0)) > 0) {
                 return R.error("输出成品：" + apsProcessOutputProductDo.getProductname() + " 已修改或已删除，并已开工，计划输出订单重量 不能大于 0");
             }
+            //如果输出卷数不是坯料卷数的倍数，错误提示:“输出成品:{订单产品}输出卷数必须是坏料卷数的倍数”
+            if (ObjectUtil.isNotEmpty(apsProcessOutputProductDo.getPlanoutputorderroll()) && ObjectUtil.isNotEmpty(apsBlankOrderDo.getRollnum())) {
+                if (apsProcessOutputProductDo.getPlanoutputorderroll() % apsBlankOrderDo.getRollnum() != 0) {
+                    return R.error("输出成品：" + apsProcessOutputProductDo.getProductname() + " 输出卷数必须是坯料卷数的倍数");
+                }
+            }
+
             //如果输出成品技术要求的坯料外观类型是铝板或铝锭，并且长度为空，则提示：输出成品是板锭和铝板时长度必填
             if (ObjectUtil.isNotEmpty(apsProcessOutputProductDo.getBlankappearance())
                     && Arrays.asList(SaveConstans.BlankAppearanceType.ALUMINUM_PLATE, SaveConstans.BlankAppearanceType.ALUMINUM_INGOT).contains(apsProcessOutputProductDo.getBlankappearance())
@@ -2162,6 +2169,13 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 return R.error("第" + j + "个坯料计划 输出成品：" + apsProcessOutputProductDo.getProductname() + " 已修改或已删除，并已开工，计划输出订单重量 不能大于 0");
             }
 
+            //如果输出卷数不是坯料卷数的倍数，错误提示:“输出成品:{订单产品}输出卷数必须是坏料卷数的倍数”
+            if (ObjectUtil.isNotEmpty(apsProcessOutputProductDo.getPlanoutputorderroll()) && ObjectUtil.isNotEmpty(apsBlankOrderDo.getRollnum())) {
+                if (apsProcessOutputProductDo.getPlanoutputorderroll() % apsBlankOrderDo.getRollnum() != 0) {
+                    return R.error("第" + j + "个坯料计划 输出成品：" + apsProcessOutputProductDo.getProductname() + " 输出卷数必须是坯料卷数的倍数");
+                }
+            }
+
             //如果输出成品技术要求的坯料外观类型是铝板或铝锭，并且长度为空，则提示：输出成品是板锭和铝板时长度必填
             if (ObjectUtil.isNotEmpty(apsProcessOutputProductDo.getBlankappearance())
                     && Arrays.asList(SaveConstans.BlankAppearanceType.ALUMINUM_PLATE, SaveConstans.BlankAppearanceType.ALUMINUM_INGOT).contains(apsProcessOutputProductDo.getBlankappearance())

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

@@ -2039,6 +2039,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 for (ApsProcessOperationDo processOperationDo : apsProcessOperationDos) {
                     CancelProcessOperationVo cancelProcessOperationVo1 = new CancelProcessOperationVo();
                     cancelProcessOperationVo1.setCraftrouteid(craftrouteid);
+                    cancelProcessOperationVo1.setSetincancelroll(false);
+                    cancelProcessOperationVo1.setUpdatecuropration(false);
                     Integer nextCurCancelRoll = curcancelroll * processOperationDo.getPlanprocessrall() / apsProcessOperationDo.getPlanprocessrall();
                     cancelProcessOperationVo1.setCurcancelroll(nextCurCancelRoll);
                     processOperationDo.setInputunqualifiedroll(processOperationDo.getInputunqualifiedroll() + nextCurCancelRoll);
@@ -2136,8 +2138,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
     processOperationProcessEquDo：作业明细
      */
     @Transactional
-    public R cancelProcessOperationEqu(Integer curEquCancelRoll, ApsProcessOperationDo apsProcessOperationDo,
-                                       ApsProcessOperationProcessEquDo processOperationProcessEquDo) {
+    public R cancelProcessOperationEqu(Integer curEquCancelRoll, ApsProcessOperationDo apsProcessOperationDo, ApsProcessOperationProcessEquDo processOperationProcessEquDo) {
         processOperationProcessEquDo.setCancelroll(processOperationProcessEquDo.getCancelroll() + curEquCancelRoll);
         if (processOperationProcessEquDo.getPlanprocessrall() == processOperationProcessEquDo.getCancelroll()) {
             processOperationProcessEquDo.setProcessdevice("");

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsBlankOrderDo.java

@@ -315,4 +315,10 @@ public class ApsBlankOrderDo extends BaseDo {
     @TableField(value = "BLANKCOMEFROM")
     private String blankcomefrom;
 
+    /**
+     * 是否要更新工序作业1-要 0-不需要
+     */
+    @TableField(value = "UPDATEPROCESS")
+    private String updateprocess;
+
 }