排程数据回写优化

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

@@ -2,6 +2,7 @@ package com.rongwei.bscommon.sys.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.StopWatch;
@@ -524,7 +525,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 // 非合并生产工序
                 if (process.getAluminumCoils() == null) {
                     ApsProcessOperationProcessEquDo apsProcessOperationProcessEqu = new ApsProcessOperationProcessEquDo();
-                    apsProcessOperationProcessEqu.setId(SecurityUtil.getUUID());
+                    apsProcessOperationProcessEqu.setId(process.getId());
 //                    apsProcessOperationProcessEqu.setProcessid(process.getId());
                     apsProcessOperationProcessEqu.setProcessid(process.getBsProcessesId().get(0));
                     apsProcessOperationProcessEqu.setBlankid(process.getProduceOrder().get(0).getId());
@@ -541,6 +542,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     apsProcessOperationProcessEqu.setSoftconflictdes(process.getSoftconflictdes());
                     apsProcessOperationProcessEqu.setDeleted("0");
                     apsProcessOperationProcessEqu.setUnfinishroll(process.getProducePcNum());
+                    apsProcessOperationProcessEqu.setPreviousprocessesids(CollUtil.join(process.getPreviousProcessesIds(),","));
+                    apsProcessOperationProcessEqu.setNextprocessesids(CollUtil.join(process.getNextProcessesIds(),","));
                     apsProcessOperationProcessEquDos.add(apsProcessOperationProcessEqu);
                 }
                 // 合并生产工序

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/utils/CodeGeneration.java

@@ -83,7 +83,7 @@ public class CodeGeneration {
         strategy.setSuperEntityClass(BaseDo.class);
         strategy.setRestControllerStyle(true);
         // 设置要映射的表名（重要，需要修改的地方）
-        strategy.setInclude("aps_process_operation");
+        strategy.setInclude("aps_process_operation_process_equ");
         strategy.setNaming(NamingStrategy.underline_to_camel); // 自动转换表名的驼峰命名法
         strategy.setColumnNaming(NamingStrategy.no_change); // 自动转换列名的驼峰命名法
         strategy.setEntityLombokModel(true); // 是否使用lombox

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

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author fpy
- * @since 2024-05-10
+ * @since 2024-06-27
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -154,10 +154,20 @@ public class ApsProcessOperationProcessEquDo extends BaseDo {
     @TableField("CONFLICTDES")
     private String conflictdes;
     /**
-     * 非强制冲突描述
+     * 非强制冲突描述(警告)
      */
     @TableField("SOFTCONFLICTDES")
     private String softconflictdes;
+    /**
+     * 前道工序ID
+     */
+    @TableField("PREVIOUSPROCESSESIDS")
+    private String previousprocessesids;
+    /**
+     * 后道工序ID
+     */
+    @TableField("NEXTPROCESSESIDS")
+    private String nextprocessesids;
 
 
 }