From cb67fb9d5f84c03bfe9b0e6a250553520729a317 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 15 十二月 2025 15:58:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 3 +
src/main/java/com/zy/asrs/entity/BasArmMast.java | 1
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 60 ++++++++++++++++-------------
src/main/java/com/zy/asrs/entity/param/ArmBarcodeTwoParam.java | 7 +++
4 files changed, 44 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasArmMast.java b/src/main/java/com/zy/asrs/entity/BasArmMast.java
index 4c9cc2d..c4315b1 100644
--- a/src/main/java/com/zy/asrs/entity/BasArmMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasArmMast.java
@@ -159,6 +159,7 @@
this.matnr = param.getItem();
this.po = param.getPo();
this.upc = param.getUpc();
+ this.supplier = param.getSupplier();
this.createTime = snowflakeIdWorker.nextId();
this.bindingTags = snowflakeIdWorker.nextId();
}
diff --git a/src/main/java/com/zy/asrs/entity/param/ArmBarcodeTwoParam.java b/src/main/java/com/zy/asrs/entity/param/ArmBarcodeTwoParam.java
index e8d4cf9..e1bd308 100644
--- a/src/main/java/com/zy/asrs/entity/param/ArmBarcodeTwoParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/ArmBarcodeTwoParam.java
@@ -15,6 +15,7 @@
private String item;
private String sku;
private String upc;
+ private String supplier;
public ArmBarcodeTwoParam() {}
@@ -34,6 +35,9 @@
}
if (barcodes[0].equals("upc")){
this.upc = barcodes[1];
+ }
+ if (barcodes[0].equals("supplier")){
+ this.supplier = barcodes[1];
}
}
}
@@ -69,6 +73,9 @@
if (!basArmMast.getOrderNo().equals(orderNo)){
return false;
}
+ if (!basArmMast.getSupplier().equals(supplier)){
+ return false;
+ }
// if (!basArmMast.getPo().equals(po)){
// return false;
// }
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 71758ef..aada133 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -58,6 +58,8 @@
//澶囨敞
private String memo = "";
+ private String supplier = "";
+
public CombMat() {
}
@@ -69,6 +71,7 @@
this.standby1 = basArmMast.getPo();
this.standby2 = basArmMast.getUpc();
this.standby3 = basArmMast.getSku();
+ this.supplier = basArmMast.getSupplier();
// this.supp = basArmMast.getSupplier();
}
}
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 4e0841a..b94ec5b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4749,20 +4749,26 @@
// 鑾峰彇绔欑偣淇℃伅
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- StaProtocol staProtocol = devpThread.getStation().get(armSta.getStaNo());
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
+ StaProtocol staProtocol = null;
+ String barcode = null;
+ // 鍙互杞璇诲彇锛岀‘淇濇潯鐮佺ǔ瀹氫笉鍙�
+ for(int retry=0; retry<3; retry++){
+ staProtocol = devpThread.getStation().get(armSta.getStaNo());
+ barcode = staProtocol.getBarcode();
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ Thread.sleep(150); // 灏忓欢鏃剁瓑寰匬LC鍒锋柊
}
- String barcode = staProtocol.getBarcode();
if(!Cools.isEmpty(barcode)) {
if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "0".equals(barcode) || barcode.length()<5) {
- armTaskAssignmentCallApiLogSave(staProtocol, "鎵樼洏鏉＄爜涓虹┖", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛�===銆嬫墭鐩樻潯鐮佷负绌�", false);
+ armTaskAssignmentCallApiLogSave(staProtocol, "鎷嗗灈鏉＄爜涓虹┖", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛�===銆嬫墭鐩樻潯鐮佷负绌�", false);
continue;
}
} else {
- armTaskAssignmentCallApiLogSave(staProtocol, "鎵樼洏鏉＄爜涓虹┖", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛�===銆嬫墭鐩樻潯鐮佷负绌�", false);
+ armTaskAssignmentCallApiLogSave(staProtocol, "鎷嗗灈鏉＄爜涓虹┖", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛�===銆嬫墭鐩樻潯鐮佷负绌�", false);
continue;
}
String[] barcodeList = barcode.split(";");
@@ -4792,9 +4798,9 @@
List<BasArm> basArmList = basArmService.selectList(new EntityWrapper<BasArm>().eq("arm_no",armSta.getArmNo()));
boolean sign = true;
for (BasArm basArm : basArmList){
- if (basArm.getStaNo()==2){//NG
- continue;
- }
+// if (basArm.getStaNo()==2){//NG
+// continue;
+// }
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", basArm.getStaNoSou()));
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("D")){
continue;
@@ -4820,22 +4826,22 @@
sign = false;
break;
}
- if (sign){
- for (BasArm basArm : basArmList){
- if (basArm.getStaNo()==2){//NG
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", basArm.getStaNoSou()));
- if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("D")){
- continue;
- }
- BasArmMast basArmMast = new BasArmMast(armBarcodeTwoParam);
- basArmMast.setArmNo(basArm.getArmNo());
- basArmMast.setStaNo(basArm.getStaNoSou());
- basArmMast.setSortingLine(basArm.getSortingLineSou());
- basArmMastService.insert(basArmMast);
- break;
- }
- }
- }
+// if (sign){
+// for (BasArm basArm : basArmList){
+// if (basArm.getStaNo()==2){//NG
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", basArm.getStaNoSou()));
+// if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("D")){
+// continue;
+// }
+// BasArmMast basArmMast = new BasArmMast(armBarcodeTwoParam);
+// basArmMast.setArmNo(basArm.getArmNo());
+// basArmMast.setStaNo(basArm.getStaNoSou());
+// basArmMast.setSortingLine(basArm.getSortingLineSou());
+// basArmMastService.insert(basArmMast);
+// break;
+// }
+// }
+// }
}
}
} catch (Exception e){
--
Gitblit v1.9.1