From 7fcee9618bec2384cfc3322b22d7adef3f111ac2 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 06 一月 2026 14:20:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
index 43f5039..e5bb4d6 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
@@ -9,7 +9,6 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.service.BasDualCrnpOptService;
import com.zy.asrs.service.BasDualCrnpService;
-import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.utils.Utils;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
@@ -257,6 +256,27 @@
crnProtocol.setYDistance(0);
crnProtocol.setXDuration(0);
crnProtocol.setYDuration(0);
+
+ BasDualCrnpService basDualCrnpService = null;
+ try {
+ basDualCrnpService = SpringUtils.getBean(BasDualCrnpService.class);
+ }catch (Exception e){
+
+ }
+ if (basDualCrnpService != null) {
+ BasDualCrnp basDualCrnp = basDualCrnpService.selectOne(new EntityWrapper<BasDualCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
+ if(basDualCrnp == null) {
+ basDualCrnp = new BasDualCrnp();
+ basDualCrnp.setCrnNo(deviceConfig.getDeviceNo());
+ basDualCrnp.setStatus(1);
+ basDualCrnp.setInEnable("N");
+ basDualCrnp.setOutEnable("N");
+ basDualCrnp.setMaxInTask(5);
+ basDualCrnp.setMaxOutTask(5);
+ basDualCrnp.setCreateTime(new Date());
+ basDualCrnpService.insert(basDualCrnp);
+ }
+ }
}
@Override
@@ -308,6 +328,8 @@
crnProtocol.setYDistance(crnStatus.getYDistance());
crnProtocol.setXDuration(crnStatus.getXDuration());
crnProtocol.setYDuration(crnStatus.getYDuration());
+ crnProtocol.setGoodsType(crnStatus.getGoodsType());
+ crnProtocol.setBarcode(crnStatus.getBarcode());
OutputQueue.DUAL_CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), deviceConfig.getDeviceNo()));
@@ -331,27 +353,6 @@
redisUtil.set(RedisKeyType.DEVICE_LOG_KEY.key + System.currentTimeMillis(), deviceDataLog, 60 * 60 * 24);
//鏇存柊閲囬泦鏃堕棿
crnProtocol.setDeviceDataLog(System.currentTimeMillis());
- }
-
- BasDualCrnpService basDualCrnpService = null;
- try {
- basDualCrnpService = SpringUtils.getBean(BasDualCrnpService.class);
- }catch (Exception e){
-
- }
- if (basDualCrnpService != null) {
- BasDualCrnp basDualCrnp = basDualCrnpService.selectOne(new EntityWrapper<BasDualCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
- if(basDualCrnp == null) {
- basDualCrnp = new BasDualCrnp();
- basDualCrnp.setCrnNo(deviceConfig.getDeviceNo());
- basDualCrnp.setStatus(1);
- basDualCrnp.setInEnable("N");
- basDualCrnp.setOutEnable("N");
- basDualCrnp.setMaxInTask(5);
- basDualCrnp.setMaxOutTask(5);
- basDualCrnp.setCreateTime(new Date());
- basDualCrnpService.insert(basDualCrnp);
- }
}
}
--
Gitblit v1.9.1