From 6be77dcf31e3c9d7233b36d8e9d22c4d1d802f3e Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 07 六月 2025 17:18:13 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/MainProcess.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 4c003d9..488fba5 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -1,5 +1,6 @@
 package com.zy.core;
 
+import com.zy.asrs.entity.WrkMast;
 import com.zy.asrs.service.impl.MainServiceImpl;
 import com.zy.core.properties.SystemProperties;
 import lombok.Data;
@@ -11,6 +12,7 @@
 import javax.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * WCS涓绘祦绋�
@@ -59,16 +61,31 @@
                         continue;
                     }
 
-                    //鏇存柊浣嶇疆淇℃伅
-                    mainService.updateStePositionNearby();
+
                     //鏇存柊浣嶇疆淇℃伅
                     mainService.updateStePosition();
+                    // 浠诲姟鎺掑簭
+                    List<List<List<WrkMast>>> wrkMastListAll = mainService.DevpTaskNoRun();
                     // 浠诲姟涓嬪彂
-                    mainService.DevpTaskNoRun();
+                    mainService.taskDown(wrkMastListAll);;
                     // 浠诲姟瀹屾垚
                     mainService.rgvCompleteWrkMastSta(autoZ);
-                    //鏇存柊浣嶇疆淇℃伅
-                    mainService.updateStePosition();
+                    // 浠诲姟瀹屾垚
+                    mainService.rgvCompleteWrkMastSta(autoZ);
+
+
+
+//
+//                    //鏇存柊浣嶇疆淇℃伅
+//                    mainService.updateStePositionNearby(null);
+//                    //鏇存柊浣嶇疆淇℃伅
+//                    mainService.updateStePosition();
+//                    // 浠诲姟涓嬪彂
+//                    mainService.DevpTaskNoRun();
+//                    // 浠诲姟瀹屾垚
+//                    mainService.rgvCompleteWrkMastSta(autoZ);
+//                    //鏇存柊浣嶇疆淇℃伅
+//                    mainService.updateStePosition();
 //                    System.out.println("缁撴潫锛�"+new Date().getTime());
 
 

--
Gitblit v1.9.1