From 1096df7b05cb00d0771d9f8c6cc43d8022099c7b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 24 五月 2025 10:10:14 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 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 30318dd..c90a68e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -93,7 +93,7 @@
 
     //婕旂ず妯″紡-AGV鍑哄簱
     private synchronized void demoAgvOut() {
-        LocMast locMast = locMastService.selectByLocNo("1100601");
+        LocMast locMast = locMastService.selectByLocNo("0900601");
         if(locMast == null) {
             return;
         }
@@ -105,7 +105,7 @@
         List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                 .eq("mk", "agv")
                 .eq("loc_sts", "F")
-                .notIn("loc_no", "0900601")
+                .notIn("loc_no", "1100601")
         );
 
         if (locMasts.isEmpty()) {
@@ -123,7 +123,7 @@
 
     //婕旂ず妯″紡-AGV鍏ュ簱
     private synchronized void demoAgvIn() {
-        LocMast locMast = locMastService.selectByLocNo("0900601");
+        LocMast locMast = locMastService.selectByLocNo("1100601");
         if(locMast == null) {
             return;
         }
@@ -135,7 +135,7 @@
         List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                 .eq("mk", "agv")
                 .eq("loc_sts", "O")
-                .notIn("loc_no", "1100601")
+                .notIn("loc_no", "0900601")
         );
 
         if (locMasts.isEmpty()) {
@@ -153,7 +153,7 @@
 
     //婕旂ず妯″紡-鍥涘悜搴撳嚭搴�
     private synchronized void demoShuttleOut() {
-        LocMast locMast = locMastService.selectByLocNo("0900601");
+        LocMast locMast = locMastService.selectByLocNo("1100601");
         if(locMast == null) {
             return;
         }
@@ -163,6 +163,7 @@
         }
 
         ArrayList<Integer> disableLevList = new ArrayList<>();
+        disableLevList.add(1);
 
         //query in task
         List<TaskWrk> taskWrks = taskWrkService.selectList(new EntityWrapper<TaskWrk>()
@@ -210,7 +211,7 @@
 
     //婕旂ず妯″紡-鍥涘悜搴撳叆搴�
     private synchronized void demoShuttleIn() {
-        LocMast locMast = locMastService.selectByLocNo("1100601");
+        LocMast locMast = locMastService.selectByLocNo("0900601");
         if(locMast == null) {
             return;
         }
@@ -220,6 +221,7 @@
         }
 
         ArrayList<Integer> disableLevList = new ArrayList<>();
+        disableLevList.add(1);
 
         //query out task
         List<TaskWrk> taskWrks = taskWrkService.selectList(new EntityWrapper<TaskWrk>()
@@ -252,7 +254,7 @@
         taskWrk.setCreateTime(now);
         taskWrk.setIoType(1);//鍏ュ簱
         taskWrk.setIoPri(100);//浼樺厛绾�
-        taskWrk.setOriginTargetPoint("1");
+        taskWrk.setOriginStartPoint("1");
         taskWrk.setOriginTargetPoint(String.valueOf(Utils.getLev(locMast1.getLocNo())));
         taskWrk.setTargetPoint(locMast1.getLocNo());//缁堢偣
         boolean result = taskWrkService.insert(taskWrk);

--
Gitblit v1.9.1