From c0bc2548715c8506bc69c5b6625e0810264b9fb6 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 17 十月 2025 15:24:25 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/task/handler/AgvHandler.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
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..07b3444 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvHandler.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.R;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
@@ -13,10 +14,14 @@
import com.zy.asrs.service.WrkMastService;
import com.zy.common.constant.AgvApiConstant;
import com.zy.common.utils.HttpHandler;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -42,10 +47,18 @@
@Resource
private OrderService orderService;
+ @Autowired
+ private ConfigService configService;
+
/**
* 鍑哄簱鍛煎彨agv鎺ヨ揣
*/
public void outboundCallAgvHandller(Integer wrkNo) {
+
+ Config mesAuto = configService.selectConfigByCode("CLOSE_OUTBOUND");
+ if (mesAuto != null && mesAuto.getValue().equals("0")) {
+ return ;
+ }
WrkMast wrkMast = wrkMastService.selectById(wrkNo);
if (wrkMast == null) {
@@ -71,9 +84,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 +106,7 @@
if (order != null) {
jsonObject.put("erpCode", orderNo); // 宸ュ崟鍙�
- jsonObject.put("outBoundtype", order.getDocType$()); // 鍏ュ嚭搴撳崟鎹被鍨�
+ //jsonObject.put("outBoundtype", order.getDocType$()); // 鍏ュ嚭搴撳崟鎹被鍨�
}
String body = jsonObject.toString();
@@ -106,7 +121,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);
@@ -135,5 +150,4 @@
}
}
}
-
}
--
Gitblit v1.9.1