From efb7f3ac8bd451882011410e5d3b5c90c92772d2 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 10 九月 2025 22:44:41 +0800
Subject: [PATCH] 新增堆垛机有出库任务时禁止拣料回库agv搬运

---
 src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java b/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java
index f93c977..6452017 100644
--- a/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java
+++ b/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java
@@ -127,11 +127,19 @@
                             }else {
                                 staNo = "101";
                             }
+
                             break;
                         }
                     }
                 }
             }
+
+            //褰撶珯鐐规湁鍑哄簱浠诲姟鏃惰烦杩囨淳鍙戜换鍔�
+            List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", staNo).lt("wrk_sts",33));
+            if(!Cools.isEmpty(wrkMasts1)){
+                continue;
+            }
+
             if (Cools.isEmpty(staNo)) {
                 return;
             }
@@ -140,12 +148,17 @@
             if (!Cools.isEmpty(waitPakin1)) {
                 continue;
             }
-
+            R bind = mobileController.siteBindAndUnbind(waitPakin.getMemo(),waitPakin.getZpallet(), "BIND");
+//            if (bind.get("code").equals(200)) {
+//            }else {
+//                log.info("WMS缁戝畾agv绔欑偣={},浠诲姟鍙蜂负={}------------澶辫触",wrkMast.getStaNo(),wrkMast.getWrkNo());
+//            }
             int workNo = commonService.getWorkNo(0);
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             String format = sdf.format(new Date());
             String s = format+"-" + workNo;
             log.info("缁檃gv涓嬪彂鍏ュ簱鎼繍浠诲姟={}",waitPakin);
+
             R r = mobileController.SITESITEAGVMove(waitPakin.getMemo(), staNo,s);
             if (r.get("code").equals(200)) {
                 waitPakin.setSupp(s);//鍙戠粰agv鐨勪换鍔″彿

--
Gitblit v1.9.1