From 64f912f0fbbf9b07f6347afa0fcc26d5c099edf3 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期四, 11 四月 2024 20:06:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 8f4d102..60c83c6 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -3,7 +3,9 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.core.common.SpringUtils;
import com.zy.asrs.service.AgvBasDevpService;
+import com.zy.asrs.service.BasDevpService;
import com.zy.core.News;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
@@ -36,9 +38,6 @@
private DataInputStream dataInputStream;
public Integer connCount = 0;
- @Autowired
- private AgvBasDevpService agvBasDevpService;
-
public BarcodeThread(Slave slave) {
this.slave = slave;
}
@@ -51,8 +50,15 @@
this.barcode.delete(0, this.barcode.length());
this.barcode.append(barcode);
if(!Cools.isEmpty(barcode)) {
+ AgvBasDevpService agvBasDevpService = SpringUtils.getBean(AgvBasDevpService.class);
News.info("{}鍙锋潯鐮佸櫒锛屾绱㈡暟鎹細{}", slave.getId(), this.barcode);
+ 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)){
+ barcode = barcode.substring(3,barcode.length());
+ agvBasDevpService.updateBarcode(devNo,barcode);
+ }
+ News.info("{}鍙锋潯鐮佸櫒锛屾洿鏂版垚鍔�", slave.getId());
JSONObject jsonObject = new JSONObject();
jsonObject.put("time", DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
jsonObject.put("barcode", barcode);
@@ -62,10 +68,6 @@
}
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