From e3508915adca349eb4adfc2c50ce808696e730f4 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 03 三月 2026 13:59:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/plugin/FakeProcess.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/FakeProcess.java b/src/main/java/com/zy/core/plugin/FakeProcess.java
index 16a90f8..8e76483 100644
--- a/src/main/java/com/zy/core/plugin/FakeProcess.java
+++ b/src/main/java/com/zy/core/plugin/FakeProcess.java
@@ -112,23 +112,23 @@
asyncFakeRun();
// 璇锋眰鐢熸垚鍏ュ簱浠诲姟
- executeWithTimeout("generateStoreWrkFile", this::generateStoreWrkFile);
+ this.generateStoreWrkFile();
// 鎵ц鍫嗗灈鏈轰换鍔�
- executeWithTimeout("crnIoExecute", crnOperateUtils::crnIoExecute);
+ crnOperateUtils.crnIoExecuteNormal();
// 鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴�-鍏峰浠跨湡鑳藉姏
- executeWithTimeout("crnIoExecuteFinish", this::crnIoExecuteFinish);
+ this.crnIoExecuteFinish();
// 鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
- executeWithTimeout("stationInExecute", stationOperateProcessUtils::stationInExecute);
+ stationOperateProcessUtils.stationInExecute();
// 鎵ц杈撻�佺珯鐐瑰嚭搴撲换鍔�
- executeWithTimeout("stationOutExecute", stationOperateProcessUtils::stationOutExecute);
+ stationOperateProcessUtils.stationOutExecute();
// 妫�娴嬭緭閫佺珯鐐瑰嚭搴撲换鍔℃墽琛屽畬鎴�
- executeWithTimeout("stationOutExecuteFinish", stationOperateProcessUtils::stationOutExecuteFinish);
+ stationOperateProcessUtils.stationOutExecuteFinish();
// 鎵ц鍙屽伐浣嶅爢鍨涙満浠诲姟
- executeWithTimeout("dualCrnIoExecute", dualCrnOperateProcessUtils::dualCrnIoExecute);
+ dualCrnOperateProcessUtils.dualCrnIoExecute();
// 鍙屽伐浣嶅爢鍨涙満浠诲姟鎵ц瀹屾垚
- executeWithTimeout("dualCrnIoExecuteFinish", dualCrnOperateProcessUtils::dualCrnIoExecuteFinish);
+ dualCrnOperateProcessUtils.dualCrnIoExecuteFinish();
News.info("[WCS Debug] 涓荤嚎绋婻un鎵ц瀹屾垚,鑰楁椂:{}ms", System.currentTimeMillis() - startTime);
}
@@ -327,8 +327,8 @@
CreateInTaskParam taskParam = new CreateInTaskParam();
taskParam.setTaskNo(String.valueOf(commonService.getWorkNo(WrkIoType.IN.id)));
- taskParam.setSourceStaNo(stationId);
- taskParam.setStaNo(targetStationId);
+ taskParam.setSourceStaNo(String.valueOf(stationId));
+ taskParam.setStaNo(String.valueOf(targetStationId));
taskParam.setLocNo(locMast.getLocNo());
taskParam.setBarcode(stationProtocol.getBarcode());
WrkMast wrkMast = commonService.createInTask(taskParam);
@@ -476,6 +476,7 @@
if (lock != null) {
continue;
}
+ redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 10);
String barcode = stationProtocol.getBarcode();
Integer stationIdVal = stationProtocol.getStationId();
@@ -490,7 +491,7 @@
News.error("WMS鍏ュ簱璇锋眰澶辫触锛岄噸鏂板彂璧疯姹傦紝barcode={}锛宻tationId={}锛宺esponse={}", barcode,
stationIdVal, response);
wmsOperateUtils.applyInTaskAsync(barcode, stationIdVal,
- stationProtocol.getPalletHeight());
+ stationProtocol.getPalletHeight(),stationProtocol.getWeight());
redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);
continue;
}
@@ -501,14 +502,17 @@
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
CreateInTaskParam taskParam = new CreateInTaskParam();
- taskParam.setTaskNo(dto.getTaskNo());
+ taskParam.setTaskNo(String.valueOf(dto.getTaskNo()));
taskParam.setLocNo(dto.getLocNo());
taskParam.setTaskPri(dto.getTaskPri());
taskParam.setBarcode(barcode);
+ taskParam.setCrnNo(dto.getCrnNo());
+ taskParam.setStaNo(dto.getStaNo()+"");
+ taskParam.setSourceStaNo(dto.getSourceStaNo()+"");
WrkMast wrkMast = commonService.createInTask(taskParam);
StationCommand command = stationThread.getCommand(StationCommandType.WRITE_INFO,
- wrkMast.getWrkNo(), stationId, stationId, 0);
+ wrkMast.getWrkNo(), stationId, dto.getStaNo(), 0);
if (command == null) {
News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
continue;
@@ -519,7 +523,7 @@
News.error("WMS鍏ュ簱鎺ュ彛杩斿洖闈�200锛岄噸鏂板彂璧疯姹傦紝barcode={}锛宻tationId={}锛宺esponse={}", barcode,
stationIdVal, response);
wmsOperateUtils.applyInTaskAsync(barcode, stationIdVal,
- stationProtocol.getPalletHeight());
+ stationProtocol.getPalletHeight(),stationProtocol.getWeight());
redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);
}
} else {
@@ -528,10 +532,9 @@
// 娌℃湁璇锋眰杩涜涓紝鍙戣捣鏂扮殑寮傛璇锋眰
News.info("鍙戣捣寮傛WMS鍏ュ簱璇锋眰锛宐arcode={}锛宻tationId={}", barcode, stationIdVal);
wmsOperateUtils.applyInTaskAsync(barcode, stationIdVal,
- stationProtocol.getPalletHeight());
+ stationProtocol.getPalletHeight(),stationProtocol.getWeight());
redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);
}
- // 濡傛灉鏈夎姹傝繘琛屼腑锛岀瓑寰呬笅娆″惊鐜啀妫�鏌�
}
}
}
@@ -789,6 +792,7 @@
wrkMast.setWrkSts(updateWrkSts);
wrkMast.setSystemMsg("");
+ wrkMast.setWeight(Cools.isEmpty(crnProtocol.getWeight()) ? 11.11 : crnProtocol.getWeight());
wrkMast.setIoTime(new Date());
if (wrkMastService.updateById(wrkMast)) {
CrnCommand resetCommand = crnThread.getResetCommand(crnProtocol.getCrnNo());
--
Gitblit v1.9.1