From d300a0ef052579d73d27daa9cd1acf35fa00ed0a Mon Sep 17 00:00:00 2001
From: Administrator <XS@163.COM>
Date: 星期六, 25 四月 2026 21:03:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 93 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 83 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index 837c7a8..288f8c8 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -66,6 +66,20 @@
}
public void submitStationEnableInTasks(MainProcessLane lane, long minIntervalMs) {
+ mainProcessTaskSubmitter.submitSerialTask(
+ MainProcessLane.STATION_SCAN,
+ "submitStationEnableInTasks",
+ minIntervalMs,
+ new Runnable() {
+ @Override
+ public void run() {
+ submitStationEnableInTasksInternal(lane, minIntervalMs);
+ }
+ }
+ );
+ }
+
+ private void submitStationEnableInTasksInternal(MainProcessLane lane, long minIntervalMs) {
List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
for (final BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
@@ -141,6 +155,20 @@
}
public void submitDualCrnStationOutTasks(MainProcessLane lane, long minIntervalMs) {
+ mainProcessTaskSubmitter.submitSerialTask(
+ MainProcessLane.STATION_SCAN,
+ "submitDualCrnStationOutTasks",
+ minIntervalMs,
+ new Runnable() {
+ @Override
+ public void run() {
+ submitDualCrnStationOutTasksInternal(lane, minIntervalMs);
+ }
+ }
+ );
+ }
+
+ private void submitDualCrnStationOutTasksInternal(MainProcessLane lane, long minIntervalMs) {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
.eq("wrk_sts", WrkStsType.OUTBOUND_RUN_COMPLETE.sts)
.isNotNull("dual_crn_no")
@@ -170,6 +198,20 @@
}
public void submitStationOutExecuteFinishTasks(MainProcessLane lane, long minIntervalMs) {
+ mainProcessTaskSubmitter.submitSerialTask(
+ MainProcessLane.STATION_SCAN,
+ "submitStationOutExecuteFinishTasks",
+ minIntervalMs,
+ new Runnable() {
+ @Override
+ public void run() {
+ submitStationOutExecuteFinishTasksInternal(lane, minIntervalMs);
+ }
+ }
+ );
+ }
+
+ private void submitStationOutExecuteFinishTasksInternal(MainProcessLane lane, long minIntervalMs) {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN.sts));
for (final WrkMast wrkMast : wrkMasts) {
Integer laneKey = wrkMast == null ? null : wrkMast.getStaNo();
@@ -196,6 +238,20 @@
}
public void submitCheckTaskToCompleteTasks(MainProcessLane lane, long minIntervalMs) {
+ mainProcessTaskSubmitter.submitSerialTask(
+ MainProcessLane.STATION_SCAN,
+ "submitCheckTaskToCompleteTasks",
+ minIntervalMs,
+ new Runnable() {
+ @Override
+ public void run() {
+ submitCheckTaskToCompleteTasksInternal(lane, minIntervalMs);
+ }
+ }
+ );
+ }
+
+ private void submitCheckTaskToCompleteTasksInternal(MainProcessLane lane, long minIntervalMs) {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN_COMPLETE.sts));
for (final WrkMast wrkMast : wrkMasts) {
Integer laneKey = wrkMast == null ? null : wrkMast.getStaNo();
@@ -222,6 +278,20 @@
}
public void submitCheckStationRunBlockTasks(MainProcessLane lane, long minIntervalMs) {
+ mainProcessTaskSubmitter.submitSerialTask(
+ MainProcessLane.STATION_SCAN,
+ "submitCheckStationRunBlockTasks",
+ minIntervalMs,
+ new Runnable() {
+ @Override
+ public void run() {
+ submitCheckStationRunBlockTasksInternal(lane, minIntervalMs);
+ }
+ }
+ );
+ }
+
+ private void submitCheckStationRunBlockTasksInternal(MainProcessLane lane, long minIntervalMs) {
List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
for (final BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
@@ -257,7 +327,7 @@
}
//鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
- public synchronized void stationInExecute() {
+ public void stationInExecute() {
try {
DispatchLimitConfig limitConfig = getDispatchLimitConfig();
int[] currentStationTaskCountRef = new int[]{countCurrentStationTask()};
@@ -385,7 +455,10 @@
&& stationProtocol.getTaskNo() > 0
) {
//妫�娴嬩换鍔℃槸鍚︾敓鎴�
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("barcode", stationProtocol.getBarcode())
+ .eq("io_type", WrkIoType.IN.id)
+ );
if (wrkMast == null) {
return false;
}
@@ -436,7 +509,7 @@
}
//鎵ц鍫嗗灈鏈鸿緭閫佺珯鐐瑰嚭搴撲换鍔�
- public synchronized void crnStationOutExecute() {
+ public void crnStationOutExecute() {
try {
DispatchLimitConfig limitConfig = getDispatchLimitConfig();
int[] currentStationTaskCountRef = new int[]{countCurrentStationTask()};
@@ -556,7 +629,7 @@
}
//鎵ц鍙屽伐浣嶅爢鍨涙満杈撻�佺珯鐐瑰嚭搴撲换鍔�
- public synchronized void dualCrnStationOutExecute() {
+ public void dualCrnStationOutExecute() {
try {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
.eq("wrk_sts", WrkStsType.OUTBOUND_RUN_COMPLETE.sts)
@@ -630,7 +703,7 @@
}
//妫�娴嬭緭閫佺珯鐐瑰嚭搴撲换鍔℃墽琛屽畬鎴�
- public synchronized void stationOutExecuteFinish() {
+ public void stationOutExecuteFinish() {
try {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN.sts));
for (WrkMast wrkMast : wrkMasts) {
@@ -683,7 +756,7 @@
}
// 妫�娴嬩换鍔¤浆瀹屾垚
- public synchronized void checkTaskToComplete() {
+ public void checkTaskToComplete() {
try {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN_COMPLETE.sts));
for (WrkMast wrkMast : wrkMasts) {
@@ -739,7 +812,7 @@
}
//妫�娴嬭緭閫佺珯鐐规槸鍚﹁繍琛屽牭濉�
- public synchronized void checkStationRunBlock() {
+ public void checkStationRunBlock() {
try {
List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
for (BasDevp basDevp : basDevps) {
@@ -1017,12 +1090,12 @@
}
//鑾峰彇杈撻�佺嚎浠诲姟鏁伴噺
- public synchronized int getCurrentStationTaskCount() {
+ public int getCurrentStationTaskCount() {
return countCurrentStationTask();
}
// 妫�娴嬪嚭搴撴帓搴�
- public synchronized void checkStationOutOrder() {
+ public void checkStationOutOrder() {
List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getId());
@@ -1142,7 +1215,7 @@
}
// 鐩戞帶缁曞湀绔欑偣
- public synchronized void watchCircleStation() {
+ public void watchCircleStation() {
List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getId());
--
Gitblit v1.9.1