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

@@ -1,6 +1,7 @@
 package com.rongwei.bscommon.sys.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsCraftRouteDo;
 import com.rongwei.bsentity.domain.ApsProcessOperationDo;
 import com.rongwei.bsentity.domain.ApsProcessOperationProcessEquDo;
 import com.rongwei.bsentity.vo.ApsProcessOperationAndMaterialVo;
@@ -86,4 +87,8 @@ public interface ApsProcessOperationDao extends BaseMapper<ApsProcessOperationDo
 
     @Update("update aps_process_operation_process_equ set BACHMATERIALPROCESS = IF(BACHMATERIALPROCESS is null || BACHMATERIALPROCESS = '',#{batchnumber},concat(BACHMATERIALPROCESS,',',#{batchnumber})) where DELETED = 0 AND PREVIOUSPROCESSESIDS = #{previousprocessesids}")
     void updateBatchNumberByPrevious(@Param("batchnumber") String batchnumber, @Param("previousprocessesids") String previousprocessesids);
+
+    @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);
 }

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

@@ -1794,16 +1794,17 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         }
 
         if (checkLevel == 2 || checkLevel == 3) {
-            //如果坯料需求的坯料来源=备料，并且首道工序作业的是否坯料工序=是，错误提示：备料工艺路线首道工序作业不应该包含坯料工序：{首道工序作业的工序}
+            //新需求：如果坯料需求的坯料来源不是新料，并且首道工序作业的是否坯料工序=是，错误提示：坯料不是新料，不可以包含坯料工序：{首道工序作业的工序}
+            //旧需求：如果坯料需求的坯料来源=备料，并且首道工序作业的是否坯料工序=是，错误提示：备料工艺路线首道工序作业不应该包含坯料工序：{首道工序作业的工序}
             //是否备料
-            if (apsBlankOrderDo.getBlankcomefrom().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("备料工艺路线首道工序作业不应该包含坯料工序：" + processOperationDo.getProcess());
+                            return R.error("坯料不是新料，不可以包含坯料工序：" + processOperationDo.getProcess());
                         }
                         break;
                     }
@@ -2212,16 +2213,17 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             }
         }
         if (checkLevel == 2 || checkLevel == 3) {
-            //如果坯料需求的坯料来源=备料，并且首道工序作业的是否坯料工序=是，错误提示：备料工艺路线首道工序作业不应该包含坯料工序：{首道工序作业的工序}
+            //新需求：如果坯料需求的坯料来源不是新料，并且首道工序作业的是否坯料工序=是，错误提示：坯料不是新料，不可以包含坯料工序：{首道工序作业的工序}
+            //旧需求：如果坯料需求的坯料来源=备料，并且首道工序作业的是否坯料工序=是，错误提示：备料工艺路线首道工序作业不应该包含坯料工序：{首道工序作业的工序}
             //是否备料
-            if (apsBlankOrderDo.getBlankcomefrom().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("坯料计划" + apsBlankOrderDo.getBlanknumber() + " 备料工艺路线首道工序作业不应该包含坯料工序：" + processOperationDo.getProcess());
+                            return R.error("坯料计划" + apsBlankOrderDo.getBlanknumber() + " 坯料不是新料，不可以包含坯料工序：" + processOperationDo.getProcess());
                         }
                         break;
                     }
@@ -3093,6 +3095,18 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 //            }
 //        }
 
