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

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsBlankOrderDao.java

@@ -31,7 +31,11 @@ public interface ApsBlankOrderDao extends BaseMapper<ApsBlankOrderDo> {
             "where a.DELETED='0' and a.ID in (${ids}) ORDER BY b.PLANENDDATE ASC")
     List<AspCheckItemsDo> eqAscs(@Param("ids") String ids);
 
-    @Select("select a.*,b.DELIVERYDATE,b.DELIVERYTIME from aps_blank_order a LEFT JOIN aps_production_order b on a.PRODUCTIONORDERID=b.ID where a.PRODUCTIONORDERID=#{orderId} and a.DELETED='0' and b.DELETED='0'")
+    @Select("select DISTINCT a.*,b.DELIVERYDATE,b.DELIVERYTIME from aps_blank_order a LEFT JOIN aps_production_order b on a.PRODUCTIONORDERID=b.ID " +
+            "LEFT JOIN aps_process_operation c on c.BLANKID=a.ID " +
+            "where a.PRODUCTIONORDERID=#{orderId} " +
+            "and (c.LOCKMARK='n' or c.LOCKMARK is null) " +
+            "and a.DELETED='0' and b.DELETED='0' and c.DELETED='0'")
     List<ApsBlankOrderVo> getByOrderId(@Param("orderId") String orderId);
 
     @Select("select a.*,b.DELIVERYDATE,b.DELIVERYTIME from aps_blank_order a LEFT JOIN aps_production_order b on a.PRODUCTIONORDERID=b.ID \n" +

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

@@ -1698,7 +1698,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             //如果输出卷数不是坯料卷数的倍数，错误提示:“输出成品:{订单产品}输出卷数必须是坏料卷数的倍数”
             if (ObjectUtil.isNotEmpty(apsProcessOutputProductDo.getPlanoutputorderroll()) && ObjectUtil.isNotEmpty(apsBlankOrderDo.getRollnum())) {
                 if (apsProcessOutputProductDo.getPlanoutputorderroll() % apsBlankOrderDo.getRollnum() != 0) {
-                    return R.error("输出成品：" + apsProcessOutputProductDo.getProductname() + " 输出卷数必须是坏料卷数的倍数");
+                    return R.error("输出成品：" + apsProcessOutputProductDo.getProductname() + " 输出卷数必须是坯料卷数的倍数");
                 }
             }
 
@@ -2172,7 +2172,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             //如果输出卷数不是坯料卷数的倍数，错误提示:“输出成品:{订单产品}输出卷数必须是坏料卷数的倍数”
             if (ObjectUtil.isNotEmpty(apsProcessOutputProductDo.getPlanoutputorderroll()) && ObjectUtil.isNotEmpty(apsBlankOrderDo.getRollnum())) {
                 if (apsProcessOutputProductDo.getPlanoutputorderroll() % apsBlankOrderDo.getRollnum() != 0) {
-                    return R.error("第" + j + "个坯料计划 输出成品：" + apsProcessOutputProductDo.getProductname() + " 输出卷数必须是坏料卷数的倍数");
+                    return R.error("第" + j + "个坯料计划 输出成品：" + apsProcessOutputProductDo.getProductname() + " 输出卷数必须是坯料卷数的倍数");
                 }
             }
 

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;
+
 }