冲突描述处理

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

@@ -498,6 +498,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     apsProcessOperationProcessEqu.setPlanprocessrall(process.getProducePcNum());
                     apsProcessOperationProcessEqu.setHasconflict(process.getHasConflict());
                     apsProcessOperationProcessEqu.setConflictdes(process.getConflictDes());
+                    apsProcessOperationProcessEqu.setConflictlevel(process.getConflictLevel());
                     apsProcessOperationProcessEqu.setDeleted("0");
                     apsProcessOperationProcessEquDos.add(apsProcessOperationProcessEqu);
                 }
@@ -529,6 +530,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         apsProcessOperationProcessEqu.setTenantid(process.getEquipment().getFactoryid());
                         apsProcessOperationProcessEqu.setHasconflict(process.getHasConflict());
                         apsProcessOperationProcessEqu.setConflictdes(process.getConflictDes());
+                        apsProcessOperationProcessEqu.setConflictlevel(process.getConflictLevel());
                         apsProcessOperationProcessEqu.setDeleted("0");
                         apsProcessOperationProcessEquDos.add(apsProcessOperationProcessEqu);
                     });
@@ -630,8 +632,12 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             apsScheduleConfig = apsConfigs.get(0);
             productionScheduleVo.setPlanSeconds(apsScheduleConfig.getScheduleruntime());
             Map<String, Integer> roamTime = new HashMap<>();
-            roamTime.put("WORKSHOP_IN", apsScheduleConfig.getWorkshopin());
-            roamTime.put("WORKSHOP_CROSS", apsScheduleConfig.getWorkshopcross());
+            Integer workshopin = new BigDecimal(apsScheduleConfig.getWorkshopin()).multiply((looseness.divide(new BigDecimal("100"))).add(new BigDecimal("1")))
+                    .setScale(0, RoundingMode.CEILING).intValue();
+            Integer workshopcross = new BigDecimal(apsScheduleConfig.getWorkshopin()).multiply((looseness.divide(new BigDecimal("100"))).add(new BigDecimal("1")))
+                    .setScale(0, RoundingMode.CEILING).intValue();
+            roamTime.put("WORKSHOP_IN", workshopin);
+            roamTime.put("WORKSHOP_CROSS", workshopcross);
             productionScheduleVo.setRoamTime(roamTime);
             looseness = apsScheduleConfig.getLooseness();
             // 排程计划开始时间
@@ -826,12 +832,12 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         List<ProductionProcesses> productionProcesses = mergeProcesses(processOperationMs, eqMaps,apsScheduleConfig);
         processesList.addAll(productionProcesses);
         // 加工时间松散度设置
-        if(looseness != null){
+        /*if(looseness != null){
             for (ProductionProcesses process : processesList) {
                 // 加工时间乘以松散度并向上取整
                 process.setProduceTime(new BigDecimal(process.getProduceTime()).multiply((looseness.divide(new BigDecimal("100"))).add(new BigDecimal("1"))).setScale(0, RoundingMode.CEILING).intValue());
             }
-        }
+        }*/
         productionScheduleVo.setProcesses(processesList);
         productionScheduleVo.setEquipmentList(equipmentList);
         return productionScheduleVo;

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-18
+ * @since 2024-05-10
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -149,10 +149,15 @@ public class ApsProcessOperationProcessEquDo extends BaseDo {
     @TableField("HASCONFLICT")
     private String hasconflict;
     /**
-     * 冲突描述
+     * 强制冲突描述
      */
     @TableField("CONFLICTDES")
     private String conflictdes;
+    /**
+     * 非强制冲突描述
+     */
+    @TableField("SOFTCONFLICTDES")
+    private String softconflictdes;
 
 
 }

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

@@ -144,6 +144,18 @@ public class ProductionProcesses{
      */
     private String hasConflict;
 
+    /**
+     * 冲突等级
+     * hard：强制冲突
+     * soft：非强制冲突
+     */
+    private String conflictLevel;
+
+    /**
+     * 非强制冲突描述
+     */
+    private String softconflictdes;
+
     /**
      * 冲突描述
      */
@@ -367,4 +379,20 @@ public class ProductionProcesses{
     public void setConflictDes(String conflictDes) {
         this.conflictDes = conflictDes;
     }
+
+    public String getConflictLevel() {
+        return conflictLevel;
+    }
+
+    public void setConflictLevel(String conflictLevel) {
+        this.conflictLevel = conflictLevel;
+    }
+
+    public String getSoftconflictdes() {
+        return softconflictdes;
+    }
+
+    public void setSoftconflictdes(String softconflictdes) {
+        this.softconflictdes = softconflictdes;
+    }
 }