From d57d1ec5df1181244c0a9e425910d562feb2f5a2 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期二, 16 一月 2024 09:36:44 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |    9 ++++++++-
 src/main/java/com/zy/asrs/entity/param/TrussCombParam.java    |    5 +++--
 src/main/java/com/zy/asrs/utils/PostMesDataUtils.java         |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java b/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
index d99aef9..be30999 100644
--- a/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
@@ -21,8 +21,8 @@
 
     private String barcode;//		瀛楃涓�	鎵樼洏鐮�    璁㈠崟鍏辩敤                        //涓婁紶
     private Integer palletizingNo = 147;//	鏄�	瀛楃涓�	鐮佸灈浣嶇紪鍙�
-    private Integer staStart  = 147;//	鏄�	瀛楃涓�	鐮佸灈浣嶇紪鍙�                               //涓婁紶
-    private Integer palletizingNo2;//	鏄�	瀛楃涓�	鐩爣鐮佸灈浣嶇紪鍙�    璁㈠崟鍏辩敤
+    private Integer staStart  = 147;//	鏄�	瀛楃涓�	鐮佸灈浣嶇紪鍙�
+    private Integer palletizingNo2;//	鏄�	瀛楃涓�	鐩爣鐮佸灈浣嶇紪鍙�    璁㈠崟鍏辩敤         //涓婁紶
     private Integer staEnd;//	鏄�	瀛楃涓�	鐩爣鐮佸灈浣嶇紪鍙�    璁㈠崟鍏辩敤                 //涓婁紶
     private String boxType;//	鏄�	瀛楃涓�	鏈ㄧ绫诲瀷  brand                         //涓婁紶
     private String uuid;//		瀛楃涓�	鏃堕棿鎴�                                      //涓婁紶
@@ -61,6 +61,7 @@
 
         this.barcode = trussCombParam.getBarcode();
         this.staStart = 147;
+        this.palletizingNo2 = trussCombParam.getPalletizingNo2();
         this.staEnd = trussCombParam.getStaEnd();
         this.boxType = orderDetlList.get(0).getBrand();
         this.uuid = trussCombParam.getBarcode();
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index dbdd277..4e69974 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -42,7 +42,7 @@
     @Value("${srHangJia.url}")
     private String srHangJiaUrl;
 
-    @Value("${srHangJia.reportOutPath}")
+    @Value("${srHangJia.reportInPath}")
     private String reportOutPath;
 
     @Autowired
@@ -161,9 +161,16 @@
         List<OrderDetl> orderDetlList = new ArrayList<>();
         for (OrderDetl orderDetl: orderDetls){
             if (matListBoxNoList.contains(orderDetl.getBatch())){
+                orderDetl.setBrand("1");
                 orderDetlList.add(orderDetl);
             }
         }
+
+
+
+
+
+
         TrussCombParam trussCombParam = new TrussCombParam(param, order, orderDetlList);
         try{
             ReturnT<String> success = new PostMesDataUtils().postMesData("妗佹灦涓婁綅杞欢", srHangJiaUrl, reportOutPath, trussCombParam);
diff --git a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
index dad036d..c135e6f 100644
--- a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
+++ b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
@@ -37,7 +37,7 @@
                 System.out.println("response:"+response);
                 JSONObject jsonObject = JSON.parseObject(response);
 
-                if (jsonObject.getInteger("code").equals(200)) {
+                if (jsonObject.getInteger("code").equals(200) || jsonObject.getInteger("Code").equals(200)) {
                     success = true;
                 } else {
                     log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);

--
Gitblit v1.9.1