From 8041b12390fac65e6c60f1d7613a0639397b78b8 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 29 一月 2023 09:38:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 3 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++--
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 71 ++++++++++++++++++++---------------
3 files changed, 47 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index a462746..da10301 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -126,11 +126,11 @@
if (staProtocol.isAutoing() && staProtocol.isLoading()
&& staProtocol.isInEnable()
&& !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() > 9990)
- && staProtocol.isPakMk()) {// && !Cools.isEmpty(barcode)) {
+ && staProtocol.isPakMk() && staProtocol.getStamp()>=2) {// && !Cools.isEmpty(barcode)) {
- try {
- Thread.sleep(300);
- }catch (Exception e){}
+// try {
+// Thread.sleep(300);
+// }catch (Exception e){}
String barcode = barcodeThread.getBarcode();
if(!Cools.isEmpty(barcode)) {
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index ca3c6db..2e3fb74 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -55,6 +55,9 @@
// 闅斿绔欑偣锛堝彴杞︿綅缃級
private String nearbySta;
+ //lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱
+ private Integer stamp = 0;
+
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 0328479..c650393 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -273,38 +273,47 @@
staProtocol.setPakMk(true);
}
- //20230110锛屾棩蹇楁墦鍗帮紝纭鏀跺埌鍏ュ簱绔欏彲鍏ヤ俊鍙锋椂锛屽搴旀潯鐮佹暟鎹槸鍚﹀凡鏈�
- if ((siteId==101 || siteId==109 || siteId==117 || siteId==201 || siteId==207 || siteId==213)
- && staProtocol.isInEnable()){
- Integer barcodeId = 0;
- switch (siteId){
- case 101:
- barcodeId=1;
- break;
- case 109:
- barcodeId=2;
- break;
- case 117:
- barcodeId=3;
- break;
- case 201:
- barcodeId=4;
- break;
- case 207:
- barcodeId=5;
- break;
- case 213:
- barcodeId=6;
- break;
- }
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
- if(barcodeThread!=null){
- log.info("{}绔欐湁鍙叆淇″彿鏃讹紝鏉＄爜鍊间负{}", siteId, barcodeThread.getBarcode());
- if(Cools.isEmpty(barcodeThread.getBarcode())){
- staProtocol.setInEnable(false);//鏉＄爜鏁版嵁涓虹┖鏃讹紝鍏堟竻涓�娆″唴瀛樼殑绔欑偣鍙叆淇″彿锛岀瓑寰呬笅涓�娆¤幏鍙栧彲鍏ヤ俊鍙�
- }
- }
+ if (staProtocol.getStamp()>=2 && !staProtocol.isLoading()){
+ staProtocol.setStamp(0);
+ }else if (staProtocol.getStamp()<2 && staProtocol.isLoading()){
+ //lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱
+ staProtocol.setStamp(staProtocol.getStamp()+1);
}
+
+// //20230110锛屾棩蹇楁墦鍗帮紝纭鏀跺埌鍏ュ簱绔欏彲鍏ヤ俊鍙锋椂锛屽搴旀潯鐮佹暟鎹槸鍚﹀凡鏈�
+// if ((siteId==101 || siteId==109 || siteId==117 || siteId==201 || siteId==207 || siteId==213)
+// && staProtocol.isInEnable()){
+// Integer barcodeId = 0;
+// switch (siteId){
+// case 101:
+// barcodeId=1;
+// break;
+// case 109:
+// barcodeId=2;
+// break;
+// case 117:
+// barcodeId=3;
+// break;
+// case 201:
+// barcodeId=4;
+// break;
+// case 207:
+// barcodeId=5;
+// break;
+// case 213:
+// barcodeId=6;
+// break;
+// }
+// BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
+// if(barcodeThread!=null){
+// //lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱
+// staProtocol.setStamp(staProtocol.getStamp()+1);
+// log.info("{}绔欐湁鍙叆淇″彿鏃讹紝鏉＄爜鍊间负{}", siteId, barcodeThread.getBarcode());
+// if(Cools.isEmpty(barcodeThread.getBarcode())){
+// staProtocol.setInEnable(false);//鏉＄爜鏁版嵁涓虹┖鏃讹紝鍏堟竻涓�娆″唴瀛樼殑绔欑偣鍙叆淇″彿锛岀瓑寰呬笅涓�娆¤幏鍙栧彲鍏ヤ俊鍙�
+// }
+// }
+// }
}
}
--
Gitblit v1.9.1