aps-换线操作，增加辊类型

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

@@ -389,13 +389,22 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     processEqus.setProcessworkshop(changingWiresVo.getWorkshopName());
                     processEqus.setProcessdeviceid(changingWiresVo.getEquId());
                     processEqus.setProcessdevice(changingWiresVo.getEquName());
-                    if (equIds.contains(changingWiresVo.getEquId())) {
-                        ApsProcessOperationEquDo apsProcessOperationEquDo = processOperationEquDos.stream().filter(item -> item.getResourceid().equals(changingWiresVo.getEquId())).findFirst().orElse(null);
-                        if (ObjectUtil.isNotEmpty(apsProcessOperationEquDo)) {
-                            processEqus.setRollerid(apsProcessOperationEquDo.getRollerid());
+                    if (ObjectUtil.isNotEmpty(changingWiresVo.getIsZhaji()) && ObjectUtil.isNotEmpty(changingWiresVo.getOldDeviceId())) {
+                        //如果是轧机工序类别，并且（加工设备换了，或者加工设备没换并且辊类型不为空），则辊类型=所选辊类型
+                        if (changingWiresVo.getIsZhaji()) {
+                            //设备没换
+                            if (changingWiresVo.getOldDeviceId().equals(changingWiresVo.getEquId())) {
+                                if (ObjectUtil.isNotEmpty(changingWiresVo.getRollerId())) {
+                                    processEqus.setRollerid(changingWiresVo.getRollerId());
+                                }
+                            } else {
+                                if (ObjectUtil.isNotEmpty(changingWiresVo.getRollerId())) {
+                                    processEqus.setRollerid(changingWiresVo.getRollerId());
+                                } else {
+                                    throw new CustomException("换设备后轧机工序必须选择辊类型");
+                                }
+                            }
                         }
-                    } else {
-                        processEqus.setRollerid("");
                     }
                     // 计划开工时间=计划开工时间-开工时间间隔
                     processEqus.setPlanstartdate(new Date(planstartdate.getTime() - timeInterval));
@@ -451,13 +460,22 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                         newProcessEqu.setProcessworkshop(changingWiresVo.getWorkshopName());
                         newProcessEqu.setProcessdeviceid(changingWiresVo.getEquId());
                         newProcessEqu.setProcessdevice(changingWiresVo.getEquName());
-                        if (equIds.contains(changingWiresVo.getEquId())) {
-                            ApsProcessOperationEquDo apsProcessOperationEquDo = processOperationEquDos.stream().filter(item -> item.getResourceid().equals(changingWiresVo.getEquId())).findFirst().orElse(null);
-                            if (ObjectUtil.isNotEmpty(apsProcessOperationEquDo)) {
-                                newProcessEqu.setRollerid(apsProcessOperationEquDo.getRollerid());
+                        if (ObjectUtil.isNotEmpty(changingWiresVo.getIsZhaji()) && ObjectUtil.isNotEmpty(changingWiresVo.getOldDeviceId())) {
+                            //如果是轧机工序类别，并且（加工设备换了，或者加工设备没换并且辊类型不为空），则辊类型=所选辊类型
+                            if (changingWiresVo.getIsZhaji()) {
+                                //设备没换
+                                if (changingWiresVo.getOldDeviceId().equals(changingWiresVo.getEquId())) {
+                                    if (ObjectUtil.isNotEmpty(changingWiresVo.getRollerId())) {
+                                        processEqus.setRollerid(changingWiresVo.getRollerId());
+                                    }
+                                } else {
+                                    if (ObjectUtil.isNotEmpty(changingWiresVo.getRollerId())) {
+                                        processEqus.setRollerid(changingWiresVo.getRollerId());
+                                    } else {
+                                        throw new CustomException("换设备后轧机工序必须选择辊类型");
+                                    }
+                                }
                             }
-                        } else {
-                            processEqus.setRollerid("");
                         }
                         newProcessEqu.setActualstartdate(null);
                         newProcessEqu.setActualfinishdate(null);

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

@@ -50,7 +50,18 @@ public class ChangingWiresVo {
     @NotNull(message = "加工时间必填")
     @Future(message = "加工时间必须大于当前时间")
     private Date processingTime;
-
+    /**
+     * 辊类型
+     */
+    private String rollerId;
+    /**
+     * 是否轧机工序
+     */
+    private Boolean isZhaji;
+    /**
+     * 旧设备ID
+     */
+    private String oldDeviceId;
 
 
     /**

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

@@ -25,9 +25,5 @@ public class JobDetailsVo  extends  ChangingWiresVo{
      */
     @NotNull(message = "计划完工时间必填")
     private Date planEndTime;
-    /**
-     * 辊ID
-     */
-    private String rollerId;
 
 }