From ac9e0615d2873f608c805b566fc86fb6756a03a4 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期三, 28 一月 2026 12:53:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/enums/CrnTaskModeType.java | 2
src/main/java/com/zy/core/thread/impl/ZySiemensCrnV2Thread.java | 3
src/main/java/com/zy/core/enums/CrnStatusType.java | 2
src/main/java/com/zy/core/plugin/XiaosongProcess.java | 248 +++++++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/core/network/real/ZyStationV3RealConnect.java | 6
src/main/webapp/components/WatchCrnCard.js | 3
src/main/java/com/zy/core/network/entity/ZyCrnStatusEntity.java | 5
src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java | 33 +++++
src/main/java/com/zy/asrs/controller/CrnController.java | 1
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 5
src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java | 2
src/main/java/com/zy/core/ServerBootstrap.java | 8
12 files changed, 305 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index d3435f5..f0e15a4 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -81,6 +81,7 @@
vo.setYdistance(crnProtocol.getYDistance()); // 鍗囬檷璺濈(Km)
vo.setXduration(crnProtocol.getXDuration()); // 璧拌鏃堕暱(H)
vo.setYduration(crnProtocol.getYDuration()); // 鍗囬檷鏃堕暱(H)
+ vo.setTaskReceive(crnProtocol.getTaskReceive());
if (crnProtocol.getModeType().equals(CrnModeType.AUTO)) {
vo.setDeviceStatus("AUTO");
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
index 63ed0d0..0f0e4b0 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
@@ -104,6 +104,8 @@
// 鍗囬檷鏃堕暱(H)
private Double yduration = 0D;
+ private Integer taskReceive;
+
// 璁惧鐘舵��-鐢ㄤ簬鍓嶇鏄剧ず
private String deviceStatus = "OFFLINE";
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 62c22f5..a4a5e65 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -8,11 +8,7 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
-import com.zy.core.thread.impl.ZySiemensCrnThread;
-import com.zy.core.thread.impl.ZySiemensDualCrnThread;
-import com.zy.core.thread.impl.ZyStationThread;
-import com.zy.core.thread.impl.ZyStationV3Thread;
-import com.zy.core.thread.impl.ZyRgvThread;
+import com.zy.core.thread.impl.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -95,6 +91,8 @@
ThreadHandler thread = null;
if (deviceConfig.getThreadImpl().equals("ZySiemensCrnThread")) {
thread = new ZySiemensCrnThread(deviceConfig, redisUtil);
+ } else if (deviceConfig.getThreadImpl().equals("ZySiemensCrnV2Thread")) {
+ thread = new ZySiemensCrnV2Thread(deviceConfig, redisUtil);
} else {
throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
}
diff --git a/src/main/java/com/zy/core/enums/CrnStatusType.java b/src/main/java/com/zy/core/enums/CrnStatusType.java
index 42c6f37..d761fc4 100644
--- a/src/main/java/com/zy/core/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/core/enums/CrnStatusType.java
@@ -13,7 +13,7 @@
ORIGIN_GO(7, "鍥炲師鐐�"),
ORIGIN_BACK(8, "鍥炲弽鍘熺偣"),
MOVING(9, "璧拌涓�"),
- WAITING(90, "浠诲姟瀹屾垚绛夊緟WCS纭"),
+ WAITING(10, "浠诲姟瀹屾垚绛夊緟WCS纭"),
PAUSE(11, "浠诲姟鏆傚仠"),
SOS(99, "鎶ヨ"),
UNKNOW(100, "鍏朵粬"),
diff --git a/src/main/java/com/zy/core/enums/CrnTaskModeType.java b/src/main/java/com/zy/core/enums/CrnTaskModeType.java
index 13048c7..b99df1c 100644
--- a/src/main/java/com/zy/core/enums/CrnTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/CrnTaskModeType.java
@@ -10,7 +10,7 @@
CRN_MOVE(4), // 鍫嗗灈鏈虹Щ鍔╔YZ
BACK_ORIGIN(8), // 鍥炲弽鍘熺偣
CLEAR(9), // 娓呴敊
- RESET(5), // 寰╀綅
+ RESET(5), // 澶嶄綅
;
public Integer id;
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index ffceec0..0bdf35d 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -159,6 +159,11 @@
private String barcode;
/**
+ * 浠诲姟鎺ユ敹
+ */
+ public Integer taskReceive;
+
+ /**
* 鏃ュ織閲囬泦鏃堕棿
*/
private Long deviceDataLog = System.currentTimeMillis();
diff --git a/src/main/java/com/zy/core/network/entity/ZyCrnStatusEntity.java b/src/main/java/com/zy/core/network/entity/ZyCrnStatusEntity.java
index 9ddfe6b..195ba46 100644
--- a/src/main/java/com/zy/core/network/entity/ZyCrnStatusEntity.java
+++ b/src/main/java/com/zy/core/network/entity/ZyCrnStatusEntity.java
@@ -114,6 +114,11 @@
*/
public Double yDuration;
+ /**
+ * 浠诲姟鎺ユ敹
+ */
+ public Integer taskReceive;
+
private Integer temp1;
private Integer temp2;
diff --git a/src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java b/src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java
index 93c2eb4..f5185ef 100644
--- a/src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java
@@ -51,7 +51,7 @@
@Override
public ZyCrnStatusEntity getStatus() {
try {
- OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 62);
if (result.IsSuccess) {
ZyCrnStatusEntity crnStatus = new ZyCrnStatusEntity();
crnStatus.setCrnNo(deviceConfig.getDeviceNo());
@@ -74,6 +74,37 @@
crnStatus.setYDistance((double) siemensNet.getByteTransform().TransSingle(result.Content, 44));
crnStatus.setXDuration((double) siemensNet.getByteTransform().TransSingle(result.Content, 48));
crnStatus.setYDuration((double) siemensNet.getByteTransform().TransSingle(result.Content, 52));
+ crnStatus.setTaskReceive((int) siemensNet.getByteTransform().TransInt16(result.Content, 60));
+
+ if (crnStatus.getStatus() == 0 && crnStatus.getTaskReceive() == 0) {
+ OperateResultExOne<byte[]> taskResult = siemensNet.Read("DB100.0", (short) 20);
+ if (taskResult.IsSuccess) {
+ short taskNo = siemensNet.getByteTransform().TransInt16(taskResult.Content, 2);
+ short taskMode = siemensNet.getByteTransform().TransInt16(taskResult.Content, 4);
+ short sourcePosX = siemensNet.getByteTransform().TransInt16(taskResult.Content, 6);
+ short sourcePosY = siemensNet.getByteTransform().TransInt16(taskResult.Content, 8);
+ short sourcePosZ = siemensNet.getByteTransform().TransInt16(taskResult.Content, 10);
+ short destinationPosX = siemensNet.getByteTransform().TransInt16(taskResult.Content, 12);
+ short destinationPosY = siemensNet.getByteTransform().TransInt16(taskResult.Content, 14);
+ short destinationPosZ = siemensNet.getByteTransform().TransInt16(taskResult.Content, 16);
+ short confirm = siemensNet.getByteTransform().TransInt16(taskResult.Content, 18);
+
+ if(taskNo != 0 || taskMode != 0 || sourcePosX != 0 || sourcePosY != 0 || sourcePosZ != 0 || destinationPosX != 0 || destinationPosY != 0 || destinationPosZ != 0 || confirm != 0) {
+ short[] array = new short[10];
+ array[0] = (short) 0;
+ array[1] = (short) 0;
+ array[2] = (short) 0;
+ array[3] = (short) 0;
+ array[4] = (short) 0;
+ array[5] = (short) 0;
+ array[6] = (short) 0;
+ array[7] = (short) 0;
+ array[8] = (short) 0;
+ array[9] = (short) 0;
+ OperateResult taskClearResult = siemensNet.Write("DB100.0", array);
+ }
+ }
+ }
return crnStatus;
} else {
diff --git a/src/main/java/com/zy/core/network/real/ZyStationV3RealConnect.java b/src/main/java/com/zy/core/network/real/ZyStationV3RealConnect.java
index 543a2bd..56283bd 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationV3RealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationV3RealConnect.java
@@ -138,7 +138,7 @@
}
// 鏉＄爜鎵弿鍣�
- OperateResultExOne<byte[]> result2 = siemensNet.Read("DB101.0", (short) (barcodeOriginList.size() * 16));
+ OperateResultExOne<byte[]> result2 = siemensNet.Read("DB101.16", (short) (barcodeOriginList.size() * 16));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeOriginList.size(); i++) {
ZyStationStatusEntity barcodeEntity = findStatusEntityByBarcodeIdx(i + 1);
@@ -152,7 +152,7 @@
}
// 绉伴噸
- OperateResultExOne<byte[]> result3 = siemensNet.Read("DB102.0", (short) (barcodeOriginList.size() * 4));
+ OperateResultExOne<byte[]> result3 = siemensNet.Read("DB102.4", (short) (barcodeOriginList.size() * 4));
if (result3.IsSuccess) {
for (int i = 0; i < barcodeOriginList.size(); i++) {
ZyStationStatusEntity barcodeEntity = findStatusEntityByBarcodeIdx(i + 1);
@@ -165,7 +165,7 @@
}
// 鎶ヨ淇℃伅
- OperateResultExOne<byte[]> result4 = siemensNet.Read("DB103.0", (short) (barcodeOriginList.size() * 2));
+ OperateResultExOne<byte[]> result4 = siemensNet.Read("DB103.2", (short) (barcodeOriginList.size() * 2));
if (result4.IsSuccess) {
for (int i = 0; i < barcodeOriginList.size(); i++) {
ZyStationStatusEntity barcodeEntity = findStatusEntityByBarcodeIdx(i + 1);
diff --git a/src/main/java/com/zy/core/plugin/XiaosongProcess.java b/src/main/java/com/zy/core/plugin/XiaosongProcess.java
new file mode 100644
index 0000000..450faf5
--- /dev/null
+++ b/src/main/java/com/zy/core/plugin/XiaosongProcess.java
@@ -0,0 +1,248 @@
+package com.zy.core.plugin;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.domain.param.CreateInTaskParam;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.WrkMastService;
+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.enums.RedisKeyType;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.enums.StationCommandType;
+import com.zy.core.enums.WrkIoType;
+import com.zy.core.model.StationObjModel;
+import com.zy.core.model.Task;
+import com.zy.core.model.command.StationCommand;
+import com.zy.core.model.protocol.StationProtocol;
+import com.zy.core.plugin.api.MainProcessPluginApi;
+import com.zy.core.thread.StationThread;
+import com.zy.core.utils.CrnOperateProcessUtils;
+import com.zy.core.utils.StationOperateProcessUtils;
+import com.zy.core.utils.WmsOperateUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Component
+public class XiaosongProcess implements MainProcessPluginApi {
+
+ @Autowired
+ private CrnOperateProcessUtils crnOperateUtils;
+ @Autowired
+ private StationOperateProcessUtils stationOperateProcessUtils;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private RedisUtil redisUtil;
+ @Autowired
+ private WmsOperateUtils wmsOperateUtils;
+
+ @Override
+ public void run() {
+ //妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞跺惎鍔ㄥ叆搴�
+ checkInStationHasTask();
+ //璇锋眰鐢熸垚鍏ュ簱浠诲姟
+ generateStoreWrkFile();
+
+ //鎵ц鍫嗗灈鏈轰换鍔�
+ crnOperateUtils.crnIoExecute();
+ //鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴�-鍏峰浠跨湡鑳藉姏
+ crnOperateUtils.crnIoExecuteFinish();
+ //鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
+ stationOperateProcessUtils.stationInExecute();
+ //鎵ц杈撻�佺珯鐐瑰嚭搴撲换鍔�
+ stationOperateProcessUtils.stationOutExecute();
+ //妫�娴嬭緭閫佺珯鐐瑰嚭搴撲换鍔℃墽琛屽畬鎴�
+ stationOperateProcessUtils.stationOutExecuteFinish();
+ }
+
+ /**
+ * 璇锋眰鐢熸垚鍏ュ簱浠诲姟
+ * 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗�
+ */
+ public synchronized void generateStoreWrkFile() {
+ try {
+ 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);
+ 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.getBarcodeStationList$();
+ for (StationObjModel entity : list) {
+ Integer stationId = entity.getStationId();
+ if (!stationMap.containsKey(stationId)) {
+ continue;
+ }
+
+ StationProtocol stationProtocol = stationMap.get(stationId);
+ if (stationProtocol == null) {
+ continue;
+ }
+
+ // 婊¤冻鑷姩銆佹湁鐗┿�佹湁宸ヤ綔鍙凤紝鐢熸垚鍏ュ簱鏁版嵁
+ if (stationProtocol.isAutoing()
+ && stationProtocol.isLoading()
+ && stationProtocol.getTaskNo() > 0) {
+ if (Cools.isEmpty(stationProtocol.getBarcode())) {
+ continue;
+ }
+
+ // 妫�娴嬩换鍔℃槸鍚︾敓鎴�
+ List<WrkMast> wrkMasts = wrkMastService
+ .selectList(new EntityWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
+ if (!wrkMasts.isEmpty()) {
+ continue;
+ }
+
+ Object lock = redisUtil.get(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId);
+ if (lock != null) {
+ continue;
+ }
+
+ 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);
+ 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));
+ } 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);
+ }
+ } 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);
+ }
+ // 濡傛灉鏈夎姹傝繘琛屼腑锛岀瓑寰呬笅娆″惊鐜啀妫�鏌�
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ //妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞跺惎鍔ㄥ叆搴�
+ private synchronized void checkInStationHasTask() {
+ 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.getInStationList$();
+ for (StationObjModel entity : list) {
+ Integer stationId = entity.getStationId();
+ if(!stationMap.containsKey(stationId)){
+ continue;
+ }
+
+ StationProtocol stationProtocol = stationMap.get(stationId);
+ if (stationProtocol == null) {
+ continue;
+ }
+
+ Object lock = redisUtil.get(RedisKeyType.GENERATE_ENABLE_IN_STATION_DATA_LIMIT.key + stationId);
+ if(lock != null){
+ continue;
+ }
+
+ //婊¤冻鑷姩銆佹棤鐗┿�佸伐浣滃彿0锛岀敓鎴愬叆搴撴暟鎹�
+ if (stationProtocol.isAutoing()
+ && stationProtocol.isLoading()
+ && stationProtocol.getTaskNo() == 0
+ && stationProtocol.isEnableIn()
+ ) {
+ StationCommand command = stationThread.getCommand(StationCommandType.MOVE, commonService.getWorkNo(WrkIoType.ENABLE_IN.id), stationId, entity.getBarcodeStation().getStationId(), 0);
+ MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+ redisUtil.set(RedisKeyType.GENERATE_ENABLE_IN_STATION_DATA_LIMIT.key + stationId, "lock", 15);
+ News.info("{}绔欑偣鍚姩鍏ュ簱鎴愬姛锛屾暟鎹寘:{}", stationId, JSON.toJSONString(command));
+ }
+ }
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnV2Thread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnV2Thread.java
index ac6d3b4..5fe6fa2 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnV2Thread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnV2Thread.java
@@ -174,6 +174,7 @@
crnProtocol.setYDistance(crnStatus.getYDistance());
crnProtocol.setXDuration(crnStatus.getXDuration());
crnProtocol.setYDuration(crnStatus.getYDuration());
+ crnProtocol.setTaskReceive(crnStatus.getTaskReceive());
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), deviceConfig.getDeviceNo()));
@@ -287,7 +288,7 @@
crnCommand.setCrnNo(crnNo); // 鍫嗗灈鏈虹紪鍙�
crnCommand.setTaskNo(0); // 宸ヤ綔鍙�
crnCommand.setAckFinish(1); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.NONE.id); // 浠诲姟妯″紡
+ crnCommand.setTaskMode(CrnTaskModeType.RESET.id); // 浠诲姟妯″紡
crnCommand.setSourcePosX(0); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY(0); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ(0); // 婧愬簱浣嶅眰
diff --git a/src/main/webapp/components/WatchCrnCard.js b/src/main/webapp/components/WatchCrnCard.js
index d760b97..53c90a2 100644
--- a/src/main/webapp/components/WatchCrnCard.js
+++ b/src/main/webapp/components/WatchCrnCard.js
@@ -41,6 +41,7 @@
<el-descriptions-item label="婧愬簱浣�">{{ item.sourceLocNo }}</el-descriptions-item>
<el-descriptions-item label="鐩爣搴撲綅">{{ item.locNo }}</el-descriptions-item>
<el-descriptions-item label="鏄惁鏈夌墿">{{ item.loading }}</el-descriptions-item>
+ <el-descriptions-item label="浠诲姟鎺ユ敹">{{ item.taskReceive }}</el-descriptions-item>
<el-descriptions-item label="鍒�">{{ item.bay }}</el-descriptions-item>
<el-descriptions-item label="灞�">{{ item.lev }}</el-descriptions-item>
<el-descriptions-item label="璐у弶瀹氫綅">{{ item.forkOffset }}</el-descriptions-item>
@@ -51,7 +52,7 @@
<el-descriptions-item label="鍙夌墮閫熷害锛坢/min)">{{ item.zspeed }}</el-descriptions-item>
<el-descriptions-item label="璧拌璺濈(Km)">{{ item.xdistance }}</el-descriptions-item>
<el-descriptions-item label="鍗囬檷璺濈(Km)">{{ item.ydistance }}</el-descriptions-item>
- <el-descriptions-item label="璧拌鏃堕暱(H)">{{ item.xDuration }}</el-descriptions-item>
+ <el-descriptions-item label="璧拌鏃堕暱(H)">{{ item.xduration }}</el-descriptions-item>
<el-descriptions-item label="鍗囬檷鏃堕暱(H)">{{ item.yduration }}</el-descriptions-item>
<el-descriptions-item label="绉伴噸鏁版嵁">{{ item.weight }}</el-descriptions-item>
<el-descriptions-item label="鏉＄爜鏁版嵁">{{ item.barcode }}</el-descriptions-item>
--
Gitblit v1.9.1