aps-作业明细增加排程开工、完工时间

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

@@ -857,6 +857,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     apsProcessOperationProcessEqu.setTenantid(process.getEquipment().getFactoryid());
                     apsProcessOperationProcessEqu.setPlanstartdate(Date.from(process.getStartTime().atZone(ZoneId.systemDefault()).toInstant()));
                     apsProcessOperationProcessEqu.setPlanenddate(Date.from(process.getEndTime().atZone(ZoneId.systemDefault()).toInstant()));
+                    apsProcessOperationProcessEqu.setSchedulestartdate(Date.from(process.getStartTime().atZone(ZoneId.systemDefault()).toInstant()));
+                    apsProcessOperationProcessEqu.setScheduleenddate(Date.from(process.getEndTime().atZone(ZoneId.systemDefault()).toInstant()));
                     if ("小卷成退".equals(process.getProcessType()) || "小卷包装".equals(process.getProcessType())) {
                         apsProcessOperationProcessEqu.setPlanprocessrall(process.getMinThPcNum());
                     } else {
@@ -928,6 +930,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         apsProcessOperationProcessEqu.setProcessdevice(process.getEquipment().getEquipmentName());
                         apsProcessOperationProcessEqu.setPlanstartdate(Date.from(process.getStartTime().atZone(ZoneId.systemDefault()).toInstant()));
                         apsProcessOperationProcessEqu.setPlanenddate(Date.from(process.getEndTime().atZone(ZoneId.systemDefault()).toInstant()));
+                        apsProcessOperationProcessEqu.setSchedulestartdate(Date.from(process.getStartTime().atZone(ZoneId.systemDefault()).toInstant()));
+                        apsProcessOperationProcessEqu.setScheduleenddate(Date.from(process.getEndTime().atZone(ZoneId.systemDefault()).toInstant()));
                         apsProcessOperationProcessEqu.setPlanprocessrall(v.size());
                         apsProcessOperationProcessEqu.setProcessworkshopid(process.getEquipment().getWorkshopid());
                         apsProcessOperationProcessEqu.setProcessworkshop(process.getEquipment().getWorkshopname());

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

@@ -200,4 +200,16 @@ public class ApsProcessOperationProcessEquBackupDo extends BaseDo implements Ser
      * 原计划完工时间
      */
     private Date oldplanenddate;
+    /**
+     * 第一道明细ID
+     */
+    private String roottaskid;
+    /**
+     * 排程开工时间
+     */
+    private Date schedulestartdate;
+    /**
+     * 排程完工时间
+     */
+    private Date scheduleenddate;
 }

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

@@ -248,4 +248,14 @@ public class ApsProcessOperationProcessEquDo extends BaseDo {
      */
     @TableField("ROOTTASKID")
     private String roottaskid;
+    /**
+     * 排程开工时间
+     */
+    @TableField("SCHEDULESTARTDATE")
+    private Date schedulestartdate;
+    /**
+     * 排程完工时间
+     */
+    @TableField("SCHEDULEENDDATE")
+    private Date scheduleenddate;
 }