|
@@ -2,18 +2,16 @@ package com.rongwei.bsserver.controller;
|
|
|
|
|
|
|
|
|
import com.rongwei.bscommon.sys.service.ApsBlankOrderService;
|
|
|
+import com.rongwei.bscommon.sys.service.ApsService;
|
|
|
import com.rongwei.bsentity.domain.ApsBlankOrderDo;
|
|
|
import com.rongwei.bsentity.domain.ApsProductionTechnicalRequirementDo;
|
|
|
-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.bsentity.vo.*;
|
|
|
import com.rongwei.rwcommon.base.R;
|
|
|
-import lombok.SneakyThrows;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
@@ -33,6 +31,9 @@ public class ApsBlankOrderController {
|
|
|
@Autowired
|
|
|
private ApsBlankOrderService apsBlankOrderService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ApsService apsService;
|
|
|
+
|
|
|
/**
|
|
|
* 订单批量排程
|
|
|
*
|
|
@@ -131,11 +132,10 @@ public class ApsBlankOrderController {
|
|
|
R resData = apsBlankOrderService.insertOrder(params);
|
|
|
if (resData.getCode().equals("200")) {
|
|
|
//重新排程
|
|
|
- Thread thread = new Thread(new Runnable() {
|
|
|
- @SneakyThrows
|
|
|
- public void run() {
|
|
|
- apsBlankOrderService.apsReScheduling();
|
|
|
- }
|
|
|
+ Thread thread = new Thread(() -> {
|
|
|
+// apsBlankOrderService.apsReScheduling();
|
|
|
+ List<ApsBlankOrderVo> apsBlankOrders = new ArrayList<>();
|
|
|
+ apsService.apsSchedule(apsBlankOrders);
|
|
|
});
|
|
|
thread.start(); // 启动线程
|
|
|
return resData;
|