aps-换线修改

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

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.ApsRollerTypeDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Entity generator.domain.ApsRollerType
+ */
+public interface ApsRollerTypeDao extends BaseMapper<ApsRollerTypeDo> {
+
+}
+
+
+
+

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

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.ApsRollerTypeDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ */
+public interface ApsRollerTypeService extends IService<ApsRollerTypeDo> {
+
+}

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

@@ -98,6 +98,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
     private ApsScheduleConfigService apsScheduleConfigService;
     @Autowired
     private PlatformTransactionManager transactionManager;
+    @Autowired
+    private ApsRollerTypeService apsRollerTypeService;
 
 //    /**
 //     * 更新工序的待加工批次号信息
@@ -344,9 +346,22 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 throw new CustomException("存在已完工的工序作业无法换线");
             }
             apsProcessOperationProcessEquDos.sort(Comparator.comparing(ApsProcessOperationProcessEquDo::getPlanstartdate));
+            String rollerid1 = apsProcessOperationProcessEquDos.get(0).getRollerid();
+            String rollerId2 = changingWiresVos.get(0).getRollerId();
+            String rollerType = "";
+            if (StringUtils.isBlank(rollerid1)) {
+                rollerid1 = "";
+            }
+            if (StringUtils.isBlank(rollerId2)) {
+                rollerId2 = "";
+            } else {
+                ApsRollerTypeDo rollerTypeDo = apsRollerTypeService.getById(rollerId2);
+                rollerType = rollerTypeDo.getRollertype();
+            }
             if (apsProcessOperationProcessEquDos.get(0).getProcessdeviceid().equals(changingWiresVos.get(0).getEquId())
-                    && apsProcessOperationProcessEquDos.get(0).getPlanstartdate().equals(changingWiresVos.get(0).getProcessingTime())) {
-                throw new CustomException("请修改计划开工时间或加工设备");
+                    && apsProcessOperationProcessEquDos.get(0).getPlanstartdate().equals(changingWiresVos.get(0).getProcessingTime())
+                    && rollerid1.equals(rollerId2) && !rollerid1.isEmpty()) {
+                throw new CustomException("请修改计划开工时间或加工设备或辊");
             }
 
             //对于换线作业的数据进行排序
@@ -453,6 +468,18 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                             needEqu.setProcessworkshop(changingWiresVo.getWorkshopName());
                             needEqu.setProcessdeviceid(changingWiresVo.getEquId());
                             needEqu.setProcessdevice(changingWiresVo.getEquName());
+                            //可选设备
+                            String canchoosedeviceid = apsProcessOperationDo.getCanchoosedeviceid();
+                            LinkedList<String> canChooseDeviceIdList = new LinkedList<>(Arrays.asList(canchoosedeviceid.split(",")));
+                            ApsProcessOperationEquDo needInsert = new ApsProcessOperationEquDo();
+                            if (!canChooseDeviceIdList.contains(changingWiresVo.getEquId())) {
+                                needInsert.setId(SecurityUtil.getUUID());
+                                needInsert.setTenantid(CXCommonUtils.getCurrentUserFactoryId(nowWorkUser));
+                                needInsert.setBlankid(apsProcessOperationDo.getBlankid());
+                                needInsert.setMainid(apsProcessOperationDo.getId());
+                                needInsert.setResourcetype("设备");
+                                needInsert.setResourceid(changingWiresVo.getEquId());
+                            }
                             if (ObjectUtil.isNotEmpty(changingWiresVo.getIsZhaji()) && ObjectUtil.isNotEmpty(changingWiresVo.getOldDeviceId())) {
                                 //如果是轧机工序类别，并且（加工设备换了，或者加工设备没换并且辊类型不为空），则辊类型=所选辊类型
                                 if (changingWiresVo.getIsZhaji()) {
@@ -460,10 +487,14 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                                     if (changingWiresVo.getOldDeviceId().equals(changingWiresVo.getEquId())) {
                                         if (ObjectUtil.isNotEmpty(changingWiresVo.getRollerId())) {
                                             needEqu.setRollerid(changingWiresVo.getRollerId());
+                                            needInsert.setRollerid(changingWiresVo.getRollerId());
+                                            needInsert.setRollerid(rollerType);
                                         }
                                     } else {
                                         if (ObjectUtil.isNotEmpty(changingWiresVo.getRollerId())) {
                                             needEqu.setRollerid(changingWiresVo.getRollerId());
+                                            needInsert.setRollerid(changingWiresVo.getRollerId());
+                                            needInsert.setRollerid(rollerType);
                                         } else {
                                             throw new CustomException("换设备后轧机工序必须选择辊类型");
                                         }
@@ -478,6 +509,9 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                             checkConflictVos.add(new CheckConflictVo(processEqus.getId(), processEqus.getProcessdeviceid(),
                                     processEqus.getPlanstartdate(), processEqus.getPlanenddate()));
                             saveList.add(needEqu);
+                            if (StringUtils.isNotBlank(needInsert.getId())) {
+                                apsProcessOperationEquService.save(needInsert);
+                            }
                         }
                         updateConflictVo.setApsProcessOperationProcessEquDo(needEqu);
                         updateConflictVoList.add(updateConflictVo);

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

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsRollerTypeDao;
+import com.rongwei.bscommon.sys.service.ApsRollerTypeService;
+import com.rongwei.bsentity.domain.ApsRollerTypeDo;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsRollerTypeServiceImpl extends ServiceImpl<ApsRollerTypeDao, ApsRollerTypeDo>
+    implements ApsRollerTypeService {
+
+}
+
+
+
+

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

@@ -0,0 +1,76 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * APS_辊类型管理
+ * @TableName aps_roller_type
+ */
+@TableName(value ="aps_roller_type")
+@Data
+public class ApsRollerTypeDo extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId(value = "ID")
+    private String id;
+
+    /**
+     * 
+     */
+    @TableField(value = "TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField(value = "ROPTION")
+    private String roption;
+
+    /**
+     * 设备ID
+     */
+    @TableField(value = "CHECKITEMID")
+    private String checkitemid;
+
+    /**
+     * 设备
+     */
+    @TableField(value = "CHECKITEM")
+    private String checkitem;
+
+    /**
+     * 辊类型
+     */
+    @TableField(value = "ROLLERTYPE")
+    private String rollertype;
+
+    /**
+     * 适用产品类型
+     */
+    @TableField(value = "PRODUCTTYPE")
+    private String producttype;
+
+    /**
+     * 辊凸度
+     */
+    @TableField(value = "ROLLCROWN")
+    private String rollcrown;
+
+    /**
+     * 辊粗糙度
+     */
+    @TableField(value = "ROLLROUGH")
+    private String rollrough;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}