+        //更新坯料计划对应的领料批次号
+        ApsBlankOrderDo apsBlankOrderDo = this.getById(req.getBlankId());
+        List<String> preparematerialbatchnoList = new LinkedList<>();
+        if (ObjectUtil.isNotEmpty(apsBlankOrderDo.getPreparematerialbatchno())) {
+            preparematerialbatchnoList = new LinkedList<>(Arrays.asList(apsBlankOrderDo.getPreparematerialbatchno().split(",")));
+        }
+        preparematerialbatchnoList.removeAll(delBatchNumberList);
+        preparematerialbatchnoList.addAll(addBatchNumberList);
+        ApsBlankOrderDo updateBlank = new ApsBlankOrderDo();
+        updateBlank.setId(apsBlankOrderDo.getId());
+        updateBlank.setPreparematerialbatchno(String.join(",", preparematerialbatchnoList));
+        this.updateById(updateBlank);
 
         /**
          * 检验通过，

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

@@ -603,9 +603,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         .set(ApsBlankOrderDo::getRouteproducttypeid, apsCraftRouteDo.getProducttype())
                         .set(ApsBlankOrderDo::getRoutemetal, apsCraftRouteDo.getMetal())
                         .set(ApsBlankOrderDo::getRoutemetalstate, apsCraftRouteDo.getMetalstate())
-                        .set(ApsBlankOrderDo::getRoutewidthstr, apsCraftRouteDo.getThickstr())
+                        .set(ApsBlankOrderDo::getRoutethickstr, apsCraftRouteDo.getThickstr())
                         .set(ApsBlankOrderDo::getRoutethickend, apsCraftRouteDo.getThickend())
-                        .set(ApsBlankOrderDo::getRoutelengthstr, apsCraftRouteDo.getWidthstr())
+                        .set(ApsBlankOrderDo::getRoutewidthstr, apsCraftRouteDo.getWidthstr())
                         .set(ApsBlankOrderDo::getRoutewidthend, apsCraftRouteDo.getWidthend())
                         .set(ApsBlankOrderDo::getRoutelengthstr, apsCraftRouteDo.getLengthstr())
                         .set(ApsBlankOrderDo::getRoutelengthend, apsCraftRouteDo.getLengthend())
@@ -1103,7 +1103,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             apsProcessOperationProcessEquService.updateProductionStatus(req);
 
             //更新坯料计划的所选工艺路线相关信息
-            ApsCraftRouteDo apsCraftRouteDo = apsCraftRouteService.getById(craftrouteid);
+            ApsCraftRouteDo apsCraftRouteDo = apsProcessOperationDao.getApsCraftRoute(newblankid);
             apsBlankOrderService.update(new LambdaUpdateWrapper<ApsBlankOrderDo>()
                     .eq(ApsBlankOrderDo::getId, blanckdata.getStr("ID"))
                     .set(ApsBlankOrderDo::getRoption, newblankid)
@@ -1111,9 +1111,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     .set(ApsBlankOrderDo::getRouteproducttypeid, apsCraftRouteDo.getProducttype())
                     .set(ApsBlankOrderDo::getRoutemetal, apsCraftRouteDo.getMetal())
                     .set(ApsBlankOrderDo::getRoutemetalstate, apsCraftRouteDo.getMetalstate())
-                    .set(ApsBlankOrderDo::getRoutewidthstr, apsCraftRouteDo.getThickstr())
+                    .set(ApsBlankOrderDo::getRoutethickstr, apsCraftRouteDo.getThickstr())
                     .set(ApsBlankOrderDo::getRoutethickend, apsCraftRouteDo.getThickend())
-                    .set(ApsBlankOrderDo::getRoutelengthstr, apsCraftRouteDo.getWidthstr())
+                    .set(ApsBlankOrderDo::getRoutewidthstr, apsCraftRouteDo.getWidthstr())
                     .set(ApsBlankOrderDo::getRoutewidthend, apsCraftRouteDo.getWidthend())
                     .set(ApsBlankOrderDo::getRoutelengthstr, apsCraftRouteDo.getLengthstr())
                     .set(ApsBlankOrderDo::getRoutelengthend, apsCraftRouteDo.getLengthend())
@@ -1328,11 +1328,6 @@ 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());
@@ -1507,13 +1502,12 @@ 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 = apsCraftRouteService.getById(craftrouteid);
+            ApsCraftRouteDo apsCraftRouteDo = apsProcessOperationDao.getApsCraftRoute(params.getBlankid());
             R r = new R();
             r.setCode("200");
             r.setData(apsCraftRouteDo);
@@ -1837,12 +1831,11 @@ 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 = apsCraftRouteService.getById(blanckdata.getStr("CRAFTROUTEID"));
+            ApsCraftRouteDo apsCraftRouteDo = apsProcessOperationDao.getApsCraftRoute(blanckdata.getStr("ID"));
             R r = new R();
             r.setCode("200");
             r.setData(apsCraftRouteDo);
@@ -1975,7 +1968,6 @@ 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();//作业本次取消卷数
 
             //本道工序作业
@@ -2083,7 +2075,6 @@ 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());
@@ -2158,10 +2149,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         currentUser == null ? "" : currentUser.getName());
 
                 //更新坯料计划的所选工艺路线相关信息
-                ApsCraftRouteDo apsCraftRouteDo = null;
-                if (StringUtils.isNotBlank(craftrouteid)) {
-                    apsCraftRouteDo = apsCraftRouteService.getById(craftrouteid);
-                }
+                ApsCraftRouteDo apsCraftRouteDo = apsProcessOperationDao.getApsCraftRoute(apsProcessOperationDo.getBlankid());
                 R r = new R();
                 r.setCode("200");
                 r.setData(apsCraftRouteDo);

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/MaintenanceServiceImpl.java

@@ -380,7 +380,9 @@ public class MaintenanceServiceImpl implements MaintenanceService {
 
         // 插入
         int number = maintenanceTaskService.insertBatch(equMaintenanceTaskList);
-        partsSetoutTaskService.batchSave(partsSetoutTaskDoList);
+        if (partsSetoutTaskDoList.size() != 0) {
+            partsSetoutTaskService.batchSave(partsSetoutTaskDoList);
+        }
         if (month == 12) {
             List<EquMaintenanceScheduleDo> maintenancePartYearAll = maintenanceScheduleService.getYearByList(year);
             maintenanceScheduleService.updatePlannedstatusByIds(maintenancePartYearAll.stream().map(EquMaintenanceScheduleDo::getId).collect(Collectors.toList()), PlannedStatusEnum.PUBLISHED_TASK_ALL);