From 3bf6f972604761c9ac59a2cb9ea01eeacaec2189 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期六, 28 三月 2026 15:43:51 +0800
Subject: [PATCH] 更新为正式部署许可证
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 1e31768..f03525a 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -8,6 +8,7 @@
import com.zy.asrs.controller.OutController;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.mes.*;
+import com.zy.asrs.mapper.CanFinMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.RcsServiceImpl;
import com.zy.asrs.task.core.ReturnT;
@@ -40,6 +41,8 @@
private OrderService orderService;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private TaskService taskService;
@Resource
private OrderPakinService orderPakinService;
@Resource
@@ -69,6 +72,9 @@
@Autowired
private OutController outController;
+
+ @Autowired
+ private CanFinMapper canFinMapper;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -257,11 +263,12 @@
}
// 瑁呴厤鍗曡嚜鍔ㄥ嚭搴�
- @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "* * * * * ? ")
// @Async("orderThreadPool")
void AutoOutOrderPinOut() throws InterruptedException {
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ //绛涢�夎繕娌℃墽琛岀殑鍑哄簱浠诲姟
List<OrderPakout> orderPakouts = orderPakoutService.selectList(new EntityWrapper<OrderPakout>()
.eq("settle", 1)
.eq("doc_type", 12)
@@ -270,6 +277,51 @@
return;
}
for (OrderPakout orderPakout : orderPakouts) {
+// //绛涢�夊叏閮ㄨ繕鏈墽琛岀殑鍏ュ簱浠诲姟
+// List<Task> wrkSts = taskService.selectList(new EntityWrapper<Task>()
+// .eq("sta_no", "307")
+// .in("wrk_sts", 301,202)
+// .orderBy("wrk_date", true)
+// );
+// if (!wrkSts.isEmpty()) {
+// //鑾峰彇绗竴鏉″叆搴撳崟
+// Task task = wrkSts.get(0);
+// // 濡傛灉绗竴鏉¤繕鏈紑濮嬬殑鍑哄簱浠诲姟鏃堕棿鏅氫簬绗竴鏉℃湭瀹屾垚鐨勫叆搴撲换鍔℃椂闂达紝璺宠繃锛屼笉鎵ц
+// if (orderPakout.getCreateTime().getTime() > task.getWrkDate().getTime()){
+// continue;
+// }
+// }
+
+ String sourceNo = orderPakout.getCstmrName();
+ List<Task> tasks = taskService.selectList(new EntityWrapper<Task>()
+ .eq("source_sta_no", sourceNo)
+ .in("wrk_sts", 301, 302, 303));
+ if (!tasks.isEmpty() && tasks != null){
+ continue;
+ }
+
+// // 鏌ヨcan_fin琛ㄤ腑鐩稿悓鍗曞彿鐨勫唴瀹�
+// List<CanFin> conntOut = canFinMapper.selectList(
+// new EntityWrapper<CanFin>()
+// .eq("out_no", orderPakout.getOrderNo())
+// );
+// if (!conntOut.isEmpty()) {
+// // 妫�鏌ユ槸鍚︽弧瓒崇户缁墽琛岀殑鏉′欢锛歛gv_type涓篴gv-in-out涓攖ask_type涓篶anout
+// boolean canContinue = false;
+// for (CanFin canFin : conntOut) {
+//// if ("agv-in-out".equals(canFin.getAgvType()) && "canout".equals(canFin.getTaskStatus())) {
+// if ("agv-out".equals(canFin.getAgvType()) && "canout".equals(canFin.getTaskStatus())) {
+// log.info("can_fin琛ㄦ湁婊¤冻鏉′欢鐨勮褰曪紝鎵ц鍑哄簱鍗曪細{}", orderPakout.getOrderNo());
+// canContinue = true;
+// break;
+// }
+// }
+// if (!canContinue) {
+// // 涓嶆弧瓒虫潯浠讹紝璺宠繃鍑哄簱鍗�
+// continue;
+// }
+// }
+
List<LocDto> locDtos = new ArrayList<>();
Boolean boo = false;
--
Gitblit v1.9.1