From 147fcf9b349bd7314f6488a2c197d91fe6eb86a8 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期五, 30 九月 2022 18:23:46 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 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 b1b5780..5d3f5c3 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -700,13 +700,13 @@
                 if (locMast.getLocSts().equals("F")) {
                     locMast.setLocSts("R");
                     locMast.setModiTime(now);
-//                    locMast.setPackStatus(5); //5:闈欑疆瀹屾垚
-//                    CombParam combParam = new CombParam();
-//                    combParam.setPackNo(locMast.getBarcode());
-//                    combParam.setLocno(locMast.getLocNo());
-//                    combParam.setPackSts(6);
-//                    combParam.setRequestTime(DateUtils.convert(new Date()));
-//                    postMesData(inpath,combParam);
+                    locMast.setPackStatus(5); //5:闈欑疆瀹屾垚
+                    CombParam combParam = new CombParam();
+                    combParam.setPackNo(locMast.getBarcode());
+                    combParam.setLocNo(locMast.getLocNo());
+                    combParam.setPackSts(6);
+                    combParam.setRequestTime(DateUtils.convert(new Date()));
+                    postMesData(inpath,combParam);
 
                     if (!locMastService.updateById(locMast)) {
                         throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
@@ -745,7 +745,7 @@
                 locMast.setPackStatus(2);
                 CombParam combParam = new CombParam();
                 combParam.setPackNo(locMast.getBarcode());
-                combParam.setLocno(locMast.getLocNo());
+                combParam.setLocNo(locMast.getLocNo());
                 combParam.setPackSts(2);
                 combParam.setRequestTime(DateUtils.convert(new Date()));
                 postMesData(inpath,combParam);
@@ -790,7 +790,7 @@
                 testMast.setModiTime(date);
                 CombParam combParam = new CombParam();
                 combParam.setPackNo(locMast.getBarcode());
-                combParam.setLocno(locMast.getLocNo());
+                combParam.setLocNo(locMast.getLocNo());
                 combParam.setPackSts(3);
                 combParam.setRequestTime(DateUtils.convert(new Date()));
                 postMesData(inpath,combParam);
@@ -829,11 +829,11 @@
                     }else if (jsonObject.getDate("isComplete").equals(false)){
                         success = false;
                     }else {
-                        log.error("杩斿洖鍊煎嚭閿�!!!url锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response);
+                        log.error("杩斿洖鍊煎嚭閿�!!!url锛歿}锛況equest锛歿}锛況esponse锛歿}", mesUrl+mesPath, JSON.toJSONString(combParam), response);
                         throw new CoolException("杩斿洖鍊煎嚭閿�");
                     }
                 } else {
-                    log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response);
+                    log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", mesUrl+mesPath, JSON.toJSONString(combParam), response);
                     throw new CoolException("涓婃姤mes绯荤粺澶辫触");
                 }
             } catch (Exception e) {
@@ -845,7 +845,7 @@
                     // 淇濆瓨鎺ュ彛鏃ュ織
                     apiLogService.save(
                             "鎴愬搧搴撳叆搴撲笂鎶�",
-                            MesConstant.URL + MesConstant.PAKIN_URL,
+                            mesUrl + mesPath,
                             null,
                             "127.0.0.1",
                             JSON.toJSONString(combParam),

--
Gitblit v1.9.1