From 1503a5ccffbf2448d15ac662ad949521a189a2c7 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期四, 01 五月 2025 12:10:10 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java     |   11 +++++++++++
 src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java |   10 +++++++++-
 2 files changed, 20 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 3ac2728..27bc4e9 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -291,6 +291,9 @@
                                         .setJson(JSON.toJSONString(hashMap))
                                         .build()
                                         .doPost();
+//                                if (!Cools.isEmpty(msg)&&"璇峰厛缁勬墭".equalsIgnoreCase(msg)){
+//                                    ledThread.error(msg);
+//                                }
                                 News.error("鍏ュ簱鐢宠澶辫触锛屼换鍔℃暟鎹�={}锛岃姹傚搷搴�={}", JSON.toJSON(param), JSON.toJSON(jsonObject));
                             }
                         } catch (Exception e) {
@@ -375,6 +378,9 @@
                                             .setJson(JSON.toJSONString(hashMap))
                                             .build()
                                             .doPost();
+//                                    if (!Cools.isEmpty(msg)&&"璇峰厛缁勬墭".equalsIgnoreCase(msg)){
+//                                        ledThread.error(msg);
+//                                    }
                                     News.error("鍏ュ簱鐢宠澶辫触锛屼换鍔℃暟鎹�={}锛岃姹傚搷搴�={}", JSON.toJSON(param), JSON.toJSON(jsonObject));
                                 }
                             } catch (Exception e) {
@@ -1529,6 +1535,11 @@
                             notifyUtils.notify(String.valueOf(SlaveType.Shuttle), shuttleProtocol.getShuttleNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.SHUTTLE_POWER_COMPLETE);//瑙﹀彂閫氱煡
                         } else if (wrkMast.getWrkSts() == WrkStsType.MOVE_OUT_NO_LIFT_12.sts) {
                             wrkMast.setWrkSts(WrkStsType.MOVE_OUT_NO_LIFT_13.sts);
+                            WrkMast wrkMast1 = wrkMastService.selectByWorkNo(wrkMast.getMainWrkNo());
+                            if (wrkMast1 != null) {
+                                wrkMast1.setShuttleNo(wrkMast.getShuttleNo());
+                                log.info("瀵逛富宸ヤ綔妗h繘琛岀粦瀹氬皬杞︼紝涓轰簡灏忚溅杩涜绉昏溅,{},{}", wrkMast1.getWrkNo(), wrkMast.getShuttleNo());
+                            }
                             shuttleThread.setSyncTaskNo(0);
                             notifyUtils.notify(String.valueOf(SlaveType.Shuttle), shuttleProtocol.getShuttleNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.SHUTTLE_POWER_COMPLETE);//瑙﹀彂閫氱煡
                         } else if (wrkMast.getWrkSts() == WrkStsType.MOVE_OUT_NO_LIFT_10.sts) {
diff --git a/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java
index f83dcf7..89ebe97 100644
--- a/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java
@@ -220,6 +220,15 @@
                 News.info("{}鍙锋彁鍗囨満瀵硅薄涓嶅瓨鍦�", wrkMast.getLiftNo());
                 return false;
             }
+            //褰�1011鍏ュ簱锛屾墭鐩樺湪鎻愬崌鏈洪噷锛�1014涔熷湪鍏ュ簱锛屽緟鏈轰綅琚�1014鍗犱綇锛屽幓鎻愬崌鏈洪噷鐨勪换鍔★紝灏忚溅浼氬崱浣�
+            if (liftProtocol.getHasTray() && liftProtocol.getLev() == 1 && wrkMast.getStaNo() == 1015) {
+                News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満鍐呮湁鎵樼洏涓斿湪1灞傞渶瑕佸皬杞﹀幓鎺ワ紝灏变笉瑕佸崰浣忓緟鏈轰綅锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
+                return false;//鎻愬崌鏈哄唴鏃犲皬杞�
+            }
+            if (liftProtocol.getHasTray() && liftProtocol.getLev() == 5 && wrkMast.getStaNo() == 1026) {
+                News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満鍐呮湁鎵樼洏涓斿湪5灞傞渶瑕佸皬杞﹀幓鎺ワ紝灏变笉瑕佸崰浣忓緟鏈轰綅锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
+                return false;//鎻愬崌鏈哄唴鏃犲皬杞�
+            }
 
             //鑾峰彇鎻愬崌鏈哄緟鏈轰綅
             String liftStandByLocNo = liftThread.getLiftStandByLocNo(Utils.getLev(shuttleProtocol.getCurrentLocNo()), true);
@@ -439,7 +448,6 @@
                 News.info("{}鍙锋彁鍗囨満瀵硅薄涓嶅瓨鍦�", wrkMast.getLiftNo());
                 return false;
             }
-
 
 
             if (!liftThread.isIdle()) {

--
Gitblit v1.9.1