From 45e4ef2ecf62e32c243d72529f430c9b4f151b6b Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 05 十一月 2024 09:55:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs2' into xgmFlasrs2
---
src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
index e93a0a2..84fdaa0 100644
--- a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
@@ -7,6 +7,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -34,8 +35,9 @@
private ErpSqlServer erpSqlServer;
- @Transactional(rollbackFor = Throwable.class)
+ //@Transactional(rollbackFor = Throwable.class)
@Scheduled(cron = "${erp.refreshtime}")
+ @Async("orderThreadPool")
public void OutHedTBScheduler() {
//log.info("OutHedTBScheduler寮�濮嬩簡");
if (!erpEnabled) return;
@@ -44,7 +46,7 @@
if (!inHeds.isEmpty()) {
for (OutHedTB inHed : inHeds) {
if (!Cools.isEmpty(inHed.getTemp3()) && inHed.getTemp3().equals("fault")) {
- continue;
+ //continue;
}
HashMap<String, String> condition = new HashMap<>();
condition.put("BillNo", "'" + inHed.getBillNo() + "'");
@@ -57,9 +59,11 @@
log.info("鍑哄簱鍗曟嵁鎴愬姛,{}", inHed);
move(hedAndDet);
} catch (Exception e) {
- e.printStackTrace();
+ log.info(e.getMessage());
+// e.printStackTrace();
String sql = "UPDATE erp_OutHedTB SET Temp3 = 'fault' WHERE BillNo = '" + inHed.getBillNo() + "'";
erpSqlServer.update(sql);
+//
}
}
}
--
Gitblit v1.9.1