From bccfbafc78e9b06bd3c2ac48822ad7065f80b213 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 27 二月 2023 20:17:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 10 ++--
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 61 +++++++++++++++++++++---------
src/main/webapp/views/console.html | 2
src/main/resources/application.yml | 4 +-
4 files changed, 50 insertions(+), 27 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 cc41e1d..c910394 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -110,12 +110,12 @@
//101绔欐湁3涓壂鐮佸櫒锛屽綋0鎵爜鍣ㄦ病鏈夋暟鎹椂锛岃幏鍙�9銆�10涓や釜鎵爜鍣ㄦ暟鎹�
- if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) && ( "NoRead".equals(barcode) || Cools.isEmpty(barcode) )){
+ if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) && ( "NoRead".equals(barcode) || Cools.isEmpty(barcode) )){
BarcodeThread barcodeThread1 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode1());
if (barcodeThread1 != null) {
- continue;
+ barcode = barcodeThread1.getBarcode();
}
- barcode = barcodeThread1.getBarcode();
+
if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) {
BarcodeThread barcodeThread2 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode2());
if (barcodeThread2 != null) {
@@ -123,17 +123,13 @@
}
}
-// if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) {
-// barcode = "";
-// continue;
-// }
}
- if (!Cools.isEmpty(barcode) && !"NoRead".equals(barcode)) {
+ if (!Cools.isEmpty(barcode)) {
log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
-// if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
-// continue;
-// }
+ if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+ continue;
+ }
} else {
continue;
}
@@ -193,11 +189,15 @@
// }
// 鍒ゆ柇閲嶅宸ヤ綔妗�
- WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
- if (wrkMast != null) {
- log.error("宸ヤ綔妗ｄ腑宸插瓨鍦ㄨ绔欑姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
- continue;
+ WrkMast wrkMast = new WrkMast();
+ if (barcode.length() == 8) {
+ wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
+ if (wrkMast != null) {
+ log.error("宸ヤ綔妗ｄ腑宸插瓨鍦ㄨ绔欑姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
+ continue;
+ }
}
+
// // 鑾峰彇鍏ュ簱閫氱煡妗�
// List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
// if (waitPakins.isEmpty()) {
@@ -397,15 +397,38 @@
for (DevpSlave.Sta pickSta : devp.getPickSta()) {
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
+
if (barcodeThread == null) {
continue;
}
String barcode = barcodeThread.getBarcode();
- if(!Cools.isEmpty(barcode)) {
- log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
- if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
- continue;
+
+
+ //101绔欐湁3涓壂鐮佸櫒锛屽綋0鎵爜鍣ㄦ病鏈夋暟鎹椂锛岃幏鍙�9銆�10涓や釜鎵爜鍣ㄦ暟鎹�
+ if((pickSta.getStaNo().equals(101) || pickSta.getStaNo().equals(104)) && ( "NoRead".equals(barcode) || Cools.isEmpty(barcode) )){
+ BarcodeThread barcodeThread1 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode1());
+ if (barcodeThread1 != null) {
+ barcode = barcodeThread1.getBarcode();
}
+
+ if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) {
+ BarcodeThread barcodeThread2 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode2());
+ if (barcodeThread2 != null) {
+ barcode = barcodeThread2.getBarcode();
+
+ }
+ }
+// if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) {
+// barcode = "";
+// continue;
+// }
+ }
+
+ if (!Cools.isEmpty(barcode) && "NoRead".equals(barcode)) {
+ log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
+// if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+// continue;
+// }
} else {
continue;
}
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index e905084..befab27 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -234,8 +234,8 @@
}
// convertRow(command);
command.setCrnNo(slave.getId());
- short[] array = new short[10];
-// short[] array = new short[12];
+// short[] array = new short[10];
+ short[] array = new short[12];
array[0] = command.getAckFinish(); // 浠诲姟瀹屾垚纭浣�
array[1] = command.getTaskNo(); // 浠诲姟鍙�
array[2] = command.getTaskMode(); // 妯″紡
@@ -246,14 +246,14 @@
array[7] = command.getDestinationPosY(); // 鐩爣浣嶇疆鍒楀彿
array[8] = command.getDestinationPosZ(); // 鐩爣浣嶇疆灞傚彿
array[9] = command.getCommand();
-// array[10] = command.getLocType1(); //鏂板璐х墿绫诲瀷涓嬪彂
+ array[10] = command.getLocType1(); //鏂板璐х墿绫诲瀷涓嬪彂
OperateResult result = siemensNet.Write("DB100.0", array);
if (command.getAckFinish() == 0) {
short commandFinish = 1;
Thread.sleep(100L);
- result = siemensNet.Write("DB100.18", commandFinish);
-// result = siemensNet.Write("DB100.22", commandFinish);
+// result = siemensNet.Write("DB100.18", commandFinish);
+ result = siemensNet.Write("DB100.22", commandFinish);
}
try {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6bda912..18fbecc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -348,7 +348,7 @@
id: 7
ip: 10.10.10.106
port: 2002
- # 鏉＄爜鎵弿浠�8,104
+ # 鏉＄爜鎵弿浠�8,101
barcode[7]:
id: 8
ip: 10.10.10.107
@@ -358,7 +358,7 @@
id: 9
ip: 10.10.10.108
port: 2002
- # 鏉＄爜鎵弿浠�10,101
+ # 鏉＄爜鎵弿浠�10,104
barcode[9]:
id: 10
ip: 10.10.10.109
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index fd8c8ac..2c3a110 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -607,7 +607,7 @@
// crns[i].bay = 15;
var offSet = 0;
- unit = 60;
+ unit = 11.5;
offSet = 350;
--
Gitblit v1.9.1