From 6cdfae15cde1a3141203c35c5f9835f0d45dbfbb Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 10 三月 2026 08:05:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 35 +++++++++++++++++++++++++++++------
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 6 +-----
2 files changed, 30 insertions(+), 11 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 3951c92..f016435 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3063,6 +3063,8 @@
} else {
staProtocol = staProtocol.clone();
}
+
+
if (staProtocol.isAutoing() //鑷姩
&& !staProtocol.isLoading() //鏃犵墿
// && staProtocol.isOutEnable() //鍙嚭淇″彿
@@ -3825,7 +3827,6 @@
if(rgvProtocol.getStatusType1() == RgvStatusType.WORKING){
rgvThread.setPaking(true);
}
-
if(rgvProtocol.isLoaded1ing() && rgvProtocol.isLoaded2ing()){
basRgv.setPakAll("1");
basRgvService.updateById(basRgv);
@@ -3833,6 +3834,9 @@
if(rgvProtocol.getStatusType1() == RgvStatusType.IDLE &&
rgvProtocol.getModeType() == RgvModeType.AUTO && rgvThread.isPakMk()
&& rgvThread.isPaking() && basRgv.getPakAll().equals("1")){
+ if(rgvProtocol.isLoaded1ing() || rgvProtocol.isLoaded2ing()){
+ continue;
+ }
if(basRgv.getPakOut().equals("1") && basRgv.getPakIn().equals("1")){
rgvPreSchedulingIn(rgv, rgvProtocol);//鑻ユ殏鏃犱笅鍙戜换鍔￠璋冨害鎻愬墠鍒板彇璐х偣
if (rgvProtocol.getLastIo().equals("I")) {
@@ -4574,7 +4578,7 @@
//閬嶅巻rgv鍏ュ簱鍙栬揣绔欑偣
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, rgvStn.getDevpPlcId());
StaProtocol staProtocol = devpThread.getStation().get(rgvStn.getStaNo2()==1043?1044:1103); //鍊掓暟绗簩涓�
- StaProtocol staProtocol2 = null; //杩炵画鍙栬揣浠诲姟绔欑偣
+ StaProtocol staProtocol1 = devpThread.getStation().get(rgvStn.getStaNo()); //绗竴涓珯鐐瑰垽鏂�
RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, (int) rgvProtocol.getRgvNo());
// WrkMastSta wrkMastSta3 = null;//杩炲彇涓や釜
// Integer staNo = null; //涓庤皟搴�
@@ -4610,6 +4614,15 @@
continue;
} else {
staProtocol = staProtocol.clone();
+ }
+ if (staProtocol1 == null) {
+ News.infoNoLog( " - Rgv鍏ュ簱绔欎俊鎭�(staProtocol!=null缁х画鎵ц)锛歴taProtocol=" + staProtocol);
+ continue;
+ } else {
+ staProtocol1 = staProtocol1.clone();
+ }
+ if(staProtocol1.isLoading() || staProtocol1.getWorkNo()!=0){
+ continue;
}
// 鏌ヨ绔欑偣璇︾粏淇℃伅
BasDevp staDetl = basDevpService.selectById(rgvStn.getStaNo());
@@ -4894,10 +4907,16 @@
}
if(!Cools.isEmpty(barcode)) {
if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "0".equals(barcode) || barcode.length()<5) {
+ if(!staProtocol.isLoading()){
+ continue;
+ }
armTaskAssignmentCallApiLogSave(staProtocol, "鎷嗗灈鏉＄爜涓虹┖", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛�===銆嬫墭鐩樻潯鐮佷负绌�", false);
continue;
}
} else {
+ if(!staProtocol.isLoading()){
+ continue;
+ }
armTaskAssignmentCallApiLogSave(staProtocol, "鎷嗗灈鏉＄爜涓虹┖", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛�===銆嬫墭鐩樻潯鐮佷负绌�", false);
continue;
}
@@ -5095,7 +5114,7 @@
}
if(barcode.length()!=6){
- armTaskAssignmentCallApiLogSave(staProtocol, "鏉＄爜闀垮害涓嶆槸6浣�", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛屾潯鐮侀暱搴︿笉鏄�6浣�===>>" + barcode, false);
+ armTaskAssignmentCallApiLogSave(staProtocol, "鏉＄爜闀垮害涓嶆槸6浣�", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛屾潯鐮侀暱搴︿笉鏄�6浣�===>>" + barcode, true);
continue;
}
@@ -5103,7 +5122,7 @@
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",barcode));
int countwait = waitPakinMapper.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",barcode));
if (countLoc > 0 || countWrk > 0 || countwait > 0) {
- armTaskAssignmentCallApiLogSave(staProtocol, "鏉＄爜鏁版嵁宸插瓨鍦�", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛岀粍鎵樻。/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + barcode, false);
+ armTaskAssignmentCallApiLogSave(staProtocol, "鏉＄爜鏁版嵁宸插瓨鍦�", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛岀粍鎵樻。/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + barcode, true);
continue;
}
@@ -5282,7 +5301,7 @@
}
if(barcode.length()!=6){
- armTaskAssignmentCallApiLogSave(locMastEnd, "鏉＄爜闀垮害涓嶆槸6浣�", basArm.getStaNoSou()+"鐮佸灈浣嶇疆锛屾潯鐮侀暱搴︿笉鏄�6浣�===>>" + barcode, false);
+ armTaskAssignmentCallApiLogSave(locMastEnd, "鏉＄爜闀垮害涓嶆槸6浣�", basArm.getStaNoSou()+"鐮佸灈浣嶇疆锛屾潯鐮侀暱搴︿笉鏄�6浣�===>>" + barcode, true);
continue;
}
@@ -5290,7 +5309,7 @@
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",barcode));
int countwait = waitPakinMapper.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",barcode));
if (countLoc > 0 || countWrk > 0 || countwait > 0) {
- armTaskAssignmentCallApiLogSave(locMastEnd, "鏉＄爜鏁版嵁宸插瓨鍦�", basArm.getStaNoSou()+"鐮佸灈浣嶇疆锛岀粍鎵樻。/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + barcode, false);
+ armTaskAssignmentCallApiLogSave(locMastEnd, "鏉＄爜鏁版嵁宸插瓨鍦�", basArm.getStaNoSou()+"鐮佸灈浣嶇疆锛岀粍鎵樻。/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + barcode, true);
continue;
}
@@ -5924,6 +5943,10 @@
// 鑾峰彇绔欑偣淇℃伅
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, basAgvMast.getFloorNo() !=1?2:1);
StaProtocol staProtocol = devpThread.getStation().get(basAgvMast.getStaNo());
+ List<BasAgvMast> basAgvMastList1 = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 1).eq("sta_no", basAgvMast.getStaNo()));
+ if(basAgvMastList1.size()>0){
+ continue;
+ }
if (staProtocol == null) {
continue;
} else {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 50968f0..9c819f5 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -192,7 +192,7 @@
// 鐗规畩绔欑偣闆嗗悎
private static final Set<Integer> specialSites = new HashSet<>(
- Arrays.asList(1001,1005,1008,1011,1015,1019,1022,1025,1029, 1032,1039,2004,2001,2007,2010,2016,2013,2019,2022,2025,2028,4001,4004));
+ Arrays.asList(1001,1005,1008,1011,1015,1019,1022,1025,1029, 1032,1039,2004,2001,2007,2010,2016,2013,2019,2022,2025,2028,2032,4001,4004));
// 鐗规畩绔欑偣闆嗗悎
private static final Set<Integer> specialSites2 = new HashSet<>(
@@ -619,10 +619,6 @@
loading = true;
}
staProtocol.setLoading(loading); // 鏈夌墿
- if(siteId == 2032){
- staProtocol.setLoading(loading); // 鏈夌墿
-
- }
staProtocol.setInEnable(status1[2]); // 鍙叆
staProtocol.setOutEnable(status1[2]);// 鍙嚭
staProtocol.setErr(status1[6]);
--
Gitblit v1.9.1