From 41aa9de99af3399390cec139e69dc223410c0032 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 13 六月 2025 09:42:32 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/MainProcess.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 3bd7a0f..22aefd3 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涓绘祦绋�
@@ -26,10 +28,6 @@
// 鎵�灞炵嚎绋�
private Thread thread;
// 棰戠巼
- private int i = 0;
- private int j = 0;
- private int k = 0;
- private int l = 0;
private int[] autoZ = new int[]{0,0,0,0,0,0,0};
/**
@@ -52,25 +50,20 @@
try {
// 闂撮殧
Thread.sleep(200);
- System.out.println("寮�濮嬶細"+new Date().getTime());
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
//鏇存柊浣嶇疆淇℃伅
- mainService.updateStePositionNearby();
- //鏇存柊浣嶇疆淇℃伅
mainService.updateStePosition();
+ // 浠诲姟鎺掑簭
+ List<List<List<WrkMast>>> wrkMastListAll = mainService.DevpTaskNoRun();
// 浠诲姟涓嬪彂
- mainService.DevpTaskNoRun();
+ mainService.taskDown(wrkMastListAll);;
// 浠诲姟瀹屾垚
mainService.rgvCompleteWrkMastSta(autoZ);
- //鏇存柊浣嶇疆淇℃伅
- mainService.updateStePosition();
- System.out.println("缁撴潫锛�"+new Date().getTime());
-
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1