插单调整

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

@@ -14,6 +14,6 @@ public interface ApsService {
     ProductionScheduleVo apsProductionScheduleInit(List<ApsBlankOrderVo> apsBlankOrders);
 
     //插单重新排程
-    void insertSchedule(Map<String, Object> params);
+    void insertSchedule(Map<String, Object> params,SysUserVo currentUser);
 
 }

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

@@ -830,11 +830,9 @@ public class ApsServiceImpl implements ApsService {
     //插单重新排程
     @Override
     @Async("taskExecutor")
-    public void insertSchedule(Map<String, Object> params) {
+    public void insertSchedule(Map<String, Object> params,SysUserVo currentUser) {
         List<ApsBlankOrderVo> apsBlankOrders = apsBlankOrderDao.getByOrderId(params.get("PRODUCTIONORDERID").toString());
         if (apsBlankOrders != null && apsBlankOrders.size() > 0) {
-            //获取当前用户相关信息
-            SysUserVo currentUser = CXCommonUtils.getCurrentUser();
             apsSchedule(apsBlankOrders, "cd",currentUser);
         }
     }

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsBlankOrderController.java

@@ -9,8 +9,10 @@ import com.rongwei.bsentity.vo.ApsPlanVo;
 import com.rongwei.bsentity.vo.CheckAndSaveOrUpdateBlankReq;
 import com.rongwei.bsentity.vo.CheckScheduleReq;
 import com.rongwei.bsentity.vo.OrderLockVo;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.vo.CriteriaQuery;
+import com.rongwei.safecommon.utils.CXCommonUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -134,8 +136,10 @@ public class ApsBlankOrderController {
             log.info("插单;参数为：{}", params);
             R resData = apsBlankOrderService.insertOrder(params);
             if (resData.getCode().equals("200")) {
+                //获取当前用户相关信息
+                SysUserVo currentUser = CXCommonUtils.getCurrentUser();
                 //重新排程
-                apsService.insertSchedule(params);
+                apsService.insertSchedule(params,currentUser);
 
                 return resData;
             } else {