From 5c2d7ece5090ed84945e42a1f89af8c279dbcb9a Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 13 八月 2024 18:11:22 +0800
Subject: [PATCH] #标记
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 70 +++++++++++++++++++++++++++++++---
src/main/java/com/zy/core/MainProcess.java | 1
src/main/java/com/zy/core/model/SteSlave.java | 10 +++-
src/main/resources/application.yml | 32 ++++++++++++++++
4 files changed, 103 insertions(+), 10 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 414df90..411e038 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4835,8 +4835,28 @@
if (basJarMastService.selectJarMastOperation(jarSlave.getId(),2)!=0){
break;
}
- if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),3)!=0){
+ BasJar basJar = basJarMapper.selectById(jarSlave.getId());
+ int count = basJarMastService.selectCount(new EntityWrapper<BasJarMast>().eq("jar_regin", basJar.getRegion()).lt("status", 17).gt("status", 11));
+ if (count>0){
break;
+ }
+ if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),3)!=0){
+ if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),3)==7){
+ JarThread jarOtherThread = (JarThread) SlaveConnection.get(SlaveType.Jar, jarSlave.getJarOtherId());
+ JarProtocol jarOtherProtocol = jarOtherThread.getJarProtocol();
+ if (jarOtherProtocol == null) {
+ break;
+ }
+ if (jarOtherProtocol.getJarTemperature()>jarTemperature){
+ log.info("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....鍏堟墽琛屽叆缃愪换鍔★紒锛侊紒",jarOtherProtocol.getJarNo());
+ } else {
+ if (basJarMastService.getJarMastByJarIdCount(jarSlave.getId())>0){
+ log.info("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛屽厛鎵ц浜嗗叆缃愪换鍔★紝鎵ц瀹屾瘯鍐嶈繘琛屽喎鍗达紒锛侊紒",jarOtherProtocol.getJarNo());
+ } else {
+ break;
+ }
+ }
+ }
}
if (basJarMastService.getJarMastByJarIdCount(jarSlave.getId())>=jarMaxLoc*2){
break;
@@ -5310,6 +5330,11 @@
return false;
}
+ int count = basJarMastService.selectCount(new EntityWrapper<BasJarMast>().eq("jar_regin", basJar.getRegion()).lt("status", 17).gt("status", 11));
+ if (count>0){
+ return false;
+ }
+
//闂ㄤ綔涓� 鏃�
//鑷姩銆佺┖闂层�佸彸闂ㄥ叧闂�� Other宸﹂棬鍏抽棴
if (jarProtocol.isAutoing() && jarProtocol.jarErr==0
@@ -5441,11 +5466,11 @@
if (basJarMastList.size() != jarMaxLoc){
return false;
}
- if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=0
- && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=7
- && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=14){
- return false;
- }
+// if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=0
+// && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=7
+// && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=14){
+// return false;
+// }
BasJarMast basJarMastSign = basJarMastList.get(0);
if (Cools.isEmpty(basJarMastSign)){
@@ -8162,7 +8187,38 @@
if(basJarMastList.isEmpty()){
if (wrkMastExecuteService.selectNoStartCharge(steSlave.getId())==0){
if (wrkMastExecuteService.selectMoveStart(steSlave.getId())==0){
- continue;
+ boolean sign = true;
+ for (SteSlave.InStn inStn : steSlave.getSteInStn()){
+ //妫�娴嬬珯鐐圭姸鎬�
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, inStn.getDevpPlcId());
+ StaProtocol staProtocol = devpThread.getStation().get(inStn.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0) {
+ // 鑾峰彇纭寲缃愪俊鎭�
+ JarThread jarThread = (JarThread) SlaveConnection.get(SlaveType.Jar, inStn.getJarNo());
+ JarProtocol jarProtocol = jarThread.getJarProtocol();
+ if (jarProtocol == null) {
+ continue;
+ }
+ if (jarProtocol.modeType != JarModeType.AUTO){
+ continue;
+ }
+ if (jarProtocol.statusType .equals(JarStatusType.SOS)){
+ continue;
+ }
+ if (jarProtocol.getJarTemperature()>jarTemperature){
+ continue;
+ }
+ sign = false;
+ }
+ }
+ if(sign){
+ continue;
+ }
}
}
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 2a490f1..00b4708 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -66,6 +66,7 @@
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(); // 缁勬墭
+// mainService.generateStoreWrkFile464(); // 缁勬墭464
mainService.generateStoreWrkFileSingle(); // 缁勬墭 鍙屽伐浣嶅崟浼� 灏忔枡绠�
mainService.generateStoreWrkFileLarge(); // 缁勬墭 鍙屽伐浣嶅崟浼� 澶ф枡绠�
// mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
diff --git a/src/main/java/com/zy/core/model/SteSlave.java b/src/main/java/com/zy/core/model/SteSlave.java
index f9edd36..f92f86f 100644
--- a/src/main/java/com/zy/core/model/SteSlave.java
+++ b/src/main/java/com/zy/core/model/SteSlave.java
@@ -21,13 +21,13 @@
private Boolean demo;
// 绌挎杞﹀叆搴撶珯鐐�
- private List<CrnStn> steInStn = new ArrayList<>();
+ private List<InStn> steInStn = new ArrayList<>();
// 绌挎杞﹀嚭搴撶珯鐐�
- private List<CrnStn> steOutStn = new ArrayList<>();
+ private List<InStn> steOutStn = new ArrayList<>();
@Data
- public static class CrnStn {
+ public static class InStn {
// 杈撻�佺嚎plc缂栧彿
private Integer devpPlcId;
@@ -35,6 +35,10 @@
// 绌挎杞︾珯鐐圭紪鍙�
private Integer staNo;
+ private Integer rgvNo;
+
+ private Integer jarNo;
+
// 鎺�
private Integer row;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index edbc171..6d129b4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -311,6 +311,10 @@
inSta[1]:
staNo: 453
barcode: ${wcs-slave.barcode[5].id}
+ # 鍏ュ簱鍙�464
+ inSta464[0]:
+ staNo: 464
+ barcode: ${wcs-slave.barcode[6].id}
# 鍏ョ～鍖栫綈RGV
enterRgv[0]:
rgvNo: 623
@@ -666,6 +670,20 @@
port: 502
rack: 0
slot: 0
+ # 鍏ュ簱绔欑偣
+ steInStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 612
+ rgvNo: 623
+ jarNo: 1
+ row: 3
+ # 鍏ュ簱绔欑偣
+ steInStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 615
+ rgvNo: 623
+ jarNo: 2
+ row: 1
# ste2
ste[1]:
id: 2
@@ -673,6 +691,20 @@
port: 502
rack: 0
slot: 0
+ # 鍏ュ簱绔欑偣
+ steInStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 619
+ rgvNo: 624
+ jarNo: 3
+ row: 3
+ # 鍏ュ簱绔欑偣
+ steInStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 622
+ rgvNo: 624
+ jarNo: 4
+ row: 1
# 纾呯Г
scale[0]:
id: 1
--
Gitblit v1.9.1