作业调整

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

@@ -3,6 +3,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.ApsProcessOperationEquDo;
 import com.rongwei.bsentity.domain.ApsProcessOperationProcessEquDo;
 import com.rongwei.bsentity.vo.ApsProcessOperationAndMaterialVo;
 import com.rongwei.bsentity.vo.ProcessIdRelationVo;
@@ -94,4 +95,7 @@ public interface ApsProcessOperationDao extends BaseMapper<ApsProcessOperationDo
 
     @Select("SELECT * from aps_craft_route WHERE ID=#{craftrouteid}")
     ApsCraftRouteDo getCraftRoute(@Param("craftrouteid") String craftrouteid);
+
+    @Select("SELECT * FROM aps_process_operation_equ WHERE DELETED = 0 AND MAINID=#{mainid}")
+    List<ApsProcessOperationEquDo> getProcessOperationEqus(@Param("mainid") String mainid);
 }

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

@@ -876,6 +876,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
 
                         //本道工序的可选设备
                         List<ApsProcessOperationEquDo> apsProcessOperationEquDos1 = apsProcessOperationEquDos.stream().filter(hcrse -> apsProcessOperationDo1.getId().equals(hcrse.getMainid())).collect(Collectors.toList());
+                        if (apsProcessOperationEquDos1.size() == 0) {
+                            apsProcessOperationEquDos1 = apsProcessOperationDao.getProcessOperationEqus(apsProcessOperationDo1.getId());
+                        }
                         if (apsProcessOperationEquDos1.size() == 0) {
                             log.info("历史计划ID " + newblankid + " 作业ID " + apsProcessOperationDo1.getId() + " 没可选设备，总" + apsProcessOperationEquDos.size());
                             return R.error("工艺步骤" + apsProcessOperationDo1.getProcessname() + "没可选设备");
@@ -1063,6 +1066,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     if (hasFirst) {
                         //本道工序的可选设备
                         List<ApsProcessOperationEquDo> apsProcessOperationEquDos1 = apsProcessOperationEquDos.stream().filter(hffomd -> apsProcessOperationDo.getId().equals(hffomd.getMainid())).collect(Collectors.toList());
+                        if (apsProcessOperationEquDos1.size() == 0) {
+                            apsProcessOperationEquDos1 = apsProcessOperationDao.getProcessOperationEqus(apsProcessOperationDo.getId());
+                        }
                         if (apsProcessOperationEquDos1.size() == 0) {
                             log.info("历史计划ID " + newblankid + " 作业ID " + apsProcessOperationDo.getId() + " 没可选设备，总" + apsProcessOperationEquDos.size());
                             return R.error("工艺步骤" + apsProcessOperationDo.getProcessname() + "没可选设备");