From 6ec3505f6acceca7eae90693d9e4b109942f4185 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期四, 10 七月 2025 13:45:10 +0800
Subject: [PATCH] 接口对接调试
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 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..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,22 +202,43 @@
// 鍑哄簱绔欑偣
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();
// 鑾峰彇鍗曟嵁
Order order = orderService.selectByNo(orderNo);
+ if (order == null) {
+ 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);
+ }
// 鑾峰彇鍗曟嵁鏄庣粏
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
@@ -287,6 +312,8 @@
}
return R.ok("鍑哄簱鎴愬姛");
}
+
+
@Override
@Transactional
@@ -679,12 +706,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 +804,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