From 20e8b29ab26083c26b755d4c1087af2116d22262 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 26 七月 2023 09:55:02 +0800
Subject: [PATCH] agv 根据调试完善MES相关接口功能

---
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index d521519..0f716ab 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -45,14 +45,14 @@
     @Autowired
     private DocTypeService docTypeService;
 
-    @Value("${mes.pakin-sync.url}")
-    private String pakinUrl;
+    @Value("${mes.pakin-sync.uri}")
+    private String pakinUri;
 
     @Value("${mes.pakin-sync.path}")
     private String pakinPath;
 
-    @Value("${mes.pakout-sync.url}")
-    private String pakoutUrl;
+    @Value("${mes.pakout-sync.uri}")
+    private String pakoutUri;
 
     @Value("${mes.pakout-sync.path}")
     private String pakoutPath;
@@ -183,7 +183,7 @@
         boolean success = false;
         try {
             response = new HttpHandler.Builder()
-                    .setUri(pakoutUrl)
+                    .setUri(pakoutUri)
                     .setPath(pakoutPath)
                     .setJson(JSON.toJSONString(requestMap))
                     .build()
@@ -198,7 +198,7 @@
                 // 淇濆瓨鎺ュ彛鏃ュ織
                 apiLogService.save(
                         "鎴愬搧搴撳嚭搴撲笂鎶�",
-                        pakoutUrl + pakoutPath,
+                        pakoutUri + pakoutPath,
                         null,
                         "127.0.0.1",
                         JSON.toJSONString(requestMap),
@@ -219,7 +219,7 @@
 
         try {
             response = new HttpHandler.Builder()
-                    .setUri(pakinUrl)
+                    .setUri(pakinUri)
                     .setPath(pakinPath)
                     .setJson(JSON.toJSONString(requestMap))
                     .build()
@@ -234,7 +234,7 @@
                 // 淇濆瓨鎺ュ彛鏃ュ織
                 apiLogService.save(
                         "鎴愬搧搴撳叆搴撲笂鎶�",
-                        pakinUrl + pakinPath,
+                        pakinUri + pakinPath,
                         null,
                         "127.0.0.1",
                         JSON.toJSONString(requestMap),
@@ -253,6 +253,7 @@
         requestMap.put("orderNo",order.getOrderNo());
         requestMap.put("orderTime",order.getOrderTime());
         requestMap.put("orderType",orderType);
+        requestMap.put("storage",order.getShipName());
 
         List<DiaphragmInfo> diaphragmInfoList = orderDetls.stream().map(od -> {
             DiaphragmInfo diaphragmInfo = new DiaphragmInfo();

--
Gitblit v1.9.1