From 14cc8925be94a6c07e8e48278afc8f2d4aa284f1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 19 三月 2026 20:45:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/plugin/NormalProcess.java | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/NormalProcess.java b/src/main/java/com/zy/core/plugin/NormalProcess.java
index 2886c71..f230ee7 100644
--- a/src/main/java/com/zy/core/plugin/NormalProcess.java
+++ b/src/main/java/com/zy/core/plugin/NormalProcess.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.zy.asrs.domain.param.CreateInTaskParam;
import com.zy.asrs.entity.BasDevp;
@@ -100,7 +100,7 @@
return;
}
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
@@ -124,6 +124,7 @@
// 婊¤冻鑷姩銆佹湁鐗┿�佹湁宸ヤ綔鍙凤紝鐢熸垚鍏ュ簱鏁版嵁
if (stationProtocol.isAutoing()
&& stationProtocol.isLoading()
+ && stationProtocol.isInEnable()
&& stationProtocol.getTaskNo() > 0) {
if (Cools.isEmpty(stationProtocol.getBarcode())) {
continue;
@@ -131,7 +132,8 @@
// 妫�娴嬩换鍔℃槸鍚︾敓鎴�
List<WrkMast> wrkMasts = wrkMastService
- .selectList(new EntityWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
+ .list(new QueryWrapper<WrkMast>()
+ .eq("barcode", stationProtocol.getBarcode()));
if (!wrkMasts.isEmpty()) {
continue;
}
@@ -143,19 +145,21 @@
String barcode = stationProtocol.getBarcode();
Integer stationIdVal = stationProtocol.getStationId();
+ Integer taskNo = stationProtocol.getTaskNo();
// 1. 棣栧厛鏌ヨ鏄惁鏈夊凡瀹屾垚鐨勫紓姝ュ搷搴�
- String response = wmsOperateUtils.queryAsyncInTaskResponse(barcode, stationIdVal);
+ String response = wmsOperateUtils.queryAsyncInTaskResponse(barcode, stationIdVal, taskNo);
- if (response != null) {
+ if (!Cools.isEmpty(response)) {
// 2. 鏈夊搷搴旂粨鏋滐紝澶勭悊鍝嶅簲
if (response.equals("FAILED") || response.startsWith("ERROR:")) {
// 璇锋眰澶辫触锛岄噸鏂板彂璧峰紓姝ヨ姹�
News.error("WMS鍏ュ簱璇锋眰澶辫触锛岄噸鏂板彂璧疯姹傦紝barcode={}锛宻tationId={}锛宺esponse={}", barcode,
stationIdVal, response);
- wmsOperateUtils.applyInTaskAsync(barcode, stationIdVal,
+ wmsOperateUtils.applyInTaskAsync(barcode, stationIdVal, taskNo,
stationProtocol.getPalletHeight());
redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);
+ stationProtocol.setSystemWarning("璇锋眰鍏ュ簱澶辫触锛學MS杩斿洖=" + response);
continue;
}
@@ -170,32 +174,26 @@
taskParam.setTaskPri(dto.getTaskPri());
taskParam.setBarcode(barcode);
WrkMast wrkMast = commonService.createInTask(taskParam);
-
- StationCommand command = stationThread.getCommand(StationCommandType.WRITE_INFO,
- wrkMast.getWrkNo(), stationId, stationId, 0);
- if (command == null) {
- News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
- continue;
- }
- MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+ stationProtocol.setSystemWarning("");
} else {
// 鎺ュ彛杩斿洖闈�200锛岄噸鏂板彂璧疯姹�
News.error("WMS鍏ュ簱鎺ュ彛杩斿洖闈�200锛岄噸鏂板彂璧疯姹傦紝barcode={}锛宻tationId={}锛宺esponse={}", barcode,
stationIdVal, response);
- wmsOperateUtils.applyInTaskAsync(barcode, stationIdVal,
+ wmsOperateUtils.applyInTaskAsync(barcode, stationIdVal, taskNo,
stationProtocol.getPalletHeight());
redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);
+ stationProtocol.setSystemWarning("璇锋眰鍏ュ簱澶辫触锛學MS杩斿洖=" + response);
}
} else {
// 3. 娌℃湁鍝嶅簲缁撴灉锛屾鏌ユ槸鍚︽湁璇锋眰姝ｅ湪杩涜涓�
- if (!wmsOperateUtils.isAsyncRequestInProgress(barcode, stationIdVal)) {
+ if (!wmsOperateUtils.isAsyncRequestInProgress(barcode, stationIdVal, taskNo)) {
// 娌℃湁璇锋眰杩涜涓紝鍙戣捣鏂扮殑寮傛璇锋眰
News.info("鍙戣捣寮傛WMS鍏ュ簱璇锋眰锛宐arcode={}锛宻tationId={}", barcode, stationIdVal);
- wmsOperateUtils.applyInTaskAsync(barcode, stationIdVal,
+ wmsOperateUtils.applyInTaskAsync(barcode, stationIdVal, taskNo,
stationProtocol.getPalletHeight());
redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);
+ stationProtocol.setSystemWarning("璇锋眰鍏ュ簱澶辫触锛學MS鏃犺繑鍥�");
}
- // 濡傛灉鏈夎姹傝繘琛屼腑锛岀瓑寰呬笅娆″惊鐜啀妫�鏌�
}
}
}
@@ -207,7 +205,7 @@
//妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞跺惎鍔ㄥ叆搴�
private synchronized void checkInStationHasTask() {
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if(stationThread == null){
--
Gitblit v1.9.1