From 797fce4ad48f7b70dc08766068b64f35ee9d4775 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期五, 01 十一月 2024 14:31:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs2' into xgmFlasrs2
---
src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java | 2 ++
src/main/java/com/zy/common/config/ThreadPoolConfig.java | 1 +
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 28 ++++++++++++++++++++++++----
src/main/resources/application.yml | 2 +-
4 files changed, 28 insertions(+), 5 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 be5810c..ce9114e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -214,6 +214,24 @@
// 鑾峰彇鍗曟嵁
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--;
+ }
+ }
+ if (order == null) {
+ return R.parse("鍗曟嵁涓嶅瓨鍦細" + orderNo);
+ }
// 鑾峰彇鍗曟嵁鏄庣粏
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
@@ -287,6 +305,8 @@
}
return R.ok("鍑哄簱鎴愬姛");
}
+
+
@Override
@Transactional
@@ -679,12 +699,12 @@
@Override
@Transactional
public void syncMat(MatSyncParam param) {
- if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <=0 ) {
+ if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
}
- for(MatSyncParam.MatParam matParam : param.getMatDetails()){
- if(Cools.isEmpty(matParam.getMatnr())){
+ for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
+ if (Cools.isEmpty(matParam.getMatnr())) {
throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
}
@@ -777,7 +797,7 @@
}
} else {
mat.sync(param);
- if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
+ if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
}
diff --git a/src/main/java/com/zy/common/config/ThreadPoolConfig.java b/src/main/java/com/zy/common/config/ThreadPoolConfig.java
index 1b21b47..7ae1132 100644
--- a/src/main/java/com/zy/common/config/ThreadPoolConfig.java
+++ b/src/main/java/com/zy/common/config/ThreadPoolConfig.java
@@ -33,4 +33,5 @@
return executor;
}
+
}
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 e77f1fb..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;
@@ -36,6 +37,7 @@
//@Transactional(rollbackFor = Throwable.class)
@Scheduled(cron = "${erp.refreshtime}")
+ @Async("orderThreadPool")
public void OutHedTBScheduler() {
//log.info("OutHedTBScheduler寮�濮嬩簡");
if (!erpEnabled) return;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9912f44..41805fa 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -106,7 +106,7 @@
enabled: true
#enabled: false
#鏌ョ湅ERP涓棿琛ㄩ棿闅�
- refreshtime: 0 0/1 * * * ?
+ refreshtime: 0/5 * * * * ?
db:
driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://192.168.1.147:1800;databasename=XDLinkLK
--
Gitblit v1.9.1