From d3d155627aac7ed9529eabc3de4a2dab4bda504e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 13 十一月 2025 13:19:51 +0800
Subject: [PATCH] ERP接口对接完善
---
src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java | 9 ++--
src/main/java/com/zy/common/constant/ApiInterfaceConstant.java | 41 ++++++++++++++++++++
src/main/java/com/zy/common/constant/MesConstant.java | 12 ------
version/doc/erp对接/自动化立体仓储系统ASRS-ERP接口对接协议.docx | 0
src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java | 9 ++--
5 files changed, 51 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java
index bf71b92..12e5fdd 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java
@@ -12,6 +12,7 @@
import com.zy.asrs.service.OrderPakinService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.constant.ApiInterfaceConstant;
import com.zy.common.constant.MesConstant;
import com.zy.common.model.MesPakinParam;
import com.zy.common.utils.HttpHandler;
@@ -62,8 +63,8 @@
ReturnT<String> result = SUCCESS;
try {
response = new HttpHandler.Builder()
- .setUri(MesConstant.URI)
- .setPath(MesConstant.PAKIN_PATH)
+ .setUri(ApiInterfaceConstant.ERP_IP)
+ .setPath(ApiInterfaceConstant.PAKIN_PATH)
.setJson(JSON.toJSONString(param))
.build()
.doPost();
@@ -73,7 +74,7 @@
orderPakinService.updateSettle(order.getId(), 6L, null);
success = true;
} else {
- log.error("鍏ュ簱瀹屾垚涓婃姤erp澶辫触锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URI + MesConstant.PAKIN_PATH, JSON.toJSONString(param), response);
+ log.error("鍏ュ簱瀹屾垚涓婃姤erp澶辫触锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.ERP_IP + ApiInterfaceConstant.PAKIN_PATH, JSON.toJSONString(param), response);
throw new CoolException("鍏ュ簱瀹屾垚涓婃姤erp澶辫触");
}
} catch (Exception e) {
@@ -84,7 +85,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鍏ュ簱瀹屾垚涓婃姤",
- MesConstant.URI + MesConstant.PAKIN_PATH,
+ ApiInterfaceConstant.ERP_IP + ApiInterfaceConstant.PAKIN_PATH,
null,
"127.0.0.1",
JSON.toJSONString(param),
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java
index 353c8ac..76ca839 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java
@@ -12,6 +12,7 @@
import com.zy.asrs.service.OrderPakoutService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.constant.ApiInterfaceConstant;
import com.zy.common.constant.MesConstant;
import com.zy.common.model.MesPakoutParam;
import com.zy.common.utils.HttpHandler;
@@ -62,8 +63,8 @@
ReturnT<String> result = SUCCESS;
try {
response = new HttpHandler.Builder()
- .setUri(MesConstant.URI)
- .setPath(MesConstant.PAKOUT_PATH)
+ .setUri(ApiInterfaceConstant.ERP_IP)
+ .setPath(ApiInterfaceConstant.PAKOUT_PATH)
.setJson(JSON.toJSONString(param))
.build()
.doPost();
@@ -73,7 +74,7 @@
orderPakoutService.updateSettle(order.getId(), 6L, null);
success = true;
} else {
- log.error("鍑哄簱瀹屾垚涓婃姤erp澶辫触锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URI + MesConstant.PAKOUT_PATH, JSON.toJSONString(param), response);
+ log.error("鍑哄簱瀹屾垚涓婃姤erp澶辫触锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.ERP_IP + ApiInterfaceConstant.PAKOUT_PATH, JSON.toJSONString(param), response);
throw new CoolException("鍑哄簱瀹屾垚涓婃姤erp澶辫触");
}
} catch (Exception e) {
@@ -84,7 +85,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鍑哄簱瀹屾垚涓婃姤",
- MesConstant.URI + MesConstant.PAKOUT_PATH,
+ ApiInterfaceConstant.ERP_IP + ApiInterfaceConstant.PAKOUT_PATH,
null,
"127.0.0.1",
JSON.toJSONString(param),
diff --git a/src/main/java/com/zy/common/constant/ApiInterfaceConstant.java b/src/main/java/com/zy/common/constant/ApiInterfaceConstant.java
new file mode 100644
index 0000000..8eb0a71
--- /dev/null
+++ b/src/main/java/com/zy/common/constant/ApiInterfaceConstant.java
@@ -0,0 +1,41 @@
+package com.zy.common.constant;
+
+/**
+ * @author pang.jiabao
+ * @description 璋冪敤澶栭儴API鍦板潃甯搁噺
+ * @createDate 2025/11/13 13:10
+ */
+public class ApiInterfaceConstant {
+
+ /* **************************************ERP鎺ュ彛瀵规帴 start*******************************************************/
+
+ /**
+ * ERP瀵规帴鍩虹鍦板潃
+ */
+// public static final String URI = "http://192.168.99.130:80";
+ // 娴嬭瘯鍦板潃
+ public static final String ERP_IP = "http://127.0.0.1:8080/yhfzwms/open/asrs";
+
+ /**
+ * 鍏ュ簱瀹屾垚涓婃姤璺緞
+ */
+ public static final String PAKIN_PATH = "/inOrderFinishReport";
+
+ /**
+ * 鍑哄簱瀹屾垚涓婃姤璺緞
+ */
+ public static final String PAKOUT_PATH = "/outOrderFinishReport";
+
+ /* ***************************************AGV鎺ュ彛瀵规帴 start*******************************************************/
+
+ /**
+ * AGV瀵规帴鍩虹鍦板潃
+ */
+ public static final String AGV_IP = "http://192.168.99.130:80";
+
+ /**
+ * 鍏ュ簱鍛煎彨AGV鍙栬揣
+ */
+ public static final String AGV_CALL_IN_PATH = "mes/api/zy/v1/packDown/sendList";
+
+}
diff --git a/src/main/java/com/zy/common/constant/MesConstant.java b/src/main/java/com/zy/common/constant/MesConstant.java
index 96933ae..5780a53 100644
--- a/src/main/java/com/zy/common/constant/MesConstant.java
+++ b/src/main/java/com/zy/common/constant/MesConstant.java
@@ -11,21 +11,9 @@
public static final String PACK_DOWN_URL = "mes/api/zy/v1/packDown/sendList";
- // 鍏ュ簱瀹屾垚涓婃姤璺緞
- public static final String PAKIN_PATH = "/inOrderFinishReport";
-
- // 鍑哄簱瀹屾垚涓婃姤璺緞
- public static final String PAKOUT_PATH = "/outOrderFinishReport";
-
-
/**
* token閫氳繃header浼犻�掔殑鍚嶇О
*/
public static final String TOKEN_HEADER_NAME = "Authorization";
-
- /**
- * token閫氳繃鍙傛暟浼犻�掔殑鍚嶇О
- */
- public static final String TOKEN_PARAM_NAME = "access_token";
}
diff --git "a/version/doc/erp\345\257\271\346\216\245/\350\207\252\345\212\250\345\214\226\347\253\213\344\275\223\344\273\223\345\202\250\347\263\273\347\273\237ASRS-ERP\346\216\245\345\217\243\345\257\271\346\216\245\345\215\217\350\256\256.docx" "b/version/doc/erp\345\257\271\346\216\245/\350\207\252\345\212\250\345\214\226\347\253\213\344\275\223\344\273\223\345\202\250\347\263\273\347\273\237ASRS-ERP\346\216\245\345\217\243\345\257\271\346\216\245\345\215\217\350\256\256.docx"
new file mode 100644
index 0000000..4c50e35
--- /dev/null
+++ "b/version/doc/erp\345\257\271\346\216\245/\350\207\252\345\212\250\345\214\226\347\253\213\344\275\223\344\273\223\345\202\250\347\263\273\347\273\237ASRS-ERP\346\216\245\345\217\243\345\257\271\346\216\245\345\215\217\350\256\256.docx"
Binary files differ
--
Gitblit v1.9.1