From 7e2347d5414d8db22e48b00bf903b85fa68c0de5 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期三, 10 九月 2025 10:37:23 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index ce9114e..5807e33 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -17,6 +17,7 @@
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.utils.NodeUtils;
+import com.zy.third.erp.task.ERPOutHedTBScheduler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -76,6 +77,9 @@
@Resource
private WrkMastService wrkMastService;
+
+ @Resource
+ private ERPOutHedTBScheduler erpOutHedTBScheduler;
@Override
@@ -198,16 +202,16 @@
// 鍑哄簱绔欑偣
Integer outSite = null;
- List<BasDevp> devps = basDevpService.selectList(new EntityWrapper<BasDevp>().in("dev_no", 223, 123));
+ List<BasDevp> devps = basDevpService.selectList(new EntityWrapper<BasDevp>().in("dev_no", 223, 123).orderBy("dev_no",false));
for (BasDevp basDevp : devps) {
// 鏃犲伐浣滃彿锛屾棤鐗�
- if (basDevp.getWrkNo() == 0 && basDevp.getLoading().equals("N")) {
+ if (basDevp.getWrkNo() == 0 && basDevp.getLoading().equals("Y")) {
outSite = basDevp.getDevNo();
break;
}
}
if (outSite == null) {
- outSite = 123;
+ outSite = 223;
}
Date now = new Date();
@@ -215,19 +219,22 @@
// 鑾峰彇鍗曟嵁
Order order = orderService.selectByNo(orderNo);
if (order == null) {
- int i = 30;
- while (i >= 0) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- order = orderService.selectByNo(orderNo);
- if (order != null) {
- break;
- }
- i--;
- }
+ erpOutHedTBScheduler.OutHedTBScheduler(orderNo);
+ order = orderService.selectByNo(orderNo);
+// int i = 30;
+// while (i >= 0) {
+// try {
+// Thread.sleep(1000);
+// System.out.println(i);
+// } catch (InterruptedException e) {
+// throw new RuntimeException(e);
+// }
+// order = orderService.selectByNo(orderNo);
+// if (order != null) {
+// break;
+// }
+// i--;
+// }
}
if (order == null) {
return R.parse("鍗曟嵁涓嶅瓨鍦細" + orderNo);
--
Gitblit v1.9.1