From 470718b6f7de2688807a59b4e32f437624c51499 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 15 一月 2026 16:06:17 +0800
Subject: [PATCH] #
---
/dev/null | 20 -----
src/main/java/com/zy/core/network/real/ZyStationRealConnect.java | 96 +++++++++++++++++++-----
src/main/java/com/zy/asrs/domain/enums/NotifyMsgType.java | 26 +++---
src/main/java/com/zy/asrs/utils/NotifyUtils.java | 2
src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java | 12 ++
src/main/java/com/zy/asrs/task/NotifyScheduler.java | 10 ++
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java | 13 +++
src/main/java/com/zy/core/enums/RedisKeyType.java | 1
src/main/java/com/zy/core/plugin/FakeProcess.java | 2
src/main/resources/docs/WCS外部HTTP API接口V1.6.docx | 0
10 files changed, 128 insertions(+), 54 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/enums/NotifyMsgType.java b/src/main/java/com/zy/asrs/domain/enums/NotifyMsgType.java
index 49505dd..f9d1067 100644
--- a/src/main/java/com/zy/asrs/domain/enums/NotifyMsgType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/NotifyMsgType.java
@@ -1,21 +1,23 @@
package com.zy.asrs.domain.enums;
public enum NotifyMsgType {
- SHUTTLE_START_TAKE("shuttle_start_take", "灏忚溅寮�濮嬪彇璐�"),
- SHUTTLE_TRANSPORT("shuttle_transport", "灏忚溅閫佽揣涓�"),
- SHUTTLE_DELIVERY("shuttle_delivery", "灏忚溅鏀捐揣瀹屾垚"),
- SHUTTLE_MOVING("shuttle_moving", "灏忚溅绉诲姩涓�"),
- SHUTTLE_MOVE_COMPLETE("shuttle_move_complete", "灏忚溅绉诲姩瀹屾垚"),
- SHUTTLE_POWER_LOW("shuttle_power_low", "灏忚溅浣庣數閲�"),
- SHUTTLE_POWER_START("shuttle_power_start", "灏忚溅寮�濮嬪厖鐢�"),
- SHUTTLE_POWER_COMPLETE("shuttle_power_complete", "灏忚溅鍏呯數瀹屾垚"),
- SHUTTLE_ERROR("shuttle_error", "灏忚溅寮傚父"),
- FORK_LIFT_ERROR("fork_lift_error", "璐у弶鎻愬崌鏈哄紓甯�"),
-
//浠诲姟
TASK_COMPLETE("task_complete", "浠诲姟瀹屾垚"),
- TASK_CHARGE_COMPLETE("task_charge_complete", "鍏呯數浠诲姟瀹屾垚"),
TASK_CANCEL("task_cancel", "浠诲姟鍙栨秷"),
+
+ CRN_IN_TASK_RUN("crn_in_task_run", "鍫嗗灈鏈哄叆搴撲换鍔℃墽琛屼腑"),
+ CRN_IN_TASK_COMPLETE("crn_in_task_complete", "鍫嗗灈鏈哄叆搴撲换鍔℃墽琛屽畬鎴�"),
+ CRN_OUT_TASK_RUN("crn_out_task_run", "鍫嗗灈鏈哄嚭搴撲换鍔℃墽琛屼腑"),
+ CRN_OUT_TASK_COMPLETE("crn_out_task_complete", "鍫嗗灈鏈哄嚭搴撲换鍔℃墽琛屽畬鎴�"),
+ CRN_TRANSFER_TASK_RUN("crn_transfer_task_run", "鍫嗗灈鏈虹Щ搴撲换鍔℃墽琛屼腑"),
+ CRN_TRANSFER_TASK_COMPLETE("crn_transfer_task_complete", "鍫嗗灈鏈虹Щ搴撲换鍔℃墽琛屽畬鎴�"),
+
+ DUAL_CRN_IN_TASK_RUN("dual_crn_in_task_run", "鍙屽伐浣嶅爢鍨涙満鍏ュ簱浠诲姟鎵ц涓�"),
+ DUAL_CRN_IN_TASK_COMPLETE("dual_crn_in_task_complete", "鍙屽伐浣嶅爢鍨涙満鍏ュ簱浠诲姟鎵ц瀹屾垚"),
+ DUAL_CRN_OUT_TASK_RUN("dual_crn_out_task_run", "鍙屽伐浣嶅爢鍨涙満鍑哄簱浠诲姟鎵ц涓�"),
+ DUAL_CRN_OUT_TASK_COMPLETE("dual_crn_out_task_complete", "鍙屽伐浣嶅爢鍨涙満鍑哄簱浠诲姟鎵ц瀹屾垚"),
+ DUAL_CRN_TRANSFER_TASK_RUN("dual_crn_transfer_task_run", "鍙屽伐浣嶅爢鍨涙満绉诲簱浠诲姟鎵ц涓�"),
+ DUAL_CRN_TRANSFER_TASK_COMPLETE("dual_crn_transfer_task_complete", "鍙屽伐浣嶅爢鍨涙満绉诲簱浠诲姟鎵ц瀹屾垚"),
;
public String flag;
diff --git a/src/main/java/com/zy/asrs/task/NotifyScheduler.java b/src/main/java/com/zy/asrs/task/NotifyScheduler.java
index 271b624..8e40b08 100644
--- a/src/main/java/com/zy/asrs/task/NotifyScheduler.java
+++ b/src/main/java/com/zy/asrs/task/NotifyScheduler.java
@@ -60,6 +60,16 @@
notifyMsg("task", 1);
}
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public synchronized void notifyCrn(){
+ notifyMsg("crn", 1);
+ }
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public synchronized void notifyDualCrn(){
+ notifyMsg("dualCrn", 1);
+ }
+
private synchronized void notifyMsg(String notifyType, Integer device) {
Config notifyEnableConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "notifyEnable"));
if(notifyEnableConfig == null){
diff --git a/src/main/java/com/zy/asrs/task/PlannerExecutor.java b/src/main/java/com/zy/asrs/task/PlannerExecutor.java
deleted file mode 100644
index 56dec78..0000000
--- a/src/main/java/com/zy/asrs/task/PlannerExecutor.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.zy.asrs.task;
-
-import com.zy.core.utils.CrnOperateProcessUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-@Component
-public class PlannerExecutor {
-
- @Autowired
- private CrnOperateProcessUtils crnOperateProcessUtils;
-
- @Scheduled(cron = "0/1 * * * * ? ")
- @Transactional
- public void executePlanner() {
- crnOperateProcessUtils.plannerExecute();
- }
-}
diff --git a/src/main/java/com/zy/asrs/utils/NotifyUtils.java b/src/main/java/com/zy/asrs/utils/NotifyUtils.java
index 5ad1a73..c573ccf 100644
--- a/src/main/java/com/zy/asrs/utils/NotifyUtils.java
+++ b/src/main/java/com/zy/asrs/utils/NotifyUtils.java
@@ -58,6 +58,8 @@
key = RedisKeyType.QUEUE_CRN.key + device;
} else if (notifyType.equals(String.valueOf(SlaveType.Devp))) {
key = RedisKeyType.QUEUE_DEVP.key + device;
+ } else if (notifyType.equals(String.valueOf(SlaveType.DualCrn))) {
+ key = RedisKeyType.QUEUE_DUAL_CRN.key + device;
} else if (notifyType.equals(String.valueOf(SlaveType.Rgv))) {
key = RedisKeyType.QUEUE_RGV.key + device;
} else if (notifyType.equals("task")) {
diff --git a/src/main/java/com/zy/core/enums/RedisKeyType.java b/src/main/java/com/zy/core/enums/RedisKeyType.java
index cb3ece2..566de01 100644
--- a/src/main/java/com/zy/core/enums/RedisKeyType.java
+++ b/src/main/java/com/zy/core/enums/RedisKeyType.java
@@ -12,6 +12,7 @@
DUAL_CRN_COMMAND_("dual_crn_command_"),
QUEUE_CRN("queue_crn_"),
+ QUEUE_DUAL_CRN("queue_dual_crn_"),
QUEUE_DEVP("queue_devp_"),
QUEUE_RGV("queue_rgv_"),
QUEUE_TASK("queue_task_"),
diff --git a/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java b/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
index 97b1c6c..f3fab96 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
@@ -18,6 +18,7 @@
import com.zy.core.News;
import com.zy.core.cache.OutputQueue;
import com.zy.core.model.CommandResponse;
+import com.zy.core.model.StationObjModel;
import com.zy.core.model.command.StationCommand;
import com.zy.core.network.api.ZyStationConnectApi;
import com.zy.core.network.entity.ZyStationStatusEntity;
@@ -35,7 +36,7 @@
public class ZyStationRealConnect implements ZyStationConnectApi {
private List<ZyStationStatusEntity> statusList;
- private List<ZyStationStatusEntity> barcodeStatusList;
+ private List<StationObjModel> barcodeOriginList;
private SiemensS7Net siemensNet;
private DeviceConfig deviceConfig;
private RedisUtil redisUtil;
@@ -91,14 +92,17 @@
if (statusList != null) {
statusList.sort(Comparator.comparing(ZyStationStatusEntity::getStationId));
}
- barcodeStatusList = JSONObject.parseArray(basDevp.getBarcodeStationList(), ZyStationStatusEntity.class);
+ barcodeOriginList = basDevp.getBarcodeStationList$();
}
- OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) (statusList.size() * 2));
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) (statusList.size() * 8));
if (result.IsSuccess) {
for (int i = 0; i < statusList.size(); i++) {
ZyStationStatusEntity statusEntity = statusList.get(i); // 绔欑偣缂栧彿
- boolean[] status = siemensNet.getByteTransform().TransBool(result.Content, i * 2, 2);
+ statusEntity.setTaskNo((int) siemensNet.getByteTransform().TransInt16(result.Content, i * 8)); // 宸ヤ綔鍙�
+ statusEntity.setTargetStaNo((int) siemensNet.getByteTransform().TransInt16(result.Content, i * 8 + 4)); // 鐩爣绔�
+
+ boolean[] status = siemensNet.getByteTransform().TransBool(result.Content, i * 8 + 6, 2);
statusEntity.setAutoing(status[0]); // 鑷姩
statusEntity.setLoading(status[1]); // 鏈夌墿
statusEntity.setInEnable(status[2]); // 鍙叆
@@ -108,27 +112,62 @@
}
}
- OperateResultExOne<byte[]> result1 = siemensNet.Read("DB100.0", (short) (statusList.size() * 4));
- if (result1.IsSuccess) {
- for (int i = 0; i < statusList.size(); i++) {
- ZyStationStatusEntity statusEntity = statusList.get(i);
- statusEntity.setTaskNo((int) siemensNet.getByteTransform().TransInt16(result1.Content, i * 4)); // 宸ヤ綔鍙�
- statusEntity.setTargetStaNo((int) siemensNet.getByteTransform().TransInt16(result1.Content, i * 4 + 2)); // 鐩爣绔�
+ // 鏉＄爜鎵弿鍣�
+ OperateResultExOne<byte[]> result2 = siemensNet.Read("DB101.840", (short) (barcodeOriginList.size() * 8));
+ if (result2.IsSuccess) {
+ for (int i = 0; i < barcodeOriginList.size(); i++) {
+ ZyStationStatusEntity barcodeEntity = findStatusEntityByBarcodeIdx(i + 1);
+ if (barcodeEntity == null) {
+ continue;
+ }
+ String barcode = siemensNet.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
+ barcode = barcode.trim();
+ barcodeEntity.setBarcode(barcode);
}
}
- // 鏉＄爜鎵弿鍣�
- OperateResultExOne<byte[]> result2 = siemensNet.Read("DB101.100", (short) (statusList.size() * 10));
- if (result2.IsSuccess) {
- for (int i = 0; i < barcodeStatusList.size(); i++) {
- ZyStationStatusEntity barcodeEntity = barcodeStatusList.get(i);
- ZyStationStatusEntity statusEntity = findStatusEntity(barcodeEntity.getStationId());
- if (statusEntity == null) {
+ // 鎶ヨ淇℃伅
+ OperateResultExOne<byte[]> result3 = siemensNet.Read("DB101.800", (short) (barcodeOriginList.size() * 3));
+ if (result3.IsSuccess) {
+ for (int i = 0; i < barcodeOriginList.size(); i++) {
+ ZyStationStatusEntity barcodeEntity = findStatusEntityByBarcodeIdx(i + 1);
+ if (barcodeEntity == null) {
continue;
}
- String barcode = siemensNet.getByteTransform().TransString(result2.Content, i * 10 + 2, 8, "UTF-8");
- barcode = barcode.trim();
- barcodeEntity.setBarcode(barcode);
+
+ barcodeEntity.setPalletHeight((int) siemensNet.getByteTransform().TransInt16(result3.Content, i * 3)); // 楂樹綆淇″彿
+
+ StringBuilder sb = new StringBuilder();
+ boolean[] status1 = siemensNet.getByteTransform().TransBool(result3.Content, i * 3 + 2, 1);
+
+ if(status1[0]){
+ sb.append("鍓嶈秴闄愭姤璀�;");
+ }
+ if(status1[1]) {
+ sb.append("鍚庤秴闄愭姤璀�;");
+ }
+ if(status1[2]) {
+ sb.append("瓒呴珮鎶ヨ;");
+ }
+ if(status1[3]) {
+ sb.append("宸﹁秴鎶ヨ;");
+ }
+ if(status1[4]) {
+ sb.append("鍙宠秴鎶ヨ;");
+ }
+ if(status1[5]) {
+ sb.append("瓒呴噸鎶ヨ;");
+ }
+ if(status1[6]) {
+ sb.append("鎵爜澶辫触;");
+ }
+
+ if(sb.length() > 0) {
+ barcodeEntity.setError(1);
+ }else {
+ barcodeEntity.setError(0);
+ }
+ barcodeEntity.setErrorMsg(sb.toString());
}
}
@@ -236,4 +275,21 @@
}
return -1;
}
+
+ private ZyStationStatusEntity findStatusEntityByBarcodeIdx(Integer barcodeIdx) {
+ Integer stationId = null;
+ for (StationObjModel stationObjModel : barcodeOriginList) {
+ if (stationObjModel.getBarcodeIdx().equals(barcodeIdx)) {
+ stationId = stationObjModel.getStationId();
+ break;
+ }
+ }
+
+ for (ZyStationStatusEntity zyStationStatusEntity : statusList) {
+ if(zyStationStatusEntity.getStationId().equals(stationId)) {
+ return zyStationStatusEntity;
+ }
+ }
+ return null;
+ }
}
diff --git a/src/main/java/com/zy/core/plugin/FakeProcess.java b/src/main/java/com/zy/core/plugin/FakeProcess.java
index 9f66fa0..4a137df 100644
--- a/src/main/java/com/zy/core/plugin/FakeProcess.java
+++ b/src/main/java/com/zy/core/plugin/FakeProcess.java
@@ -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();
@@ -531,7 +532,6 @@
stationProtocol.getPalletHeight());
redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);
}
- // 濡傛灉鏈夎姹傝繘琛屼腑锛岀瓑寰呬笅娆″惊鐜啀妫�鏌�
}
}
}
diff --git a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
index 89f2361..52ff58a 100644
--- a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.exception.CoolException;
+import com.zy.asrs.domain.enums.NotifyMsgType;
import com.zy.asrs.domain.param.CreateLocMoveTaskParam;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.LocMast;
@@ -11,6 +12,7 @@
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.utils.NotifyUtils;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
@@ -49,6 +51,8 @@
private WmsOperateUtils wmsOperateUtils;
@Autowired
private CommonService commonService;
+ @Autowired
+ private NotifyUtils notifyUtils;
public synchronized void crnIoExecute() {
Object systemConfigMapObj = redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
@@ -207,6 +211,7 @@
wrkMast.setIoTime(new Date());
if (wrkMastService.updateById(wrkMast)) {
MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, command));
+ notifyUtils.notify(String.valueOf(SlaveType.Crn), crnNo, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.CRN_IN_TASK_RUN, null);
News.info("鍫嗗灈鏈哄懡浠や笅鍙戞垚鍔燂紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", crnNo, JSON.toJSON(command));
}
}
@@ -295,6 +300,7 @@
wrkMast.setIoTime(new Date());
if (wrkMastService.updateById(wrkMast)) {
MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, command));
+ notifyUtils.notify(String.valueOf(SlaveType.Crn), crnNo, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.CRN_OUT_TASK_RUN, null);
News.info("鍫嗗灈鏈哄懡浠や笅鍙戞垚鍔燂紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", crnNo, JSON.toJSON(command));
return;
}
@@ -387,6 +393,7 @@
wrkMast.setIoTime(new Date());
if (wrkMastService.updateById(wrkMast)) {
MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, command));
+ notifyUtils.notify(String.valueOf(SlaveType.Crn), crnNo, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.CRN_IN_TASK_RUN, null);
News.info("鍫嗗灈鏈哄懡浠や笅鍙戞垚鍔燂紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", crnNo, JSON.toJSON(command));
return true;
}
@@ -471,6 +478,7 @@
wrkMast.setIoTime(new Date());
if (wrkMastService.updateById(wrkMast)) {
MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, command));
+ notifyUtils.notify(String.valueOf(SlaveType.Crn), crnNo, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.CRN_OUT_TASK_RUN, null);
News.info("鍫嗗灈鏈哄懡浠や笅鍙戞垚鍔燂紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", crnNo, JSON.toJSON(command));
return true;
}
@@ -524,6 +532,7 @@
wrkMast.setIoTime(new Date());
if (wrkMastService.updateById(wrkMast)) {
MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, command));
+ notifyUtils.notify(String.valueOf(SlaveType.Crn), crnNo, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.CRN_TRANSFER_TASK_RUN, null);
News.info("鍫嗗灈鏈哄懡浠や笅鍙戞垚鍔燂紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", crnNo, JSON.toJSON(command));
return;
}
@@ -563,10 +572,13 @@
Long updateWrkSts = null;
if(wrkMast.getWrkSts() == WrkStsType.INBOUND_RUN.sts){
updateWrkSts = WrkStsType.COMPLETE_INBOUND.sts;
+ notifyUtils.notify(String.valueOf(SlaveType.Crn), crnProtocol.getCrnNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.CRN_IN_TASK_COMPLETE, null);
}else if(wrkMast.getWrkSts() == WrkStsType.OUTBOUND_RUN.sts){
updateWrkSts = WrkStsType.OUTBOUND_RUN_COMPLETE.sts;
+ notifyUtils.notify(String.valueOf(SlaveType.Crn), crnProtocol.getCrnNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.CRN_OUT_TASK_COMPLETE, null);
}else if(wrkMast.getWrkSts() == WrkStsType.LOC_MOVE_RUN.sts){
updateWrkSts = WrkStsType.COMPLETE_LOC_MOVE.sts;
+ notifyUtils.notify(String.valueOf(SlaveType.Crn), crnProtocol.getCrnNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.CRN_TRANSFER_TASK_COMPLETE, null);
}else{
News.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗗伐浣滅姸鎬佸紓甯搞�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", basCrnp.getCrnNo(), crnProtocol.getTaskNo());
continue;
@@ -727,6 +739,7 @@
wrkMast.setIoTime(new Date());
if (wrkMastService.updateById(wrkMast)) {
MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, command));
+ notifyUtils.notify(String.valueOf(SlaveType.Crn), crnNo, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.CRN_TRANSFER_TASK_RUN, null);
News.info("鍫嗗灈鏈哄懡浠や笅鍙戞垚鍔燂紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", crnNo, JSON.toJSON(command));
return true;
}
diff --git a/src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java
index e7546e2..409f546 100644
--- a/src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.exception.CoolException;
+import com.zy.asrs.domain.enums.NotifyMsgType;
import com.zy.asrs.domain.param.CreateLocMoveTaskParam;
import com.zy.asrs.entity.BasDualCrnp;
import com.zy.asrs.entity.LocMast;
@@ -12,6 +13,7 @@
import com.zy.asrs.service.BasDualCrnpService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.utils.NotifyUtils;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
@@ -55,6 +57,8 @@
private WmsOperateUtils wmsOperateUtils;
@Autowired
private CommonService commonService;
+ @Autowired
+ private NotifyUtils notifyUtils;
//鍏ュ嚭搴� ===>> 鍙屽伐浣嶅爢鍨涙満鍏ュ嚭搴撲綔涓氫笅鍙�
public synchronized void dualCrnIoExecute() {
@@ -328,6 +332,7 @@
wrkMast.setIoTime(new Date());
if (wrkMastService.updateById(wrkMast)) {
MessageQueue.offer(SlaveType.DualCrn, crnNo, new Task(2, commandList));
+ notifyUtils.notify(String.valueOf(SlaveType.DualCrn), crnNo, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.DUAL_CRN_IN_TASK_RUN, null);
News.info("鍙屽伐浣嶅爢鍨涙満鍛戒护涓嬪彂鎴愬姛锛屽爢鍨涙満鍙�={}锛屼换鍔℃暟鎹�={}", crnNo, JSON.toJSON(commandList));
dualCrnProtocol.setLastIo("I");
return true;
@@ -421,6 +426,7 @@
wrkMast.setIoTime(new Date());
if (wrkMastService.updateById(wrkMast)) {
MessageQueue.offer(SlaveType.DualCrn, crnNo, new Task(2, commandList));
+ notifyUtils.notify(String.valueOf(SlaveType.DualCrn), crnNo, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.DUAL_CRN_OUT_TASK_RUN, null);
News.info("鍙屽伐浣嶅爢鍨涙満鍛戒护涓嬪彂鎴愬姛锛屽爢鍨涙満鍙�={}锛屼换鍔℃暟鎹�={}", crnNo, JSON.toJSON(commandList));
dualCrnProtocol.setLastIo("O");
@@ -492,6 +498,7 @@
wrkMast.setIoTime(new Date());
if (wrkMastService.updateById(wrkMast)) {
MessageQueue.offer(SlaveType.DualCrn, crnNo, new Task(2, commandList));
+ notifyUtils.notify(String.valueOf(SlaveType.DualCrn), crnNo, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.DUAL_CRN_TRANSFER_TASK_RUN, null);
News.info("鍙屽伐浣嶅爢鍨涙満鍛戒护涓嬪彂鎴愬姛锛屽爢鍨涙満鍙�={}锛屼换鍔℃暟鎹�={}", crnNo, JSON.toJSON(commandList));
dualCrnProtocol.setLastIo("I");
return true;
@@ -557,9 +564,11 @@
Long updateWrkSts = null;
if (wrkMast.getWrkSts() == WrkStsType.INBOUND_RUN.sts) {
updateWrkSts = WrkStsType.COMPLETE_INBOUND.sts;
+ notifyUtils.notify(String.valueOf(SlaveType.DualCrn), basDualCrnp.getCrnNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.DUAL_CRN_IN_TASK_COMPLETE, null);
} else if (wrkMast.getWrkSts() == WrkStsType.OUTBOUND_RUN.sts) {
updateWrkSts = WrkStsType.OUTBOUND_RUN_COMPLETE.sts;
-
+ notifyUtils.notify(String.valueOf(SlaveType.DualCrn), basDualCrnp.getCrnNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.DUAL_CRN_OUT_TASK_COMPLETE, null);
+
if(mainProcessPlugin.contains("Fake")) {
//鐢熸垚浠跨湡绔欑偣鏁版嵁
List<StationObjModel> outStationList = basDualCrnp.getOutStationList$();
@@ -585,6 +594,7 @@
} else if (wrkMast.getWrkSts() == WrkStsType.LOC_MOVE_RUN.sts) {
updateWrkSts = WrkStsType.COMPLETE_LOC_MOVE.sts;
+ notifyUtils.notify(String.valueOf(SlaveType.DualCrn), basDualCrnp.getCrnNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.DUAL_CRN_TRANSFER_TASK_COMPLETE, null);
} else {
News.error("鍙屽伐浣嶅爢鍨涙満澶勪簬绛夊緟纭涓斾换鍔″畬鎴愮姸鎬侊紝浣嗗伐浣滅姸鎬佸紓甯搞�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", basDualCrnp.getCrnNo(), taskNo);
return;
diff --git "a/src/main/resources/docs/WCS\345\244\226\351\203\250HTTP API\346\216\245\345\217\243V1.6.docx" "b/src/main/resources/docs/WCS\345\244\226\351\203\250HTTP API\346\216\245\345\217\243V1.6.docx"
new file mode 100644
index 0000000..fbce3ea
--- /dev/null
+++ "b/src/main/resources/docs/WCS\345\244\226\351\203\250HTTP API\346\216\245\345\217\243V1.6.docx"
Binary files differ
--
Gitblit v1.9.1