排程登录信息统一

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

@@ -49,7 +49,7 @@ public interface ApsBlankOrderService extends IService<ApsBlankOrderDo> {
     R removeBlankOrder(ApsBlankOrderDo req);
     void removeBlankOrderAndChild(ApsBlankOrderDo req);
 
-    void apsAfter(ProductionScheduleRetVo productionScheduleRetVo,List<ApsBlankOrderVo> apsBlankOrders);
+    void apsAfter(ProductionScheduleRetVo productionScheduleRetVo,List<ApsBlankOrderVo> apsBlankOrders,SysUserVo currentUser);
 
     R checkAndUpdateBlankAndOutput(ApsProductionTechnicalRequirementDo req);
     void updateBlankSplicingColumn(String blankId);

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

@@ -611,7 +611,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void apsAfter(ProductionScheduleRetVo productionScheduleRetVo, List<ApsBlankOrderVo> apsBlankOrders) {
+    public void apsAfter(ProductionScheduleRetVo productionScheduleRetVo, List<ApsBlankOrderVo> apsBlankOrders,SysUserVo currentUser) {
         // 先删除所有作业的明细
         List<String> blankids = apsBlankOrders.stream().map(v -> v.getId()).collect(Collectors.toList());
 //        processOperationProcessEquService.remove(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
@@ -823,7 +823,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 //            apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>().in(ApsProcessOperationProcessEquDo::getBlankid, blankKeys).set(ApsProcessOperationProcessEquDo::getLockmark, "y"));
         }
         logger.info("作业加锁结束..: " + blankids);
-        backupProcessOperation(apsProcessOperationProcessEquDos, productionScheduleRetVo.getProcesses());
+        backupProcessOperation(apsProcessOperationProcessEquDos, productionScheduleRetVo.getProcesses(),currentUser);
     }
 
     /**
@@ -833,7 +833,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
      * @param processes
      */
     private void backupProcessOperation(List<ApsProcessOperationProcessEquDo> apsProcessOperationProcessEquDos,
-                                        List<ProductionProcesses> processes) {
+                                        List<ProductionProcesses> processes,SysUserVo currentUser) {
 
 
         // 工序作业明细ID
@@ -841,9 +841,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 .flatMap(List::stream)
                 .distinct()
                 .collect(Collectors.toList());
-        SysUserVo currentUser = CXCommonUtils.getCurrentUser();
+        if(currentUser == null){
+            currentUser = CXCommonUtils.getCurrentUser();
+        }
         //删除备份
-        ApsUtils.clearBackup(null);
+        ApsUtils.clearBackup(currentUser);
 
         /*****************************开始工序作业备份********************************/
         StopWatch stopWatch = new StopWatch();

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

@@ -308,7 +308,7 @@ public class ApsServiceImpl implements ApsService {
                     // 获取坯料计划
                     List<ApsBlankOrderVo> apsBlankOrderss = new ArrayList<>();
                     apsBlankOrderss.add(bo);
-                    apsBlankOrderService.apsAfter(productionScheduleRetVo,apsBlankOrderss);
+                    apsBlankOrderService.apsAfter(productionScheduleRetVo,apsBlankOrderss,currentUser);
                 }
             }catch (Exception e) {
                 e.printStackTrace();
@@ -334,7 +334,7 @@ public class ApsServiceImpl implements ApsService {
         if(voms != null && voms.size()>0){
             voms.forEach((k,v)->{
                 try{
-                    apsOrderScheduleApsNew(v);
+                    apsOrderScheduleApsNew(v,currentUser);
                 }catch (Exception e) {
                     e.printStackTrace();
                     logger.info("排程异常",e);
@@ -359,7 +359,7 @@ public class ApsServiceImpl implements ApsService {
         }
     }
 
-    private void apsOrderScheduleApsNew(List<ApsBlankOrderVo> apsBlankOrders){
+    private void apsOrderScheduleApsNew(List<ApsBlankOrderVo> apsBlankOrders,SysUserVo currentUser){
         // 坯料计划排序
         Collections.sort(apsBlankOrders,(v1,v2)->{
             // 合金
@@ -559,7 +559,7 @@ public class ApsServiceImpl implements ApsService {
                 // 获取坯料计划
                 /*List<ApsBlankOrderVo> apsBlankOrderss = new ArrayList<>();
                 apsBlankOrderss.add(bo);*/
-                apsBlankOrderService.apsAfter(productionScheduleRetVo,apsBlankOrders);
+                apsBlankOrderService.apsAfter(productionScheduleRetVo,apsBlankOrders,currentUser);
             }
         }
     }