Browse Source

根节点ID

fangpy 3 months ago
parent
commit
6c1ac69d0f

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

@@ -858,6 +858,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     if (process.getOptionalEquipmentZg() != null && process.getOptionalEquipmentZg().size() > 0) {
                         apsProcessOperationProcessEqu.setRollerid(process.getOptionalEquipmentZg().get(process.getEquipment().getId()));
                     }
+                    apsProcessOperationProcessEqu.setRoottaskid(process.getRoottaskid());
                     if (hasEqu != null) {
                         apsProcessOperationProcessEqu.setClosestatus(hasEqu.getClosestatus());
                         apsProcessOperationProcessEqu.setPlanprocessrall(hasEqu.getPlanprocessrall());
@@ -880,6 +881,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         apsProcessOperationProcessEqu.setInputunqualifiednum(hasEqu.getInputunqualifiednum());
                         apsProcessOperationProcessEqu.setInputunqualifiedroll(hasEqu.getInputunqualifiedroll());
                         apsProcessOperationProcessEqu.setCancelrollno(hasEqu.getCancelrollno());
+                        apsProcessOperationProcessEqu.setRoottaskid(hasEqu.getRoottaskid());
                     }
                     apsProcessOperationProcessEquDos.add(apsProcessOperationProcessEqu);
                 }

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

@@ -238,4 +238,9 @@ public class ApsProcessOperationProcessEquDo extends BaseDo {
      */
     @TableField("OLDPLANENDDATE")
     private Date oldplanenddate;
+    /**
+     * 原计划开工时间
+     */
+    @TableField("ROOTTASKID")
+    private String roottaskid;
 }

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

@@ -250,6 +250,11 @@ public class ProductionProcesses{
      */
     private String issubsection;
 
+    /**
+     * 根节点ID
+     */
+    private String roottaskid;
+
     /**
      * 是否已取消
      */
@@ -649,4 +654,12 @@ public class ProductionProcesses{
     public void setLastHistoryEquipmentId(String lastHistoryEquipmentId) {
         this.lastHistoryEquipmentId = lastHistoryEquipmentId;
     }
+
+    public String getRoottaskid() {
+        return roottaskid;
+    }
+
+    public void setRoottaskid(String roottaskid) {
+        this.roottaskid = roottaskid;
+    }
 }