排程数据组装优化

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

@@ -683,8 +683,9 @@ public class ApsServiceImpl implements ApsService {
                 // 父子ID对应关系处理
                 List<String> processIdss = new ArrayList<>();
                 // 坯料计划订单
-                ProduceOrder produceOrder = new ProduceOrder(apsBlankOrderVo.getId(), apsBlankOrderVo.getMaterialname(), apsBlankOrderVo.getDeliverydate() == null ? null : DateUtil.offsetHour(apsBlankOrderVo.getDeliverydate(), -apsBlankOrderVo.getDeliverytime()));
+                ProduceOrder produceOrder = new ProduceOrder(apsBlankOrderVo.getId(), apsBlankOrderVo.getMaterialname(), apsBlankOrderVo.getDeliverydate() == null ? null : DateUtil.offsetHour(apsBlankOrderVo.getDeliverydate(), apsBlankOrderVo.getDeliverytime() == null ? 0 : -apsBlankOrderVo.getDeliverytime()));
                 produceOrder.setMaxheatroll(apsBlankOrderVo.getMaxheatroll());
+                produceOrder.setOrderNo(apsBlankOrderVo.getBlanknumber());
                 // 期望交货天数
                 produceOrder.setExpecteddays(productionScheduleVo.getExpecteddays());
                 if(apsBlankOrderVo.getExpecteddays() != null && apsBlankOrderVo.getExpecteddays()>0){
@@ -1216,6 +1217,7 @@ public class ApsServiceImpl implements ApsService {
         List<String> bss = new ArrayList<>();
         bss.add(operationDo.getId());
         processes.setBsProcessesId(bss);
+        processes.setProcessName(operationDo.getProcessname());
         // 工序任务可选设备
         processes.setOptionalEquipments(optionalEquipments);
         // 批次

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

@@ -32,6 +32,11 @@ public class ProduceOrder {
      */
     private String orderName;
 
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
     /**
      * 交货日期
      */

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

@@ -54,6 +54,11 @@ public class ProductionProcesses{
      */
     private String processType;
 
+    /**
+     * 工序名称
+     */
+    private String processName;
+
     /**
      * 所属的生产订单
      */
@@ -583,4 +588,12 @@ public class ProductionProcesses{
     public void setIssubsection(String issubsection) {
         this.issubsection = issubsection;
     }
+
+    public String getProcessName() {
+        return processName;
+    }
+
+    public void setProcessName(String processName) {
+        this.processName = processName;
+    }
 }