From d95fc02c3cef872247693572e1bbb0f0e2ccd25d Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 05 十一月 2024 09:56:44 +0800
Subject: [PATCH] 接口对接调试
---
src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java | 33 ++++++++++++++++
src/main/java/com/zy/asrs/task/handler/AgvHandler.java | 10 +++--
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 33 ++++++++++------
3 files changed, 59 insertions(+), 17 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..2dfd83b 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
@@ -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);
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvHandler.java
index f808c2c..e5f2e5c 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvHandler.java
@@ -71,9 +71,11 @@
// 鏋勯�犺姹備綋
JSONObject jsonObject = new JSONObject();
jsonObject.put("trayCode", wrkMast.getBarcode()); // 鎵樼洏鏉＄爜
- jsonObject.put("startLocation",wrkMast.getStaNo()); // 鎻愬崌鏈哄彿
- jsonObject.put("endLocation",wrkMast.getInvWh()); // 鍦扮爜/缁堢偣璐т綅
+ jsonObject.put("startLocation", wrkMast.getStaNo()); // 鎻愬崌鏈哄彿
+ jsonObject.put("endLocation", wrkMast.getInvWh()); // 鍦扮爜/缁堢偣璐т綅
jsonObject.put("taskId", wrkMast.getWrkNo()); // 浠诲姟id
+ jsonObject.put("outBoundtype", "2.1.2.1鍘熸枡/鍗婃垚鍝佸嚭搴�");
+ //jsonObject.put("erpCode", wrkDetls.get(0).getOrderNo());
// 淇濆瓨涓�涓鍗曟槑缁嗙殑鍗曟嵁缂栧彿
String orderNo = "";
JSONArray jsonArray = new JSONArray();
@@ -91,7 +93,7 @@
if (order != null) {
jsonObject.put("erpCode", orderNo); // 宸ュ崟鍙�
- jsonObject.put("outBoundtype", order.getDocType$()); // 鍏ュ嚭搴撳崟鎹被鍨�
+ //jsonObject.put("outBoundtype", order.getDocType$()); // 鍏ュ嚭搴撳崟鎹被鍨�
}
String body = jsonObject.toString();
@@ -106,7 +108,7 @@
.doPost();
if (!Cools.isEmpty(response)) {
JSONObject jsonObject1 = JSONObject.parseObject(response);
- if ((Integer) jsonObject1.get("code") == 200) {
+ if (jsonObject1.get("code") != null && jsonObject1.get("code").equals("200")) {
success = true;
wrkMast.setRefWrkno(1.0);
wrkMastService.updateById(wrkMast);
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 84fdaa0..31326fe 100644
--- a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
@@ -69,6 +69,39 @@
}
}
+
+
+ public void OutHedTBScheduler(String orderNo) {
+ //log.info("OutHedTBScheduler寮�濮嬩簡");
+ if (!erpEnabled) return;
+ String sqlInHed = "select * from erp_OutHedTB where LKName='涓壃浜屾湡' and BillNo = '"+ orderNo +"'";
+ List<OutHedTB> inHeds = erpSqlServer.select(sqlInHed, OutHedTB.class);
+ if (!inHeds.isEmpty()) {
+ for (OutHedTB inHed : inHeds) {
+ if (!Cools.isEmpty(inHed.getTemp3()) && inHed.getTemp3().equals("fault")) {
+ //continue;
+ }
+ HashMap<String, String> condition = new HashMap<>();
+ condition.put("BillNo", "'" + inHed.getBillNo() + "'");
+ List<OutDetTB> inDetTBS = erpSqlServer.selectList(OutDetTB.class, condition);
+ HashMap<String, Object> hedAndDet = new HashMap<>();
+ hedAndDet.put("hed", inHed);
+ hedAndDet.put("det", inDetTBS);
+ try {
+ inMS.createOutOrder(inHed, inDetTBS);
+ log.info("鍑哄簱鍗曟嵁鎴愬姛,{}", inHed);
+ move(hedAndDet);
+ } catch (Exception e) {
+ log.info(e.getMessage());
+// e.printStackTrace();
+ String sql = "UPDATE erp_OutHedTB SET Temp3 = 'fault' WHERE BillNo = '" + inHed.getBillNo() + "'";
+ erpSqlServer.update(sql);
+//
+ }
+ }
+ }
+ }
+
@Transactional(rollbackFor = Throwable.class)
public void move(HashMap<String, Object> hedAndDet) {
OutHedTB hed = (OutHedTB) hedAndDet.get("hed");
--
Gitblit v1.9.1