From bf28baa00838879c15a22decf314b6e76eb6e89b Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 11 四月 2024 13:59:44 +0800
Subject: [PATCH] 输送线扫码时更细站点信息
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 2a8a648..8f4d102 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -3,12 +3,14 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.zy.asrs.service.AgvBasDevpService;
import com.zy.core.News;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.OutputQueue;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -34,6 +36,9 @@
private DataInputStream dataInputStream;
public Integer connCount = 0;
+ @Autowired
+ private AgvBasDevpService agvBasDevpService;
+
public BarcodeThread(Slave slave) {
this.slave = slave;
}
@@ -47,6 +52,7 @@
this.barcode.append(barcode);
if(!Cools.isEmpty(barcode)) {
News.info("{}鍙锋潯鐮佸櫒锛屾绱㈡暟鎹細{}", slave.getId(), this.barcode);
+
JSONObject jsonObject = new JSONObject();
jsonObject.put("time", DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
jsonObject.put("barcode", barcode);
@@ -55,6 +61,11 @@
OutputQueue.BARCODE.poll();
}
OutputQueue.BARCODE.offer(jsonObject);
+
+ String devNo = slave.getId() == 13 ? "310-1" : slave.getId() == 15 ? "312-2" : slave.getId() == 17 ? "314-1" : slave.getId() == 19 ? "316-1" : null;
+ if(!Cools.isEmpty(devNo)){
+ agvBasDevpService.updateBarcode(devNo,barcode);
+ }
}
}
--
Gitblit v1.9.1