From 3f81b75ec0922df70b8aee69bb6e84468453a1ff Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 26 一月 2024 18:33:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 75 +++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 29 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 5b1ac38a..36228bf 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2304,7 +2304,8 @@
&& rgvProtocol.getStatusType1() == RgvStatusType.IDLE
&& rgvProtocol.getStatusType2() == RgvStatusType.IDLE
&& rgvProtocol.getTaskNo1()==0 && rgvProtocol.getTaskNo2()==0
- && (rgvProtocol.getLoaded2()==2 || rgvProtocol.getLoaded2()==3 ) ////0 鏃犵墿锛�1 涓�灞傛棤鐗╀簩灞傛湁鐗� 锛�2涓�灞傛湁鐗╀簩灞傛棤鐗� 锛堝彧鑳芥弧鏀撅級锛�3 1銆�2灞傞兘鏈夌墿 4锛氾紙锛夊彧鍏佽鎷嗙洏
+// && (rgvProtocol.getLoaded2()==2 || rgvProtocol.getLoaded2()==3 ) ////0 鏃犵墿锛�1 涓�灞傛棤鐗╀簩灞傛湁鐗� 锛�2涓�灞傛湁鐗╀簩灞傛棤鐗� 锛堝彧鑳芥弧鏀撅級锛�3 1銆�2灞傞兘鏈夌墿 4锛氾紙锛夊彧鍏佽鎷嗙洏
+ && rgvProtocol.getLoaded2()==3 ////0 鏃犵墿锛�1 涓�灞傛棤鐗╀簩灞傛湁鐗� 锛�2涓�灞傛湁鐗╀簩灞傛棤鐗� 锛堝彧鑳芥弧鏀撅級锛�3 1銆�2灞傞兘鏈夌墿 4锛氾紙锛夊彧鍏佽鎷嗙洏
) {
try {
WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep3(122);
@@ -3125,8 +3126,7 @@
if (!result) {
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触==>椹卞姩鐮佸灈浣嶆墭鐩樺墠杩涘け璐ワ紒");
}
-// wrkMast.setWrkSts(52L);
- wrkMast.setWrkSts(57L);
+ wrkMast.setWrkSts(52L);
wrkMastMapper.updateById(wrkMast);
Thread.sleep(100);
@@ -3283,8 +3283,20 @@
staProtocol = staProtocol.clone();
}
+ StaProtocol staProtocol147 = devpThread.getStation().get(147);
+ if (staProtocol147 == null) {
+ continue;
+ } else {
+ staProtocol147 = staProtocol147.clone();
+ }
+
if (!staProtocol.isLoading()){
log.info("{}绔欑偣鏃犵墿锛屽紓甯革紒",staNo);
+ continue;
+ }
+
+ if (staProtocol147.isLoading()){
+ log.info("{}绔欑偣鏈夌墿锛�",staProtocol147.getSiteId());
continue;
}
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
@@ -3292,6 +3304,9 @@
&& staProtocol.isLoading()
&& !staProtocol.isEmptyMk()
) {
+
+ boolean result3 = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol147));
+
staProtocol.setWorkNo(wrkMast.getWrkNo());
staProtocol.setStaNo(wrkMast.getStaNo());
devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -3299,8 +3314,12 @@
if (!result) {
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触==>椹卞姩鐮佸灈浣嶆墭鐩樺墠杩涘け璐ワ紒");
}
+
wrkMast.setSheetNo("5");
wrkMastMapper.updateById(wrkMast);
+
+ boolean result4 = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol147));
+
}
}
}catch (Exception e){
@@ -3430,7 +3449,7 @@
continue;
}
WrkMast wrkMast = wrkMastMapper.selectPakInStep3(wrkMastSta.getWrkNo().intValue());
- if (!Cools.isEmpty(wrkMast)){
+ if (!Cools.isEmpty(wrkMast) && wrkMastSta.getWrkType()!=5){
Thread.sleep(200);
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
StaProtocol staProtocol = devpThread.getStation().get(wrkMastSta.getStaEnd());
@@ -3488,7 +3507,7 @@
continue;
}
WrkMast wrkMast = wrkMastMapper.selectPakInStep3(wrkMastSta.getWrkNo().intValue());
- if (!Cools.isEmpty(wrkMast)){
+ if (!Cools.isEmpty(wrkMast) && wrkMastSta.getWrkType()!=5){
Thread.sleep(200);
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
StaProtocol staProtocol = devpThread.getStation().get(wrkMastSta.getStaEnd());
@@ -3590,31 +3609,29 @@
default:
break;
}
- }else {
-
- }
- for (int signCount = 1;!signWork && signCount<7;signCount++){
- switch (signCount){
- case 1://鎵ц灏忚溅璐х墿鎼繍浠诲姟
- signWork = rgvRunWrkMastFullSta();
- break;
- case 2://鏀�//鎷嗙洏
- signWork = rgvRunWrkMastEmptyStaPut();
- break;
- case 3://婊℃斁
- signWork = rgvRunWrkMastEmptyStaPutFull();
- break;
- case 4://鍙栧彔鐩�
- signWork = rgvRunWrkMastEmptyStaTake();
- break;
- case 5:////婊″彇
- signWork = rgvRunWrkMastEmptyStaTakeFull();
- break;
- case 6:////鎻愬崌
+ for (int signCount = 1;!signWork && signCount<7;signCount++){
+ switch (signCount){
+ case 1://鎵ц灏忚溅璐х墿鎼繍浠诲姟
+ signWork = rgvRunWrkMastFullSta();
+ break;
+ case 2://鏀�//鎷嗙洏
+ signWork = rgvRunWrkMastEmptyStaPut();
+ break;
+ case 3://婊℃斁
+ signWork = rgvRunWrkMastEmptyStaPutFull();
+ break;
+ case 4://鍙栧彔鐩�
+ signWork = rgvRunWrkMastEmptyStaTake();
+ break;
+ case 5:////婊″彇
+ signWork = rgvRunWrkMastEmptyStaTakeFull();
+ break;
+ case 6:////鎻愬崌
// signWork = rgvRunWrkMastEmptyStaPut();
- break;
- default:
- break;
+ break;
+ default:
+ break;
+ }
}
}
if (!rgvIoExecuteSign){
--
Gitblit v1.9.1