From f60955e2ffe9b183e72911e361fa0632e3c780c7 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 16 一月 2026 08:23:35 +0800
Subject: [PATCH] 修复订单上报订单完成时间

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

diff --git a/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java b/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java
index ca91d38..defe85f 100644
--- a/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java
+++ b/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java
@@ -5,11 +5,9 @@
 import com.core.common.R;
 import com.core.exception.CoolException;
 import com.zy.asrs.controller.MobileController;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.RowLastno;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
 import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.LocMastServiceImpl;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.common.service.CommonService;
 import org.slf4j.Logger;
@@ -46,6 +44,8 @@
     private WrkMastService wrkMastService;
     @Autowired
     private BasDevpService basDevpService;
+    @Autowired
+    private LocMastServiceImpl locMastService;
 
     /**
      * 鑷姩娲惧彂鍏ュ簱浠诲姟缁橝GV
@@ -148,6 +148,18 @@
             if (!Cools.isEmpty(waitPakin1)) {
                 continue;
             }
+            //鏌ョ湅璇ュ贩閬撳簱浣嶇┖搴撲綅鏁伴噺>3
+            Integer crnNo=1;
+            if(staNo.equals("103")){
+                crnNo=2;
+            }else if(staNo.equals("101")){
+                crnNo=3;
+            }
+            int i1 = locMastService.selectCount(new EntityWrapper<LocMast>().eq("crn_no", crnNo).eq("loc_sts", "O"));
+            if(i1<=3){
+                log.info("宸烽亾={}锛岀┖搴撲綅鏁伴噺灏忎簬3锛岃烦杩嘺gv鍏ュ簱鎼繍",crnNo);
+                continue;
+            }
             R bind = mobileController.siteBindAndUnbind(waitPakin.getMemo(),waitPakin.getZpallet(), "BIND");
 //            if (bind.get("code").equals(200)) {
 //            }else {

--
Gitblit v1.9.1