From 8cdd187911b0d660274e352dcbb41c296dcf0693 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 01 十一月 2024 14:19:49 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
}
--
Gitblit v1.9.1