排程数据组装优化

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

@@ -754,6 +754,7 @@ public class ApsServiceImpl implements ApsService {
             productionScheduleVo.setWashingtime(apsScheduleConfig.getWashingtime());
             productionScheduleVo.setStandingtime(apsScheduleConfig.getStandingtime());
             productionScheduleVo.setStandingyield(apsScheduleConfig.getStandingyield());
+            productionScheduleVo.setExpecteddays(apsScheduleConfig.getExpecteddays());
             if(productionScheduleVo.getStandingyield() == null){
                 productionScheduleVo.setStandingyield(60);
             }
@@ -798,6 +799,11 @@ public class ApsServiceImpl implements ApsService {
                 // 坯料计划订单
                 ProduceOrder produceOrder = new ProduceOrder(apsBlankOrderVo.getId(), apsBlankOrderVo.getMaterialname(), apsBlankOrderVo.getDeliverydate() == null ? null : DateUtil.offsetHour(apsBlankOrderVo.getDeliverydate(), -apsBlankOrderVo.getDeliverytime()));
                 produceOrder.setMaxheatroll(apsBlankOrderVo.getMaxheatroll());
+                // 期望交货天数
+                produceOrder.setExpecteddays(productionScheduleVo.getExpecteddays());
+                if(apsBlankOrderVo.getExpecteddays() != null && apsBlankOrderVo.getExpecteddays()>0){
+                    produceOrder.setExpecteddays(apsBlankOrderVo.getExpecteddays());
+                }
                 // 获取所有订单工序
                 List<ApsProcessOperationDo> operationDos = apsProcessOperationService.list(new LambdaQueryWrapper<ApsProcessOperationDo>()
                         .eq(ApsProcessOperationDo::getBlankid, apsBlankOrderVo.getId()));
@@ -1162,7 +1168,7 @@ public class ApsServiceImpl implements ApsService {
             // 锁定的作业
             if(LOCKMARK_Y.equals(operationDo.getLockmark())){
                 List<ApsProcessOperationProcessEquDo> processDetails = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
-                        .eq(ApsProcessOperationProcessEquDo::getProcessid, operationDo.getId()));
+                        .eq(ApsProcessOperationProcessEquDo::getProcessid, operationDo.getId()).orderByAsc(ApsProcessOperationProcessEquDo::getPlanstartdate));
                 for (ApsProcessOperationProcessEquDo processDetail : processDetails) {
                     ProductionProcesses processes = productionProcessesDetailInit(operationDo, produceOrder, optionalEquipments,outMaterDos,apsBlankOrderVo);
                     processes.setIfLock(true);

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

@@ -1,10 +1,10 @@
 package com.rongwei.bsentity.domain;
 
 import java.math.BigDecimal;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author fpy
- * @since 2024-04-08
+ * @since 2024-09-18
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -172,154 +172,137 @@ public class ApsBlankOrderDo extends BaseDo {
      */
     @TableField("LOCKMARK")
     private String lockmark;
-
     /**
      * 是否暂存
      */
     @TableField("ISSTAG")
     private String isstag;
-
     /**
      * 排程状态
      */
     @TableField("SCHEDULINGSTATUS")
     private String schedulingstatus;
-
     /**
      * 预计来料日期
      */
-    @TableField(value = "PLANHAVEMATERIALDATE")
+    @TableField("PLANHAVEMATERIALDATE")
     private Date planhavematerialdate;
-
     /**
      * 期望交货日期
      */
     @TableField("DELIVERYDATE")
     private Date deliverydate;
-
     /**
      * 排程交货日期-起
      */
     @TableField("SCHEDULEDATESTART")
     private Date scheduledatestart;
-
     /**
      * 排程交货日期-止
      */
     @TableField("SCHEDULEDATEEND")
     private Date scheduledateend;
-
     /**
      * 承诺交货日期-起
      */
     @TableField("PROMISEDATESTART")
     private Date promisedatestart;
-
     /**
-     * 承诺交货日期-止排程
+     * 承诺交货日期-止
      */
     @TableField("PROMISEDATEEND")
     private Date promisedateend;
+    /**
+     * 计划排产车间
+     */
+    @TableField("PLANNEDPRODUCTIONWORKSHOP")
+    private String plannedproductionworkshop;
     /**
      * 坯料输出物料类型
      */
     @TableField("BLANKOUTMATERTYPE")
     private String blankoutmatertype;
-
-
     /**
      * 坯料输出物料规格
      */
     @TableField("BLANKOUTMATERSPECIFICATION")
     private String blankoutmaterspecification;
-
     /**
      * 工艺输出物料规格
      */
     @TableField("PROCESSOUTMATERSPECIFICATION")
     private String processoutmaterspecification;
-    /**
-     * 计划排产车间
-     */
-    @TableField("PLANNEDPRODUCTIONWORKSHOP")
-    private String plannedproductionworkshop;
     /**
      * 路线产品类型
      */
-    @TableField(value = "ROUTEPRODUCTTYPEID")
+    @TableField("ROUTEPRODUCTTYPEID")
     private String routeproducttypeid;
-
     /**
      * 路线合金
      */
-    @TableField(value = "ROUTEMETAL")
+    @TableField("ROUTEMETAL")
     private String routemetal;
-
     /**
      * 路线合金状态
      */
-    @TableField(value = "ROUTEMETALSTATE")
+    @TableField("ROUTEMETALSTATE")
     private String routemetalstate;
-
     /**
      * 路线厚度-起（mm）
      */
-    @TableField(value = "ROUTETHICKSTR")
-    private BigDecimal routethinckstr;
-
+    @TableField("ROUTETHICKSTR")
+    private BigDecimal routethickstr;
     /**
      * 路线厚度-止（mm）
      */
-    @TableField(value = "ROUTETHICKEND")
+    @TableField("ROUTETHICKEND")
     private BigDecimal routethickend;
-
     /**
      * 路线宽度-起（mm）
      */
-    @TableField(value = "ROUTEWIDTHSTR")
-    private BigDecimal routewodthstr;
-
+    @TableField("ROUTEWIDTHSTR")
+    private BigDecimal routewidthstr;
     /**
      * 路线宽度-止（mm）
      */
-    @TableField(value = "ROUTEWIDTHEND")
+    @TableField("ROUTEWIDTHEND")
     private BigDecimal routewidthend;
-
     /**
      * 路线长度-起（mm）
      */
-    @TableField(value = "ROUTELENGTHSTR")
+    @TableField("ROUTELENGTHSTR")
     private BigDecimal routelengthstr;
-
     /**
      * 路线长度-止（mm）
      */
-    @TableField(value = "ROUTELENGTHEND")
+    @TableField("ROUTELENGTHEND")
     private BigDecimal routelengthend;
-
     /**
      * 坯料外观类型
      */
-    @TableField(value = "BLANKAPPEARANCE")
+    @TableField("BLANKAPPEARANCE")
     private String blankappearance;
-
     /**
      * 最大装炉卷数
      */
-    @TableField(value = "MAXHEATROLL")
+    @TableField("MAXHEATROLL")
     private Integer maxheatroll;
-
     /**
      * 坯料来源
      */
-    @TableField(value = "BLANKCOMEFROM")
+    @TableField("BLANKCOMEFROM")
     private String blankcomefrom;
-
     /**
      * 是否要更新工序作业1-要 0-不需要
      */
-    @TableField(value = "UPDATEPROCESS")
+    @TableField("UPDATEPROCESS")
     private String updateprocess;
+    /**
+     * 期望交货天数(天)
+     */
+    @TableField("EXPECTEDDAYS")
+    private Integer expecteddays;
+
 
     /**
      * 期望交货天数(天)

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

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author fpy
- * @since 2024-07-11
+ * @since 2024-09-18
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -137,16 +137,31 @@ public class ApsScheduleConfigDo extends BaseDo {
      */
     @TableField("STANDINGTIME")
     private Integer standingtime;
+    /**
+     * 排程速度
+     */
+    @TableField("PCSPEED")
+    private Integer pcspeed;
     /**
      * 立板产量（吨）
      */
     @TableField("STANDINGYIELD")
     private Integer standingyield;
     /**
-     * 排程速度
+     * 中退组炉度差（毫米）
      */
-    @TableField("PCSPEED")
-    private Integer pcspeed;
+    @TableField("MIDDIFFERENCE")
+    private Integer middifference;
+    /**
+     * 成退组炉度差（毫米）
+     */
+    @TableField("FURNACEDIFFERENCE")
+    private Integer furnacedifference;
+    /**
+     * 期望交货天数(天)
+     */
+    @TableField("EXPECTEDDAYS")
+    private Integer expecteddays;
 
 
 }

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

@@ -48,4 +48,9 @@ public class ProduceOrder {
      */
     private Integer maxheatroll;
 
+    /**
+     * 除铸轧外期望交货天数
+     */
+    private Integer expecteddays;
+
 }

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

@@ -89,4 +89,9 @@ public class ProductionScheduleVo {
      */
     private Integer pcspeed;
 
+    /**
+     * 除铸轧外期望交货天数
+     */
+    private Integer expecteddays;
+
 }