From f8a1d06420b4a895d83cf14f267ddbb492f8a92a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 24 十一月 2023 08:29:43 +0800
Subject: [PATCH] #出入库站点检测报警信息

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index f6b7da2..0ef79b7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1140,7 +1140,7 @@
                 //鎼滅储鏄惁鏈夊叾浠栦换鍔″崰鐢ㄤ簡鎻愬崌鏈猴紝濡傛灉鍗犵敤鎻愬崌鏈虹殑浠诲姟鍜屽綋鍓嶄换鍔$浉鍚岋紝鍒欒繍琛屾墽琛�
                 WrkMast wrkMast1 = wrkMastMapper.selectLiftWrkMast(liftProtocol.getLiftNo().intValue());
                 if (wrkMast1 != null && wrkMast1.getWrkNo().intValue() != wrkMast.getWrkNo().intValue()) {
-                    News.info("{0}鍙锋彁鍗囨満锛岃鍏朵粬浠诲姟{1}鍗犵敤涓斿拰褰撳墠浠诲姟{2}涓嶇浉鍚岋紝绂佹娲惧彂", liftSlave.getId(), wrkMast1.getWrkNo(), wrkMast.getWrkNo());
+                    News.info("{}鍙锋彁鍗囨満锛岃鍏朵粬浠诲姟{}鍗犵敤涓斿拰褰撳墠浠诲姟{}涓嶇浉鍚岋紝绂佹娲惧彂", liftSlave.getId(), wrkMast1.getWrkNo(), wrkMast.getWrkNo());
                     continue;
                 }
 
@@ -2319,6 +2319,7 @@
                     .build()
                     .doPost();
             JSONObject jsonObject = JSON.parseObject(response);
+            log.info("鎮寕绾匡紝wms杩斿洖缁撴灉锛�" + jsonObject);
             Integer code = jsonObject.getInteger("code");
             if (code.equals(200)) {//鍛煎彨AGV
                 return true;
@@ -2504,6 +2505,7 @@
                         Utils.wapperSetCondition(wrapper,"batch",locDetl.getBatch());
                         Utils.wapperSetCondition(wrapper,"three_code",locDetl.getThreeCode());
                         Utils.wapperSetCondition(wrapper,"dead_time",locDetl.getDeadTime());
+                        Utils.wapperSetCondition(wrapper,"supp_code",locDetl.getSuppCode());//鏂欑鐮�
                         WrkDetl detl = wrkDetlService.selectOne(wrapper);
                         if (Cools.isEmpty(detl)) {
                             String suppCode = "";

--
Gitblit v1.9.1