作业可选设备加辊类型变更逻辑

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

@@ -107,4 +107,11 @@ public interface ApsProcessOperationDao extends BaseMapper<ApsProcessOperationDo
 
     void updateProgressInventory(@Param("batchnumbers") List<String> batchnumbers);
 
+    @Update("update aps_process_operation_equ e\n" +
+            "left join aps_process_operation o on e.MAINID=o.ID\n" +
+            "set e.ROLLERID=#{rollerid},e.ROLLERTYPE=#{rollertype}\n" +
+            "where e.DELETED='0' and o.BLANKID=#{blanckid} and IFNULL(o.LEVEL,'')>3 \n" +
+            "\tand e.RESOURCEID=#{resourceid} and IFNULL(e.ROLLERID,#{option})=#{option}")
+    void updateZJProcessEqu(@Param("blanckid") String blanckid, @Param("resourceid") String resourceid, @Param("option") String option, @Param("rollerid") String rollerid, @Param("rollertype") String rollertype);
+
 }

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

@@ -1382,6 +1382,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         List<ApsProcessOperationOutMaterDo> operationOutMaterDos = new ArrayList<>();//递归的数据源
         try {
             List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoList = params.getOutmeterinfo();
+            List<ApsProcessOperationEquDo> changeZJEquDoList = params.getEquinfo();
             // 获取排程参数设置
             List<ApsScheduleConfigDo> apsConfigs = apsScheduleConfigService.list();
             BigDecimal aluminumdensity = apsConfigs.get(0).getAluminumdensity();
@@ -1397,6 +1398,11 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             map.put("BLANKID", params.getBlankid());
             List<ApsProcessOperationDo> processOperationDoList = apsProcessOperationService.listByMap(map).stream().collect(Collectors.toList());
             List<ApsProcessOperationOutMaterDo> processOperationOutMaterDoList = apsProcessOperationOutMaterService.listByMap(map).stream().collect(Collectors.toList());
+            if (changeZJEquDoList.size() > 0) {
+                for (ApsProcessOperationEquDo zjequ : changeZJEquDoList) {
+                    apsProcessOperationDao.updateZJProcessEqu(params.getBlankid(), zjequ.getResourceid(), zjequ.getRoption(), zjequ.getRollerid(), zjequ.getRollertype());
+                }
+            }
 
             List<ApsProcessOperationDo> apsProcessOperationDoList = new ArrayList<>();
             List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoNewList = new ArrayList<>();

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

@@ -487,6 +487,10 @@ public class ApsProcessOperationBackupDo extends BaseDo implements Serializable
      * 已取消卷数合计
      */
     private Integer cancelrollsum;
+    /**
+     * 工序类别是否为轧机
+     */
+    private String iszj;
 
 
     @TableField(exist = false)

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

@@ -485,6 +485,11 @@ public class ApsProcessOperationDo extends BaseDo {
      */
     @TableField("CANCELROLLSUM")
     private Integer cancelrollsum;
+    /**
+     * 工序类别是否为轧机
+     */
+    @TableField("ISZJ")
+    private String iszj;
 
 
 }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/ResetProcessOperationVo.java

@@ -1,5 +1,6 @@
 package com.rongwei.bsentity.vo;
 
+import com.rongwei.bsentity.domain.ApsProcessOperationEquDo;
 import com.rongwei.bsentity.domain.ApsProcessOperationOutMaterDo;
 import lombok.Data;
 
@@ -13,4 +14,8 @@ public class ResetProcessOperationVo {
     private String craftrouteid;
     //修改的作业输出
     private List<ApsProcessOperationOutMaterDo> outmeterinfo;
+    //轧机修改的可选设备的辊类型
+    private List<ApsProcessOperationEquDo> equinfo = null;
+    //当前作业等级
+    private String level="";
 }