aps-排单操作，增加辊类型

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

@@ -2062,6 +2062,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
     }
 
     @Override
+    @Transactional
     public R scheduling(ChangingScheduleVo req) {
         ApsUtils.checkScheduling(null);
 
@@ -2092,17 +2093,21 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             needUpdate.setId(apsProcessOperationProcessEquDo.getId());
             needUpdate.setProcessdeviceid(req.getEquId());
             needUpdate.setProcessdevice(req.getEquName());
-            //对应的辊赋值
-            String processid = apsProcessOperationProcessEquDo.getProcessid();
-            List<ApsProcessOperationEquDo> myEquList = processOperationEquDos.stream().filter(item -> item.getMainid().equals(processid)).collect(Collectors.toList());
-            if (myEquList.isEmpty()) {
-                needUpdate.setRollerid("");
-            } else {
-                ApsProcessOperationEquDo apsProcessOperationEquDo = myEquList.stream().filter(item -> item.getResourceid().equals(req.getEquId())).findFirst().orElse(null);
-                if (ObjectUtil.isEmpty(apsProcessOperationEquDo)) {
-                    needUpdate.setRollerid("");
-                } else {
-                    needUpdate.setRollerid(apsProcessOperationEquDo.getRollerid());
+            if (ObjectUtil.isNotEmpty(req.getIsZhaji()) && ObjectUtil.isNotEmpty(req.getOldDeviceId())) {
+                //如果是轧机工序类别，并且（加工设备换了，或者加工设备没换并且辊类型不为空），则辊类型=所选辊类型
+                if (req.getIsZhaji()) {
+                    //设备没换
+                    if (req.getOldDeviceId().equals(req.getEquId())) {
+                        if (ObjectUtil.isNotEmpty(req.getRollerId())) {
+                            needUpdate.setRollerid(req.getRollerId());
+                        }
+                    } else {
+                        if (ObjectUtil.isNotEmpty(req.getRollerId())) {
+                            needUpdate.setRollerid(req.getRollerId());
+                        } else {
+                            throw new CustomException("换设备后轧机工序必须选择辊类型");
+                        }
+                    }
                 }
             }
 

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

@@ -42,4 +42,16 @@ public class ChangingScheduleVo {
      */
     @NotNull(message = "加工时间必填")
     private Date processingTime;
+    /**
+     * 辊类型
+     */
+    private String rollerId;
+    /**
+     * 是否轧机工序
+     */
+    private Boolean isZhaji;
+    /**
+     * 旧设备ID
+     */
+    private String oldDeviceId;
 }