Переглянути джерело

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

DLC 7 місяців тому
батько
коміт
6a4deba2c6

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

@@ -110,8 +110,8 @@ public interface ApsProcessOperationDao extends BaseMapper<ApsProcessOperationDo
     @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" +
+            "where e.DELETED='0' and o.BLANKID=#{blanckid} and IFNULL(o.LEVEL,'')>${level} \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);
+    void updateZJProcessEqu(@Param("blanckid") String blanckid, @Param("resourceid") String resourceid, @Param("option") String option, @Param("rollerid") String rollerid, @Param("rollertype") String rollertype, @Param("level") String level);
 
 }

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

@@ -1400,7 +1400,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             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());
+                    apsProcessOperationDao.updateZJProcessEqu(params.getBlankid(), zjequ.getResourceid(), zjequ.getRoption(), zjequ.getRollerid(), zjequ.getRollertype(), params.getLevel());
                 }
             }