From aecd3f3e4e63770d2e23d1db2b63ab47d6dee5f1 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期五, 30 九月 2022 14:27:19 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   25 +++++++++++++------------
 1 files changed, 13 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 665097a..b496292 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);
@@ -813,9 +813,10 @@
             String response = "";
             boolean success = false;
             try {
-                Map<String, Object> map = new HashMap<>();
-                map.put("appkey","ea1f0459efc02a79f046f982767939ae");
-                response = new HttpHandler.Builder().setHeaders(map)
+//                Map<String, Object> map = new HashMap<>();
+//                map.put("appkey","ea1f0459efc02a79f046f982767939ae");
+                response = new HttpHandler.Builder()
+//                        .setHeaders(map)
                         .setUri(mesUrl)
                         .setPath(mesPath)
                         .setJson(JSON.toJSONString(combParam))

--
Gitblit v1.9.1