瀏覽代碼

aps-排程组装数据优化

sucheng 5 月之前
父節點
當前提交
50da35cd11

+ 9 - 1
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsService.java

@@ -1,6 +1,10 @@
 package com.rongwei.bscommon.sys.service;
 
 import cn.hutool.core.date.DateTime;
+import com.rongwei.bsentity.domain.ApsProcessOperationDo;
+import com.rongwei.bsentity.domain.ApsProcessOperationEquDo;
+import com.rongwei.bsentity.domain.ApsProcessOperationOutMaterDo;
+import com.rongwei.bsentity.domain.ApsProcessOperationProcessEquDo;
 import com.rongwei.bsentity.vo.ApsBlankOrderVo;
 import com.rongwei.bsentity.vo.ApsTypeVo;
 import com.rongwei.bsentity.vo.ProductionScheduleVo;
@@ -14,6 +18,10 @@ public interface ApsService {
 
     void apsSchedule(List<ApsBlankOrderVo> apsBlankOrders, ApsTypeVo apsType, SysUserVo currentUser, List<String> needUnLockProcessIdList, DateTime scheduleStartDate);
 
-    ProductionScheduleVo apsProductionScheduleInit(List<ApsBlankOrderVo> apsBlankOrders, Date apsPlanStartDate,List<String> needUnLockProcessIdList);
+    ProductionScheduleVo apsProductionScheduleInit(List<ApsBlankOrderVo> apsBlankOrders, Date apsPlanStartDate,List<String> needUnLockProcessIdList,
+                                                   List<ApsProcessOperationDo> baseApsProcessOperationList,
+                                                   List<ApsProcessOperationProcessEquDo> baseApsProcessOperationProcessEquList,
+                                                   List<ApsProcessOperationOutMaterDo> baseApsProcessOperationOutMaterList,
+                                                   List<ApsProcessOperationEquDo> baseApsProcessOperationEquDoList);
 
 }

File diff suppressed because it is too large
+ 523 - 426
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsServiceImpl.java