排程数据组装优化

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

@@ -636,6 +636,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     apsProcessOperationProcessEqu.setSoftconflictdes(process.getSoftconflictdes());
                     apsProcessOperationProcessEqu.setDeleted("0");
                     apsProcessOperationProcessEqu.setUnfinishroll(apsProcessOperationProcessEqu.getPlanprocessrall());
+                    apsProcessOperationProcessEqu.setLeavewaitworkroll(apsProcessOperationProcessEqu.getPlanprocessrall());
+                    apsProcessOperationProcessEqu.setLeavewaitjobroll(apsProcessOperationProcessEqu.getPlanprocessrall());
                     apsProcessOperationProcessEqu.setPreviousprocessesids(CollUtil.join(process.getPreviousProcessesIds(), ","));
                     apsProcessOperationProcessEqu.setNextprocessesids(CollUtil.join(process.getNextProcessesIds(), ","));
                     apsProcessOperationProcessEqu.setLockmark("y");
@@ -646,6 +648,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         apsProcessOperationProcessEqu.setReportroll(hasEqu.getReportroll());
                         apsProcessOperationProcessEqu.setCheckoutroll(hasEqu.getCheckoutroll());
                         apsProcessOperationProcessEqu.setUnfinishroll(hasEqu.getUnfinishroll());
+                        apsProcessOperationProcessEqu.setLeavewaitworkroll(hasEqu.getLeavewaitworkroll());
+                        apsProcessOperationProcessEqu.setLeavewaitjobroll(hasEqu.getLeavewaitjobroll());
                         apsProcessOperationProcessEqu.setWorkstatus(hasEqu.getWorkstatus());
                         apsProcessOperationProcessEqu.setBachmaterialprocess(hasEqu.getBachmaterialprocess());
                         apsProcessOperationProcessEqu.setWaitreportid(hasEqu.getWaitreportid());