From 1654b0a8c149f86d38f3202cb88c655ad0a25384 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 01 四月 2026 10:33:25 +0800
Subject: [PATCH] #出库任务路径计算增加cache
---
src/main/java/com/zy/core/plugin/FakeProcess.java | 500 ++++++++++++++++++++++---------------------------------
1 files changed, 199 insertions(+), 301 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/FakeProcess.java b/src/main/java/com/zy/core/plugin/FakeProcess.java
index ffccad7..b889676 100644
--- a/src/main/java/com/zy/core/plugin/FakeProcess.java
+++ b/src/main/java/com/zy/core/plugin/FakeProcess.java
@@ -1,21 +1,20 @@
package com.zy.core.plugin;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
-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.domain.param.CreateOutTaskParam;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.common.entity.FindCrnNoResult;
-import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
+import com.zy.core.dispatch.StationCommandDispatcher;
import com.zy.core.enums.*;
import com.zy.core.model.StationObjModel;
import com.zy.core.model.Task;
@@ -25,14 +24,16 @@
import com.zy.core.model.protocol.DualCrnProtocol;
import com.zy.core.model.protocol.StationProtocol;
import com.zy.core.plugin.api.MainProcessPluginApi;
-import com.zy.core.properties.SystemProperties;
+import com.zy.core.plugin.store.StoreInTaskContext;
+import com.zy.core.plugin.store.StoreInTaskGenerationService;
+import com.zy.core.plugin.store.StoreInTaskPolicy;
+import com.zy.core.task.MainProcessAsyncTaskScheduler;
import com.zy.core.thread.CrnThread;
import com.zy.core.thread.DualCrnThread;
import com.zy.core.thread.StationThread;
import com.zy.core.utils.CrnOperateProcessUtils;
import com.zy.core.utils.DualCrnOperateProcessUtils;
import com.zy.core.utils.StationOperateProcessUtils;
-import com.zy.core.utils.WmsOperateUtils;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
@@ -41,26 +42,24 @@
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
@Slf4j
@Component
-public class FakeProcess implements MainProcessPluginApi {
+public class FakeProcess implements MainProcessPluginApi, StoreInTaskPolicy {
+ private static final String CRN_TASK_LANE = "fake-crn";
+ private static final String STATION_TASK_LANE = "fake-station";
+ private static final String DUAL_CRN_TASK_LANE = "fake-dual-crn";
+ private static final String GENERATE_STORE_TASK_LANE_PREFIX = "fake-generate-store-";
+ private static final String ASYNC_TASK_LANE_PREFIX = "fake-async-";
+ private static final long MAIN_DISPATCH_INTERVAL_MS = 200L;
+ private static final long ASYNC_DISPATCH_INTERVAL_MS = 50L;
+ private static final long TASK_SLOW_LOG_THRESHOLD_MS = 1000L;
- private static final long METHOD_TIMEOUT_MS = 15000; // 15绉掕秴鏃�
- private static final ExecutorService timeoutExecutor = Executors.newCachedThreadPool();
-
- private static Map<Integer, Long> stationStayTimeMap = new ConcurrentHashMap<>();
+ private static final Map<Integer, Long> stationStayTimeMap = new ConcurrentHashMap<>();
private static volatile String enableFake = "N";
private static volatile String fakeRealTaskRequestWms = "N";
private static volatile String fakeGenerateInTask = "Y";
private static volatile String fakeGenerateOutTask = "Y";
-
- private Thread asyncFakeRunThread = null;
@Autowired
private WrkMastService wrkMastService;
@@ -83,127 +82,118 @@
@Autowired
private StationOperateProcessUtils stationOperateProcessUtils;
@Autowired
- private WmsOperateUtils wmsOperateUtils;
+ private WrkAnalysisService wrkAnalysisService;
@Autowired
private DualCrnOperateProcessUtils dualCrnOperateProcessUtils;
-
- /**
- * 甯﹁秴鏃朵繚鎶ゆ墽琛屾柟娉�
- *
- * @param taskName 浠诲姟鍚嶇О锛堢敤浜庢棩蹇楋級
- * @param task 瑕佹墽琛岀殑浠诲姟
- */
- private void executeWithTimeout(String taskName, Runnable task) {
- Future<?> future = timeoutExecutor.submit(task);
- try {
- future.get(METHOD_TIMEOUT_MS, TimeUnit.MILLISECONDS);
- } catch (TimeoutException e) {
- // 浣跨敤 cancel(false) 涓嶅彂閫佷腑鏂俊鍙凤紝閬垮厤 RedisCommandInterruptedException
- // 浠诲姟浼氬湪鍚庡彴缁х画鎵ц鐩村埌瀹屾垚锛屼絾涓诲惊鐜笉浼氱瓑寰�
- future.cancel(false);
- News.error("[WCS Warning] 鏂规硶鎵ц瓒呮椂锛屼富寰幆宸茶烦杩�: {}, 瓒呮椂鏃堕棿: {}ms (浠诲姟浠嶅湪鍚庡彴杩愯)", taskName, METHOD_TIMEOUT_MS);
- } catch (Exception e) {
- News.error("[WCS Error] 鏂规硶鎵ц寮傚父: {}, 寮傚父: {}", taskName, e.getMessage());
- }
- }
+ @Autowired
+ private StoreInTaskGenerationService storeInTaskGenerationService;
+ @Autowired
+ private StationCommandDispatcher stationCommandDispatcher;
+ @Autowired
+ private MainProcessAsyncTaskScheduler mainProcessAsyncTaskScheduler;
@Override
public void run() {
long startTime = System.currentTimeMillis();
- asyncFakeRun();
+ refreshFakeConfig();
- // 璇锋眰鐢熸垚鍏ュ簱浠诲姟
- this.generateStoreWrkFile();
+ // 浠跨湡鐩稿叧浠诲姟鎸夊悇鑷� lane 涓茶鎻愪氦锛屼簰涓嶉樆濉�
+ submitAsyncTask("checkInStationHasTask", ASYNC_DISPATCH_INTERVAL_MS, this::checkInStationHasTask);
+ submitAsyncTask("generateFakeInTask", ASYNC_DISPATCH_INTERVAL_MS, this::generateFakeInTask);
+ submitAsyncTask("generateFakeOutTask", ASYNC_DISPATCH_INTERVAL_MS, this::generateFakeOutTask);
+ submitAsyncTask("calcAllStationStayTime", ASYNC_DISPATCH_INTERVAL_MS, this::calcAllStationStayTime);
+ submitAsyncTask("checkOutStationStayTimeOut", ASYNC_DISPATCH_INTERVAL_MS, this::checkOutStationStayTimeOut);
+ submitAsyncTask("checkInStationCrnTake", ASYNC_DISPATCH_INTERVAL_MS, this::checkInStationCrnTake);
+ submitStationTask("checkStationRunBlock", ASYNC_DISPATCH_INTERVAL_MS, stationOperateProcessUtils::checkStationRunBlock);
- // 鎵ц鍫嗗灈鏈轰换鍔�
- crnOperateUtils.crnIoExecute();
- // 鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴�-鍏峰浠跨湡鑳藉姏
- this.crnIoExecuteFinish();
- // 鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
- stationOperateProcessUtils.stationInExecute();
- // 鎵ц杈撻�佺珯鐐瑰嚭搴撲换鍔�
- stationOperateProcessUtils.crnStationOutExecute();
- // 妫�娴嬭緭閫佺珯鐐瑰嚭搴撲换鍔℃墽琛屽畬鎴�
- stationOperateProcessUtils.stationOutExecuteFinish();
+ // 璇锋眰鐢熸垚鍏ュ簱浠诲姟锛屾寜绔欑偣鎷嗘垚鐙珛涓茶閫氶亾锛岄伩鍏嶅崟绔欓樆濉炴暣杞壂鎻�
+ generateStoreWrkFile();
- // 鎵ц鍙屽伐浣嶅爢鍨涙満浠诲姟
- dualCrnOperateProcessUtils.dualCrnIoExecute();
- // 鍙屽伐浣嶅爢鍨涙満浠诲姟鎵ц瀹屾垚
- dualCrnOperateProcessUtils.dualCrnIoExecuteFinish();
+ // 鍫嗗灈鏈恒�佽緭閫佺嚎銆佸弻宸ヤ綅鍫嗗灈鏈轰换鍔″垎鍒繘鍏ュ悇鑷覆琛岄�氶亾閫愪釜鎵ц
+ submitCrnTask("crnIoExecute", MAIN_DISPATCH_INTERVAL_MS, crnOperateUtils::crnIoExecute);
+ submitCrnTask("crnIoExecuteFinish", MAIN_DISPATCH_INTERVAL_MS, this::crnIoExecuteFinish);
+ submitStationTask("stationInExecute", MAIN_DISPATCH_INTERVAL_MS, stationOperateProcessUtils::stationInExecute);
+ submitStationTask("crnStationOutExecute", MAIN_DISPATCH_INTERVAL_MS, stationOperateProcessUtils::crnStationOutExecute);
+ submitStationTask("checkStationOutOrder", MAIN_DISPATCH_INTERVAL_MS, stationOperateProcessUtils::checkStationOutOrder);
+ submitStationTask("watchCircleStation", MAIN_DISPATCH_INTERVAL_MS, stationOperateProcessUtils::watchCircleStation);
+ submitDualCrnTask("dualCrnIoExecute", MAIN_DISPATCH_INTERVAL_MS, dualCrnOperateProcessUtils::dualCrnIoExecute);
+ submitDualCrnTask("dualCrnIoExecuteFinish", MAIN_DISPATCH_INTERVAL_MS, dualCrnOperateProcessUtils::dualCrnIoExecuteFinish);
News.info("[WCS Debug] 涓荤嚎绋婻un鎵ц瀹屾垚,鑰楁椂:{}ms", System.currentTimeMillis() - startTime);
}
- public void asyncFakeRun() {
- if (asyncFakeRunThread != null) {
- return;
+ private void refreshFakeConfig() {
+ Config enableFakeConfig = configService.getOne(new QueryWrapper<Config>().eq("code", "enableFake"));
+ if (enableFakeConfig != null) {
+ enableFake = enableFakeConfig.getValue();
}
- asyncFakeRunThread = new Thread(() -> {
- while (!Thread.currentThread().isInterrupted()) {
- try {
- Config enableFakeConfig = configService
- .selectOne(new EntityWrapper<Config>().eq("code", "enableFake"));
- if (enableFakeConfig != null) {
- enableFake = enableFakeConfig.getValue();
- }
+ Config fakeRealTaskRequestWmsConfig = configService
+ .getOne(new QueryWrapper<Config>().eq("code", "fakeRealTaskRequestWms"));
+ if (fakeRealTaskRequestWmsConfig != null) {
+ fakeRealTaskRequestWms = fakeRealTaskRequestWmsConfig.getValue();
+ }
- Config fakeRealTaskRequestWmsConfig = configService
- .selectOne(new EntityWrapper<Config>().eq("code", "fakeRealTaskRequestWms"));
- if (fakeRealTaskRequestWmsConfig != null) {
- fakeRealTaskRequestWms = fakeRealTaskRequestWmsConfig.getValue();
- }
+ Config fakeGenerateInTaskConfig = configService
+ .getOne(new QueryWrapper<Config>().eq("code", "fakeGenerateInTask"));
+ if (fakeGenerateInTaskConfig != null) {
+ fakeGenerateInTask = fakeGenerateInTaskConfig.getValue();
+ }
- Config fakeGenerateInTaskConfig = configService
- .selectOne(new EntityWrapper<Config>().eq("code", "fakeGenerateInTask"));
- if (fakeGenerateInTaskConfig != null) {
- fakeGenerateInTask = fakeGenerateInTaskConfig.getValue();
- }
+ Config fakeGenerateOutTaskConfig = configService
+ .getOne(new QueryWrapper<Config>().eq("code", "fakeGenerateOutTask"));
+ if (fakeGenerateOutTaskConfig != null) {
+ fakeGenerateOutTask = fakeGenerateOutTaskConfig.getValue();
+ }
+ }
- Config fakeGenerateOutTaskConfig = configService
- .selectOne(new EntityWrapper<Config>().eq("code", "fakeGenerateOutTask"));
- if (fakeGenerateOutTaskConfig != null) {
- fakeGenerateOutTask = fakeGenerateOutTaskConfig.getValue();
- }
+ private void submitCrnTask(String taskName, long minIntervalMs, Runnable task) {
+ submitProcessTask(CRN_TASK_LANE, taskName, minIntervalMs, task);
+ }
- // 绯荤粺杩愯鐘舵�佸垽鏂�
- if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
- continue;
- }
+ private void submitStationTask(String taskName, long minIntervalMs, Runnable task) {
+ submitProcessTask(STATION_TASK_LANE, taskName, minIntervalMs, task);
+ }
- // 妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞朵豢鐪熺敓鎴愭ā鎷熷叆搴撶珯鐐规暟鎹�
- checkInStationHasTask();
- // 鐢熸垚浠跨湡妯℃嫙鍏ュ簱浠诲姟
- generateFakeInTask();
- // 鐢熸垚浠跨湡妯℃嫙鍑哄簱浠诲姟
- generateFakeOutTask();
- // 璁＄畻鎵�鏈夌珯鐐瑰仠鐣欐椂闂�
- calcAllStationStayTime();
- // 妫�娴嬪嚭搴撶珯鐐瑰仠鐣欐槸鍚﹁秴鏃�
- checkOutStationStayTimeOut();
- // 妫�娴嬪叆搴撶珯鐐瑰爢鍨涙満鏄惁鍙栬蛋璐х墿
- checkInStationCrnTake();
+ private void submitDualCrnTask(String taskName, long minIntervalMs, Runnable task) {
+ submitProcessTask(DUAL_CRN_TASK_LANE, taskName, minIntervalMs, task);
+ }
- // 妫�娴嬭緭閫佺珯鐐规槸鍚﹁繍琛屽牭濉�
- stationOperateProcessUtils.checkStationRunBlock();
+ private void submitAsyncTask(String taskName, long minIntervalMs, Runnable task) {
+ submitProcessTask(ASYNC_TASK_LANE_PREFIX + taskName, taskName, minIntervalMs, task);
+ }
- // 闂撮殧
- Thread.sleep(50);
- } catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
- break;
- } catch (Exception e) {
- e.printStackTrace();
+ private void submitGenerateStoreTasks() {
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
+ for (BasDevp basDevp : basDevps) {
+ List<StationObjModel> barcodeStations = getBarcodeStations(basDevp);
+ for (StationObjModel stationObjModel : barcodeStations) {
+ Integer stationId = stationObjModel == null ? null : stationObjModel.getStationId();
+ if (stationId == null) {
+ continue;
}
+ submitGenerateStoreTask(stationId, MAIN_DISPATCH_INTERVAL_MS,
+ () -> storeInTaskGenerationService.generate(this, basDevp, stationObjModel));
}
- });
- asyncFakeRunThread.setName("asyncFakeRunProcess");
- asyncFakeRunThread.setDaemon(true);
- asyncFakeRunThread.start();
+ }
+ }
+
+ private void submitGenerateStoreTask(Integer stationId, long minIntervalMs, Runnable task) {
+ submitProcessTask(GENERATE_STORE_TASK_LANE_PREFIX + stationId, "generateStoreWrkFile", minIntervalMs, task);
+ }
+
+ private void submitProcessTask(String laneName, String taskName, long minIntervalMs, Runnable task) {
+ mainProcessAsyncTaskScheduler.submit(
+ laneName,
+ taskName,
+ minIntervalMs,
+ TASK_SLOW_LOG_THRESHOLD_MS,
+ task
+ );
}
// 妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞朵豢鐪熺敓鎴愭ā鎷熷叆搴撶珯鐐规暟鎹�
- private synchronized void checkInStationHasTask() {
+ private void checkInStationHasTask() {
if (!enableFake.equals("Y")) {
return;
}
@@ -212,7 +202,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) {
@@ -245,7 +235,7 @@
StationCommand command = stationThread.getCommand(StationCommandType.MOVE,
commonService.getWorkNo(WrkIoType.FAKE_TASK_NO.id), stationId,
entity.getBarcodeStation().getStationId(), 0);
- MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+ stationCommandDispatcher.dispatch(basDevp.getDevpNo(), command, "fake-process", "fake-enable-in");
redisUtil.set(RedisKeyType.GENERATE_FAKE_IN_STATION_DATA_LIMIT.key + stationId, "lock", 5);
}
}
@@ -253,7 +243,7 @@
}
// 鐢熸垚浠跨湡妯℃嫙鍏ュ簱浠诲姟
- private synchronized void generateFakeInTask() {
+ private void generateFakeInTask() {
if (!enableFake.equals("Y")) {
return;
}
@@ -266,7 +256,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) {
@@ -302,13 +292,13 @@
// 妫�娴嬩换鍔℃槸鍚︾敓鎴�
List<WrkMast> wrkMasts = wrkMastService
- .selectList(new EntityWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
+ .list(new QueryWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
if (!wrkMasts.isEmpty()) {
continue;
}
List<LocMast> locMastList = locMastService
- .selectList(new EntityWrapper<LocMast>().eq("loc_sts", String.valueOf(LocStsType.O)));
+ .list(new QueryWrapper<LocMast>().eq("loc_sts", String.valueOf(LocStsType.O)));
if (locMastList.isEmpty()) {
continue;
}
@@ -340,7 +330,7 @@
News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
continue;
}
- MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+ stationCommandDispatcher.dispatch(basDevp.getDevpNo(), command, "fake-process", "fake-in-task");
redisUtil.set(RedisKeyType.GENERATE_FAKE_IN_TASK_LIMIT.key + stationId, "lock", 5);
}
}
@@ -348,96 +338,21 @@
}
// 鐢熸垚浠跨湡妯℃嫙鍑哄簱浠诲姟
- private synchronized void generateFakeOutTask() {
- if (!enableFake.equals("Y")) {
- return;
- }
-
- if (fakeRealTaskRequestWms.equals("Y")) {
- return;
- }
-
- if (!fakeGenerateOutTask.equals("Y")) {
- return;
- }
-
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
- for (BasDevp basDevp : basDevps) {
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
- if (stationThread == null) {
- continue;
- }
-
- Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
-
- List<StationObjModel> list = basDevp.getOutStationList$();
- for (StationObjModel entity : list) {
- Integer stationId = entity.getStationId();
- if (!stationMap.containsKey(stationId)) {
- continue;
- }
-
- StationProtocol stationProtocol = stationMap.get(stationId);
- if (stationProtocol == null) {
- continue;
- }
-
- Object object = redisUtil.get(RedisKeyType.GENERATE_FAKE_OUT_TASK_LIMIT.key + stationId);
- if (object != null) {
- return;
- }
-
- // 婊¤冻鑷姩銆佹棤鐗┿�佸伐浣滃彿0锛岀敓鎴愬嚭搴撴暟鎹�
- if (stationProtocol.isAutoing()
- && !stationProtocol.isLoading()
- && stationProtocol.getTaskNo() == 0) {
- List<LocMast> locMastList = locMastService
- .selectList(new EntityWrapper<LocMast>().eq("loc_sts", String.valueOf(LocStsType.F)));
- if (locMastList.isEmpty()) {
- continue;
- }
-
- LocMast locMast = locMastList.get(0);
-
- CreateOutTaskParam taskParam = new CreateOutTaskParam();
- taskParam.setTaskNo(String.valueOf(commonService.getWorkNo(WrkIoType.OUT.id)));
- taskParam.setStaNo(stationId);
- taskParam.setLocNo(locMast.getLocNo());
- boolean result = commonService.createOutTask(taskParam);
- redisUtil.set(RedisKeyType.GENERATE_FAKE_OUT_TASK_LIMIT.key + stationId, "lock", 10);
- }
- }
- }
- }
-
- /**
- * 璇锋眰鐢熸垚鍏ュ簱浠诲姟
- * 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗�
- */
- public synchronized void generateStoreWrkFile() {
+ private void generateFakeOutTask() {
try {
- if (fakeRealTaskRequestWms.equals("N")) {
+ if (!enableFake.equals("Y")) {
return;
}
- Object systemConfigMapObj = redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
- if (systemConfigMapObj == null) {
- return;
- }
- HashMap<String, String> systemConfigMap = (HashMap<String, String>) systemConfigMapObj;
-
- int conveyorStationTaskLimit = 30;
- String conveyorStationTaskLimitStr = systemConfigMap.get("conveyorStationTaskLimit");
- if (conveyorStationTaskLimitStr != null) {
- conveyorStationTaskLimit = Integer.parseInt(conveyorStationTaskLimitStr);
- }
- int currentStationTaskCount = stationOperateProcessUtils.getCurrentStationTaskCount();
- if (currentStationTaskCount > conveyorStationTaskLimit) {
- News.error("杈撻�佺珯鐐逛换鍔″凡杈惧埌涓婇檺锛屼笂闄愬�硷細{}锛岀珯鐐逛换鍔℃暟锛歿}", conveyorStationTaskLimit, currentStationTaskCount);
+ if (fakeRealTaskRequestWms.equals("Y")) {
return;
}
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ if (!fakeGenerateOutTask.equals("Y")) {
+ return;
+ }
+
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
@@ -446,7 +361,7 @@
Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
- List<StationObjModel> list = basDevp.getBarcodeStationList$();
+ List<StationObjModel> list = basDevp.getOutStationList$();
for (StationObjModel entity : list) {
Integer stationId = entity.getStationId();
if (!stationMap.containsKey(stationId)) {
@@ -458,101 +373,79 @@
continue;
}
- // 婊¤冻鑷姩銆佹湁鐗┿�佹湁宸ヤ綔鍙凤紝鐢熸垚鍏ュ簱鏁版嵁
+ Object object = redisUtil.get(RedisKeyType.GENERATE_FAKE_OUT_TASK_LIMIT.key + stationId);
+ if (object != null) {
+ return;
+ }
+
+ // 婊¤冻鑷姩銆佹棤鐗┿�佸伐浣滃彿0锛岀敓鎴愬嚭搴撴暟鎹�
if (stationProtocol.isAutoing()
- && stationProtocol.isLoading()
- && stationProtocol.getTaskNo() > 0) {
- if (Cools.isEmpty(stationProtocol.getBarcode())) {
+ && !stationProtocol.isLoading()
+ && stationProtocol.getTaskNo() == 0) {
+ List<LocMast> locMastList = locMastService
+ .list(new QueryWrapper<LocMast>().eq("loc_sts", String.valueOf(LocStsType.F)));
+ if (locMastList.isEmpty()) {
continue;
}
- // 妫�娴嬩换鍔℃槸鍚︾敓鎴�
- List<WrkMast> wrkMasts = wrkMastService
- .selectList(new EntityWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
- if (!wrkMasts.isEmpty()) {
- continue;
- }
+ LocMast locMast = locMastList.get(0);
- Object lock = redisUtil.get(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId);
- if (lock != null) {
- continue;
- }
- redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 10);
-
- String barcode = stationProtocol.getBarcode();
- Integer stationIdVal = stationProtocol.getStationId();
-
- // 1. 棣栧厛鏌ヨ鏄惁鏈夊凡瀹屾垚鐨勫紓姝ュ搷搴�
- String response = wmsOperateUtils.queryAsyncInTaskResponse(barcode, stationIdVal);
-
- if (response != null) {
- // 2. 鏈夊搷搴旂粨鏋滐紝澶勭悊鍝嶅簲
- if (response.equals("FAILED") || response.startsWith("ERROR:")) {
- // 璇锋眰澶辫触锛岄噸鏂板彂璧峰紓姝ヨ姹�
- News.error("WMS鍏ュ簱璇锋眰澶辫触锛岄噸鏂板彂璧疯姹傦紝barcode={}锛宻tationId={}锛宺esponse={}", barcode,
- stationIdVal, response);
- wmsOperateUtils.applyInTaskAsync(barcode, stationIdVal,
- stationProtocol.getPalletHeight());
- redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);
-
- stationProtocol.setSystemWarning("璇锋眰鍏ュ簱澶辫触锛學MS杩斿洖=" + response);
- continue;
- }
-
- // 瑙ｆ瀽鍝嶅簲
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- StartupDto dto = jsonObject.getObject("data", StartupDto.class);
-
- CreateInTaskParam taskParam = new CreateInTaskParam();
- taskParam.setTaskNo(dto.getTaskNo());
- taskParam.setLocNo(dto.getLocNo());
- 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,
- stationProtocol.getPalletHeight());
- redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);
-
- stationProtocol.setSystemWarning("璇锋眰鍏ュ簱澶辫触锛學MS杩斿洖=" + response);
- }
- } else {
- // 3. 娌℃湁鍝嶅簲缁撴灉锛屾鏌ユ槸鍚︽湁璇锋眰姝ｅ湪杩涜涓�
- if (!wmsOperateUtils.isAsyncRequestInProgress(barcode, stationIdVal)) {
- // 娌℃湁璇锋眰杩涜涓紝鍙戣捣鏂扮殑寮傛璇锋眰
- News.info("鍙戣捣寮傛WMS鍏ュ簱璇锋眰锛宐arcode={}锛宻tationId={}", barcode, stationIdVal);
- wmsOperateUtils.applyInTaskAsync(barcode, stationIdVal,
- stationProtocol.getPalletHeight());
- redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);
-
- stationProtocol.setSystemWarning("璇锋眰鍏ュ簱澶辫触锛學MS鏃犺繑鍥�");
- }
- }
+ CreateOutTaskParam taskParam = new CreateOutTaskParam();
+ taskParam.setTaskNo(String.valueOf(commonService.getWorkNo(WrkIoType.OUT.id)));
+ taskParam.setStaNo(stationId);
+ taskParam.setLocNo(locMast.getLocNo());
+ boolean result = commonService.createOutTask(taskParam);
+ redisUtil.set(RedisKeyType.GENERATE_FAKE_OUT_TASK_LIMIT.key + stationId, "lock", 10);
}
}
}
} catch (Exception e) {
- e.printStackTrace();
+ log.error("generateFakeOutTask execute error", e);
}
}
+ /**
+ * 璇锋眰鐢熸垚鍏ュ簱浠诲姟
+ * 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗�
+ */
+ public void generateStoreWrkFile() {
+ submitGenerateStoreTasks();
+ }
+
+ @Override
+ public boolean isEnabled() {
+ return !"N".equals(fakeRealTaskRequestWms);
+ }
+
+ @Override
+ public boolean matchCandidate(StoreInTaskContext context) {
+ StationProtocol stationProtocol = context.getStationProtocol();
+ return stationProtocol.isAutoing()
+ && stationProtocol.isLoading()
+ && stationProtocol.getTaskNo() > 0
+ && !Cools.isEmpty(stationProtocol.getBarcode());
+ }
+
+ @Override
+ public void onRequestPermitGranted(StoreInTaskContext context) {
+ redisUtil.set(getGenerateLockKey(context), "lock", 3);
+ }
+
+ @Override
+ public void afterTaskCreated(StoreInTaskContext context, WrkMast wrkMast) {
+ Integer stationId = context.getStationObjModel().getStationId();
+ StationCommand command = context.getStationThread().getCommand(StationCommandType.WRITE_INFO,
+ wrkMast.getWrkNo(), stationId, stationId, 0);
+ if (command == null) {
+ News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
+ return;
+ }
+ stationCommandDispatcher.dispatch(context.getBasDevp().getDevpNo(), command, "fake-process", "write-info");
+ }
+
// 璁＄畻鎵�鏈夌珯鐐瑰仠鐣欐椂闂�
- public synchronized void calcAllStationStayTime() {
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ public void calcAllStationStayTime() {
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
@@ -575,8 +468,8 @@
}
// 妫�娴嬪嚭搴撶珯鐐瑰仠鐣欐槸鍚﹁秴鏃�
- public synchronized void checkOutStationStayTimeOut() {
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ public void checkOutStationStayTimeOut() {
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
List<StationObjModel> outStationList = basDevp.getOutStationList$();
if (outStationList.isEmpty()) {
@@ -596,7 +489,7 @@
continue;
}
- if (System.currentTimeMillis() - stayTime > 1000 * 15) {
+ if (System.currentTimeMillis() - stayTime > 1000 * 60) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp,
stationObjModel.getDeviceNo());
if (stationThread == null) {
@@ -609,7 +502,7 @@
continue;
}
- MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
+ stationCommandDispatcher.dispatch(stationObjModel.getDeviceNo(), command, "fake-process", "out-station-reset");
redisUtil.set(
RedisKeyType.CHECK_OUT_STATION_STAY_TIME_OUT_LIMIT.key + stationObjModel.getStationId(),
"lock", 10);
@@ -621,8 +514,8 @@
}
// 妫�娴嬪叆搴撶珯鐐瑰爢鍨涙満鏄惁鍙栬蛋璐х墿
- public synchronized void checkInStationCrnTake() {
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ public void checkInStationCrnTake() {
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
List<StationObjModel> inStationList = basCrnp.getInStationList$();
if (inStationList.isEmpty()) {
@@ -632,7 +525,7 @@
checkInStationListCrnTake(inStationList);
}
- List<BasDualCrnp> basDualCrnps = basDualCrnpService.selectList(new EntityWrapper<>());
+ List<BasDualCrnp> basDualCrnps = basDualCrnpService.list(new QueryWrapper<>());
for (BasDualCrnp basDualCrnp : basDualCrnps) {
List<StationObjModel> inStationList = basDualCrnp.getInStationList$();
if (inStationList.isEmpty()) {
@@ -643,7 +536,7 @@
}
}
- private synchronized void checkInStationListCrnTake(List<StationObjModel> inStationList) {
+ private void checkInStationListCrnTake(List<StationObjModel> inStationList) {
for (StationObjModel stationObjModel : inStationList) {
Object lock = redisUtil
.get(RedisKeyType.CHECK_IN_STATION_STAY_TIME_OUT_LIMIT.key + stationObjModel.getStationId());
@@ -672,7 +565,7 @@
WrkMast wrkMast = wrkMastService.selectByWorkNo(stationProtocol.getTaskNo());
if (wrkMast == null) {
- MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
+ stationCommandDispatcher.dispatch(stationObjModel.getDeviceNo(), command, "fake-process", "in-station-reset-task-over");
redisUtil.set(
RedisKeyType.CHECK_IN_STATION_STAY_TIME_OUT_LIMIT.key + stationObjModel.getStationId(),
"lock", 10);
@@ -680,7 +573,7 @@
JSON.toJSONString(command));
} else {
if (wrkMast.getWrkSts() != WrkStsType.NEW_INBOUND.sts
- && wrkMast.getWrkSts() != WrkStsType.INBOUND_DEVICE_RUN.sts) {
+ && wrkMast.getWrkSts() != WrkStsType.INBOUND_STATION_RUN.sts) {
Integer crnNo = wrkMast.getCrnNo();
if (crnNo != null) {
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnNo);
@@ -693,7 +586,7 @@
continue;
}
- MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
+ stationCommandDispatcher.dispatch(stationObjModel.getDeviceNo(), command, "fake-process", "in-station-reset-crn-fetch");
redisUtil.set(RedisKeyType.CHECK_IN_STATION_STAY_TIME_OUT_LIMIT.key
+ stationObjModel.getStationId(), "lock", 10);
News.info("杈撻�佺珯鐐归噸缃懡浠や笅鍙戞垚鍔�(crn_fetch)锛岀珯鐐瑰彿={}锛屽懡浠ゆ暟鎹�={}", stationObjModel.getStationId(),
@@ -720,7 +613,7 @@
continue;
}
- MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
+ stationCommandDispatcher.dispatch(stationObjModel.getDeviceNo(), command, "fake-process", "in-station-reset-dual-crn-fetch");
redisUtil.set(RedisKeyType.CHECK_IN_STATION_STAY_TIME_OUT_LIMIT.key
+ stationObjModel.getStationId(), "lock", 10);
News.info("杈撻�佺珯鐐归噸缃懡浠や笅鍙戞垚鍔�(crn_fetch)锛岀珯鐐瑰彿={}锛屽懡浠ゆ暟鎹�={}", stationObjModel.getStationId(),
@@ -733,8 +626,8 @@
}
// 鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴�
- public synchronized void crnIoExecuteFinish() {
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ public void crnIoExecuteFinish() {
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
if (crnThread == null) {
@@ -787,21 +680,26 @@
// 鐢熸垚浠跨湡绔欑偣鏁版嵁
StationCommand command = stationThread.getCommand(StationCommandType.WRITE_INFO, 9998,
wrkMast.getSourceStaNo(), 0, 0);
- MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
+ stationCommandDispatcher.dispatch(stationObjModel.getDeviceNo(), command, "fake-process", "crn-out-complete-write-info");
redisUtil.set(RedisKeyType.CRN_OUT_TASK_COMPLETE_STATION_INFO.key + wrkMast.getWrkNo(), JSON.toJSONString(stationObjModel, SerializerFeature.DisableCircularReferenceDetect), 60 * 60 * 24);
}
} else if (wrkMast.getWrkSts() == WrkStsType.LOC_MOVE_RUN.sts) {
updateWrkSts = WrkStsType.COMPLETE_LOC_MOVE.sts;
+ } else if (wrkMast.getWrkSts() == WrkStsType.CRN_MOVE_RUN.sts) {
+ updateWrkSts = WrkStsType.COMPLETE_CRN_MOVE.sts;
} else {
News.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗗伐浣滅姸鎬佸紓甯搞�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", basCrnp.getCrnNo(), crnProtocol.getTaskNo());
continue;
}
+ Date now = new Date();
wrkMast.setWrkSts(updateWrkSts);
wrkMast.setSystemMsg("");
- wrkMast.setIoTime(new Date());
+ wrkMast.setIoTime(now);
+ wrkMast.setModiTime(now);
if (wrkMastService.updateById(wrkMast)) {
- CrnCommand resetCommand = crnThread.getResetCommand(crnProtocol.getCrnNo());
+ wrkAnalysisService.markCraneComplete(wrkMast, now, updateWrkSts);
+ CrnCommand resetCommand = crnThread.getResetCommand(crnProtocol.getTaskNo(), crnProtocol.getCrnNo());
MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(2, resetCommand));
News.info("鍫嗗灈鏈轰换鍔＄姸鎬佹洿鏂版垚鍔燂紝鍫嗗灈鏈哄彿={}锛屽伐浣滃彿={}", basCrnp.getCrnNo(), crnProtocol.getTaskNo());
}
--
Gitblit v1.9.1