模型转换

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

@@ -208,6 +208,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     apsProcessOperationProcessEqu.setPlanstartdate(Date.from(process.getStartTime().atZone(ZoneId.systemDefault()).toInstant()));
                     apsProcessOperationProcessEqu.setPlanenddate(Date.from(process.getEndTime().atZone(ZoneId.systemDefault()).toInstant()));
                     apsProcessOperationProcessEqu.setPlanprocessrall(process.getProducePcNum());
+                    apsProcessOperationProcessEqu.setHasconflict(process.getHasConflict());
+                    apsProcessOperationProcessEqu.setConflictdes(process.getConflictDes());
                     apsProcessOperationProcessEquDos.add(apsProcessOperationProcessEqu);
                 }
                 // 合并生产工序
@@ -236,6 +238,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         apsProcessOperationProcessEqu.setProcessworkshopid(process.getEquipment().getWorkshopid());
                         apsProcessOperationProcessEqu.setProcessworkshop(process.getEquipment().getWorkshopname());
                         apsProcessOperationProcessEqu.setTenantid(process.getEquipment().getFactoryid());
+                        apsProcessOperationProcessEqu.setHasconflict(process.getHasConflict());
+                        apsProcessOperationProcessEqu.setConflictdes(process.getConflictDes());
                         apsProcessOperationProcessEquDos.add(apsProcessOperationProcessEqu);
                     });
                 }

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-04-08
+ * @since 2024-04-18
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -143,6 +143,16 @@ public class ApsProcessOperationProcessEquDo extends BaseDo {
      */
     @TableField("BLANKID")
     private String blankid;
+    /**
+     * 是否冲突（y：是，n：否）
+     */
+    @TableField("HASCONFLICT")
+    private String hasconflict;
+    /**
+     * 冲突描述
+     */
+    @TableField("CONFLICTDES")
+    private String conflictdes;
 
 
 }

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

@@ -139,6 +139,16 @@ public class ProductionProcesses{
      */
     private List<AluminumCoil> aluminumCoils;
 
+    /**
+     * 是否冲突
+     */
+    private String hasConflict;
+
+    /**
+     * 冲突描述
+     */
+    private String conflictDes;
+
     public String getEquipmentType() {
         return equipmentType;
     }
@@ -341,4 +351,20 @@ public class ProductionProcesses{
     public void setSeriesProduceMark(String seriesProduceMark) {
         this.seriesProduceMark = seriesProduceMark;
     }
+
+    public String getHasConflict() {
+        return hasConflict;
+    }
+
+    public void setHasConflict(String hasConflict) {
+        this.hasConflict = hasConflict;
+    }
+
+    public String getConflictDes() {
+        return conflictDes;
+    }
+
+    public void setConflictDes(String conflictDes) {
+        this.conflictDes = conflictDes;
+    }
 }