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/ApsProcessOperationDao.java

@@ -91,4 +91,7 @@ public interface ApsProcessOperationDao extends BaseMapper<ApsProcessOperationDo
     @Select("SELECT CRAFTROUTEID as ID,ROUTEPRODUCTTYPEID as PRODUCTTYPE,ROUTEMETAL as METAL,ROUTEMETALSTATE as METALSTATE,ROUTETHICKSTR as THICKSTR,ROUTETHICKEND as THICKEND," +
             "ROUTEWIDTHSTR as WIDTHSTR,ROUTEWIDTHEND as WIDTHEND,ROUTELENGTHSTR as LENGTHSTR,ROUTELENGTHEND as LENGTHEND FROM aps_blank_order WHERE ID=#{newblankid}")
     ApsCraftRouteDo getApsCraftRoute(@Param("newblankid") String newblankid);
+
+    @Select("SELECT * from aps_craft_route WHERE ID=#{craftrouteid}")
+    ApsCraftRouteDo getCraftRoute(@Param("craftrouteid") String craftrouteid);
 }

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

@@ -1104,6 +1104,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
 
             //更新坯料计划的所选工艺路线相关信息
             ApsCraftRouteDo apsCraftRouteDo = apsProcessOperationDao.getApsCraftRoute(newblankid);
+            if (apsCraftRouteDo == null) {
+                apsCraftRouteDo = apsProcessOperationDao.getCraftRoute(craftrouteid);
+            }
             apsBlankOrderService.update(new LambdaUpdateWrapper<ApsBlankOrderDo>()
                     .eq(ApsBlankOrderDo::getId, blanckdata.getStr("ID"))
                     .set(ApsBlankOrderDo::getRoption, newblankid)
@@ -1328,6 +1331,12 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             List<ApsScheduleConfigDo> apsConfigs = apsScheduleConfigService.list();
             BigDecimal aluminumdensity = apsConfigs.get(0).getAluminumdensity();
 
+            String craftrouteid = params.getCraftrouteid();
+            if (craftrouteid == null) {
+                ApsBlankOrderDo apsBlankOrderDo = apsBlankOrderService.getById(params.getBlankid());
+                craftrouteid = apsBlankOrderDo.getCraftrouteid();
+            }
+
             //该坯料计划所有的工序及输出
             Map<String, Object> map = new HashMap<>();
             map.put("BLANKID", params.getBlankid());
@@ -1502,12 +1511,16 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 if (operationOutMaterDos.size() > 0) {
                     ResetProcessOperationVo resetmap = new ResetProcessOperationVo();
                     resetmap.setBlankid(params.getBlankid());
+                    resetmap.setCraftrouteid(craftrouteid);
                     resetmap.setOutmeterinfo(operationOutMaterDos);
                     resetProcessOperation(resetmap);
                 }
             }
             //更新坯料计划的所选工艺路线相关信息
             ApsCraftRouteDo apsCraftRouteDo = apsProcessOperationDao.getApsCraftRoute(params.getBlankid());
+            if (apsCraftRouteDo == null) {
+                apsCraftRouteDo = apsProcessOperationDao.getCraftRoute(craftrouteid);
+            }
             R r = new R();
             r.setCode("200");
             r.setData(apsCraftRouteDo);
@@ -1831,11 +1844,15 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             if (operationOutMaterDos.size() > 0) {
                 ResetProcessOperationVo resetmap = new ResetProcessOperationVo();
                 resetmap.setBlankid(blanckdata.getStr("ID"));
+                resetmap.setCraftrouteid(blanckdata.getStr("CRAFTROUTEID"));
                 resetmap.setOutmeterinfo(operationOutMaterDos);
                 resetProcessOperation(resetmap);
             }
             //更新坯料计划的所选工艺路线相关信息
             ApsCraftRouteDo apsCraftRouteDo = apsProcessOperationDao.getApsCraftRoute(blanckdata.getStr("ID"));
+            if (apsCraftRouteDo == null) {
+                apsCraftRouteDo = apsProcessOperationDao.getCraftRoute(blanckdata.getStr("CRAFTROUTEID"));
+            }
             R r = new R();
             r.setCode("200");
             r.setData(apsCraftRouteDo);
@@ -1968,6 +1985,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
     public R cancelProcessOperation(CancelProcessOperationVo cancelProcessOperationVo) {
         List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoList = new ArrayList<>();
         try {
+            String craftrouteid = cancelProcessOperationVo.getCraftrouteid();
             Integer curcancelroll = cancelProcessOperationVo.getCurcancelroll();//作业本次取消卷数
 
             //本道工序作业
@@ -2075,6 +2093,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 List<ApsProcessOperationDo> apsProcessOperationDos = apsProcessOperationDao.getNextProcessOperations(apsProcessOperationDo.getNextprocessid().replace(",", "','"));
                 for (ApsProcessOperationDo processOperationDo : apsProcessOperationDos) {
                     CancelProcessOperationVo cancelProcessOperationVo1 = new CancelProcessOperationVo();
+                    cancelProcessOperationVo1.setCraftrouteid(craftrouteid);
                     cancelProcessOperationVo1.setSetincancelroll(false);
                     cancelProcessOperationVo1.setUpdatecuropration(false);
                     Integer nextCurCancelRoll = (int) Math.floor((double) (curcancelroll * processOperationDo.getPlanprocessrall()) / apsProcessOperationDo.getPlanprocessrall());
@@ -2150,6 +2169,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
 
                 //更新坯料计划的所选工艺路线相关信息
                 ApsCraftRouteDo apsCraftRouteDo = apsProcessOperationDao.getApsCraftRoute(apsProcessOperationDo.getBlankid());
+                if (apsCraftRouteDo == null && StringUtils.isNotBlank(craftrouteid)) {
+                    apsCraftRouteDo = apsProcessOperationDao.getCraftRoute(craftrouteid);
+                }
                 R r = new R();
                 r.setCode("200");
                 r.setData(apsCraftRouteDo);