From 288e45a990a5abf4ab50f820ed4e870e8314468e Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 21 六月 2025 15:14:10 +0800
Subject: [PATCH] 完善

---
 src/main/java/com/zy/asrs/task/NewWay/AutomaticallyAssignInTasksToRCSScheduler.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/NewWay/AutomaticallyAssignInTasksToRCSScheduler.java b/src/main/java/com/zy/asrs/task/NewWay/AutomaticallyAssignInTasksToRCSScheduler.java
index f99e1e7..9d8031e 100644
--- a/src/main/java/com/zy/asrs/task/NewWay/AutomaticallyAssignInTasksToRCSScheduler.java
+++ b/src/main/java/com/zy/asrs/task/NewWay/AutomaticallyAssignInTasksToRCSScheduler.java
@@ -39,7 +39,7 @@
      * 鑷姩娲惧彂鍏ュ簱浠诲姟缁橰CS
      */
     @Scheduled(cron = "0/3 * * * * ? ")
-    private void execute(){
+    private synchronized void execute(){
         //鏌ョ湅鏄惁鏈塧gv鍦ㄥ仛鐨勪换鍔�
         WaitPakin waitPakin1=waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("be_batch",1));
         if(waitPakin1!=null){
@@ -49,13 +49,15 @@
         //璇ユ暟鎹繘琛�0杞�1
         WaitPakin waitPakin=waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("be_batch",0));
         if(waitPakin!=null){
-            R r=mobileController.AGVMove(waitPakin.getMemo(),100+"");
+            R r=mobileController.AGVMove(waitPakin.getMemo(),6001+"",1);
             if (r.get("code").equals(200)){
-                waitPakin.setBeBatch(1);//0杞�1
-                waitPakinService.update(waitPakin,new EntityWrapper<WaitPakin>().eq("manu",waitPakin.getManu()));
+                R r1=mobileController.AGVMove(6001+"",waitPakin.getMemo(),2);
+                if (r1.get("code").equals(200)){
+                    waitPakin.setItemNum(r.get("msg")+"");
+                    waitPakin.setBeBatch(1);//0杞�1
+                    waitPakinService.update(waitPakin,new EntityWrapper<WaitPakin>().eq("manu",waitPakin.getManu()));
+                }
             }
         }
-
     }
-
 }

--
Gitblit v1.9.1