From 8163e62236bdf7b648e6f330e268aee789eabc6d Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期四, 27 六月 2024 20:55:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 580 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 355 insertions(+), 225 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 3454118..93c9189 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -23,6 +23,7 @@
import com.zy.common.utils.RgvUtils;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
+import com.zy.core.Slave;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.*;
@@ -54,6 +55,8 @@
public class MainServiceImpl {
public static final long COMMAND_TIMEOUT = 5 * 1000;
+// private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{7,4},{8,4},{9,3},{10,4},{11,4}};
+ private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{9,3},{10,4},{11,4}};
@Autowired
private CommonService commonService;
@@ -4544,35 +4547,35 @@
}
/**
- * Jar浠诲姟瀹屾垚 //鏈畬鎴�
+ * Jar浠诲姟瀹屾垚 //瀹屾垚
*/
- public synchronized boolean jarMastGenerateComplete(JarSlave jarSlave) {
+ public synchronized boolean jarMastGenerateComplete() {
try{
- // 鑾峰彇鍫嗗灈鏈轰俊鎭�
- JarThread jarThread = (JarThread) SlaveConnection.get(SlaveType.Jar, jarSlave.getId());
- JarProtocol jarProtocol = jarThread.getJarProtocol();
- if (jarProtocol == null) {
- return false;
- }
- if (jarProtocol.modeType != JarModeType.AUTO){
- return false;
- }
-
- JarThread jarOtherThread = (JarThread) SlaveConnection.get(SlaveType.Jar, jarSlave.getJarOtherId());
- JarProtocol jarOtherProtocol = jarOtherThread.getJarProtocol();
- if (jarOtherProtocol == null) {
- return false;
- }
- if (jarOtherProtocol.modeType != JarModeType.AUTO){
- return false;
- }
-
- //鑷姩銆佺┖闂层�佸彸闂ㄥ叧闂��
- if (jarProtocol.isAutoing() && !jarProtocol.isRightDoor() && jarProtocol.jarErr==0 && !jarOtherProtocol.isLeftDoor() && jarOtherProtocol.jarErr==0){
-
+ for (int[] ex : execute){
+ try{
+ WrkMastExecute wrkMastExecuteSou = new WrkMastExecute();
+ wrkMastExecuteSou.setIoType(ex[0]);
+ wrkMastExecuteSou.setWrkSts(ex[1]);
+ wrkMastExecuteSou.setWrkType(1);
+ List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectWrkMastExecuteByWrk(wrkMastExecuteSou);
+ for (WrkMastExecute wrkMastExecute : wrkMastExecuteList){
+ BasJarMast jarMastByWrkNo = basJarMastService.getJarMastByWrkNo(wrkMastExecute.getWrkNo());
+ jarMastByWrkNo.setStatus(jarMastByWrkNo.getStatusComplete());
+ if (!basJarMastService.updateById(jarMastByWrkNo)){
+ log.error("纭寲鍖哄煙鍒嗘浠诲姟瀹屾垚寮傚父,BasJarMast={},寮傚父淇℃伅={}",JSON.toJSONString(jarMastByWrkNo),"鏇存柊basJarMast澶辫触");
+ }
+ wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsComplete());
+ wrkMastExecute.setWrkType(2);
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
+ log.error("纭寲鍖哄煙鍒嗘浠诲姟瀹屾垚寮傚父,wrkMastExecute={},寮傚父淇℃伅={}",JSON.toJSONString(wrkMastExecute),"鏇存柊wrkMastExecute澶辫触");
+ }
+ }
+ }catch (Exception e){
+ log.error("纭寲鍖哄煙鍒嗘浠诲姟瀹屾垚寮傚父,execute={},寮傚父淇℃伅={}",JSON.toJSONString(ex),e.getMessage());
+ }
}
} catch (Exception e){
-// log.error("鍫嗗灈鏈哄伐浣嶄簩瀹屾垚绛夊緟纭寮傚父,鍫嗗灈鏈哄彿={},寮傚父淇℃伅={},宸ヤ綅鍙�={}",crn.getId(),e.getMessage(),2);
+ log.error("纭寲鍖哄煙鍒嗘浠诲姟瀹屾垚寮傚父,寮傚父淇℃伅={}",e.getMessage());
}
return false;
}
@@ -4594,10 +4597,13 @@
default:
jarWrkMastExecuteGenerateSte(signExecute,sign);//灏忚溅绉诲姩
}
+ if (!signExecute[0] && !signExecute[1]){
+ //Ste绉诲姩
+ jarMastMove();
+ }
} catch (Exception e){
-
+ log.error("纭寲鍖哄煙鍒嗘浠诲姟鍒涘缓寮傚父,寮傚父淇℃伅={}",e.getMessage());
}
-
}
public synchronized boolean[] jarWrkMastExecuteGenerateJar(boolean[] signExecute,Integer sign) {
@@ -4787,10 +4793,10 @@
add(2);
}});
- //鍒ゆ柇灏忚溅鐘舵��
- if (!jarWrkMastExecuteGenerateSteStatus(jarSlave.getJarInSte().get(0).getSteNo(),1,SteStatusType.IDLE)){
- return false;
- }
+// //鍒ゆ柇灏忚溅鐘舵��
+// if (!jarWrkMastExecuteGenerateSteStatus(jarSlave.getJarInSte().get(0).getSteNo(),1,SteStatusType.IDLE)){
+// return false;
+// }
for (BasJarMast basJarMast : basJarMastList){
JarSlave.StaStn staStn = null;
@@ -4899,10 +4905,10 @@
if (Cools.isEmpty(basJarMastSign)){
return false;
}
- //鍒ゆ柇灏忚溅鐘舵��
- if (!jarWrkMastExecuteGenerateSteStatus(jarSlave.getJarInSte().get(0).getSteNo(),1,SteStatusType.IDLE)){
- return false;
- }
+// //鍒ゆ柇灏忚溅鐘舵��
+// if (!jarWrkMastExecuteGenerateSteStatus(jarSlave.getJarInSte().get(0).getSteNo(),1,SteStatusType.IDLE)){
+// return false;
+// }
JarSlave.RgvStn rgvStn = jarSlave.getJarInRgv().get(0);
@@ -4971,10 +4977,10 @@
if (Cools.isEmpty(basJarMastSign)){
return false;
}
- //鍒ゆ柇灏忚溅鐘舵��
- if (!jarWrkMastExecuteGenerateSteStatus(jarSlave.getJarInSte().get(0).getSteNo(),2,SteStatusType.IDLE)){
- return false;
- }
+// //鍒ゆ柇灏忚溅鐘舵��
+// if (!jarWrkMastExecuteGenerateSteStatus(jarSlave.getJarInSte().get(0).getSteNo(),2,SteStatusType.IDLE)){
+// return false;
+// }
//鍒ゆ柇RGV鐘舵��
JarSlave.RgvStn rgvStn = jarSlave.getJarOutRgv().get(0);
@@ -5041,10 +5047,10 @@
if (Cools.isEmpty(jarMastByJarIdMin)){
return false;
}
- //鍒ゆ柇灏忚溅鐘舵��
- if (!jarWrkMastExecuteGenerateSteStatus(jarSlave.getJarOutSte().get(0).getSteNo(),2,SteStatusType.IDLE)){
- return false;
- }
+// //鍒ゆ柇灏忚溅鐘舵��
+// if (!jarWrkMastExecuteGenerateSteStatus(jarSlave.getJarOutSte().get(0).getSteNo(),2,SteStatusType.IDLE)){
+// return false;
+// }
//鍒ゆ柇RGV鐘舵��
JarSlave.RgvStn rgvStn = jarSlave.getJarOutRgv().get(0);
@@ -5263,6 +5269,25 @@
return false;
}
+ /**
+ * JarWrkMastExecute浠诲姟鍒涘缓===>鎵ц //瀹屾垚
+ */
+ public synchronized boolean jarWrkMastExecuteGenerateExecuteMove(BasJar basJar,BasJarMast basJarMast,Integer id,int[] digit) {
+ try {
+ WrkMastExecute wrkMastExecute = new WrkMastExecute(basJarMast);
+ wrkMastExecute.setJarId(id);
+ wrkMastExecute.setSteId(digit[0]);//绌挎鏉縄D
+ wrkMastExecute.setRgvId(basJar.getEnterRgvNo());//RGV ID enter
+ wrkMastExecute.setRgvEndId(basJar.getOutRgvNo());//RGV ID out
+ wrkMastExecute.setIoType(digit[2]);//浠诲姟绫诲瀷 0: 鏈煡 1: 寮�杩涙枡闂� 2: 鍏宠繘鏂欓棬 3: 寮�鍑烘枡闂� 4: 鍏冲嚭鏂欓棬 5: 鍏ョ～鍖栫綈 6: 鍏ュ喎鍗存Ы 7: 绌挎杞﹁繘鍐峰嵈妲� 8: 绌挎杞︾寮�鍐峰嵈妲� 9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A
+ wrkMastExecute.setType(digit[3]);//璁惧 0: 鏈煡 1: 纭寲缃� 2: 鍐峰嵈妲� 3: 纭寲缃�==>鍐峰嵈妲�
+ return wrkMastExecuteService.insert(wrkMastExecute);
+ } catch (Exception e) {
+ log.error("JarWrkMastExecute浠诲姟鍒涘缓===>鎵ц寮傚父===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ }
+ return false;
+ }
+
/*
* JarWrkMastExecute浠诲姟鍒涘缓==>涓嬪彂
* Action
@@ -5295,40 +5320,40 @@
if (jarWrkMastExecuteActionExecute1(wrkMastExecute,sign)){
break;
}
- return;
+ continue;
case 2:
case 4:
if (jarWrkMastExecuteActionExecute2(wrkMastExecute,sign)){
break;
}
- return;
+ continue;
case 5:
if (jarWrkMastExecuteActionExecute5(wrkMastExecute,sign)){
break;
}
- return;
+ continue;
case 6:
if (jarWrkMastExecuteActionExecute6(wrkMastExecute,sign)){
break;
}
- return;
+ continue;
case 7:
case 8:
if (jarWrkMastExecuteActionExecute7(wrkMastExecute,sign)){
break;
}
- return;
+ continue;
case 9:
if (jarWrkMastExecuteActionExecute9(wrkMastExecute,sign)){
break;
}
- return;
+ continue;
case 10:
case 11:
if (jarWrkMastExecuteActionExecute10(wrkMastExecute,sign)){
break;
}
- return;
+ continue;
}
}
} catch (Exception e){
@@ -5496,7 +5521,7 @@
if (staProtocolRGV.rgvBoolean(1) && staProtocolRGVOther.rgvBoolean(1)){
if (staProtocolRGV.getNowRow() != staProtocolRGVOther.getNowRow()){
//绉昏蛋 == > 2
- if (jarRgvMoveTake(wrkMastExecute,2)){
+ if (!jarRgvMoveTake(wrkMastExecute,2)){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -5509,26 +5534,26 @@
if (!jarProtocol.isLeftDoor() && !jarProtocol.isRightDoor()){
if (SteAndJarUtil.steAndJarNowRow(staProtocolRGV.getNowRow() , jarProtocol.getJarNo())){
//绉昏蛋 == > 2
- if (jarRgvMoveTake(wrkMastExecute,2)){
+ if (!jarRgvMoveTake(wrkMastExecute,2)){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(2);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
} else {
//鐩存帴寮�闂�/鍏抽棬
- if (jarDoorTake(wrkMastExecute,JarTaskModeType.OPEN_THE_DOOR)){
+ if (!jarDoorTake(wrkMastExecute,JarTaskModeType.OPEN_THE_DOOR)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(3);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -5537,7 +5562,7 @@
//鐩存帴瀹屾垚
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(4);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -5613,7 +5638,7 @@
if (staProtocolRGV.rgvBoolean(1) && staProtocolRGVOther.rgvBoolean(1)){
if (staProtocolRGV.getNowRow() != staProtocolRGVOther.getNowRow()){
//绉昏蛋 == > 2
- if (jarRgvMoveTake(wrkMastExecute,2)){
+ if (!jarRgvMoveTake(wrkMastExecute,2)){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -5626,27 +5651,27 @@
if (jarProtocol.isLeftDoor() && jarProtocol.isRightDoor()){
if (SteAndJarUtil.steAndJarNowRow(staProtocolRGV.getNowRow() , jarProtocol.getJarNo())){
//绉昏蛋 == > 2
- if (jarRgvMoveTake(wrkMastExecute,2)){
+ if (!jarRgvMoveTake(wrkMastExecute,2)){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(2);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
} else {
//鐩存帴鍏抽棬
- if (jarDoorTake(wrkMastExecute,JarTaskModeType.CLOSE_THE_DOOR)){
+ if (!jarDoorTake(wrkMastExecute,JarTaskModeType.CLOSE_THE_DOOR)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(3);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -5655,7 +5680,7 @@
//鐩存帴瀹屾垚
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(4);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -5701,11 +5726,6 @@
return false;
}
-// //鍒ゆ柇灏忚溅鐘舵��
-// if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),1)){
-// return false;
-// }
-
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
StaProtocol staProtocolRGV = devpThread.getStation().get(basJar.getEnterRgvNo());
if (staProtocolRGV == null) {
@@ -5726,11 +5746,10 @@
if (staProtocolRGVOther == null) {
return false;
}
-
if (staProtocolRGV.rgvBoolean(1) && staProtocolRGVOther.rgvBoolean(1)){
if (staProtocolRGV.getNowRow() != staProtocolRGVOther.getNowRow()){
//绉昏蛋 == > 2
- if (jarRgvMoveTake(wrkMastExecute,2)){
+ if (!jarRgvMoveTake(wrkMastExecute,2)){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -5740,14 +5759,14 @@
//鑷姩銆佺┖闂层�� 杩涙枡浠墦寮�闇�鍏抽棴
if (jarProtocol.isAutoing() && jarProtocol.jarErr==0 && jarProtocol.isLeftDoor() && jarProtocol.isRightDoor()
&& jarProtocol.leftDoorOpen==0 && jarProtocol.leftDoorClose==0 && jarProtocol.rightDoorOpen==0 && jarProtocol.rightDoorClose==0){
-
+ //鍒ゆ柇灏忚溅鐘舵��
+ if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),1,SteStatusType.IDLE)){
+ return false;
+ }
if (SteAndJarUtil.steAndJarNowRow(staProtocolRGV.getNowRow() , jarProtocol.getJarNo())){
- //鍒ゆ柇灏忚溅鐘舵��
- if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),1,SteStatusType.IDLE)){
- return false;
- }
+
//璋冭溅 == > 鍙栬揣
- if (jarRgvGetTake(wrkMastExecute
+ if (!jarRgvGetTake(wrkMastExecute
,SteAndJarUtil.getRgvStaRow(wrkMastExecute.getJarEnterStaNo())==1
,SteAndJarUtil.getRgvStaRow(wrkMastExecute.getJarEnterStaNo())==3)){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
@@ -5756,19 +5775,19 @@
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(3);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
} else {
//璋冭溅 == > endRow
- if (jarRgvMoveTake(wrkMastExecute,SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarId()))){
+ if (!jarRgvMoveTake(wrkMastExecute,SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarId()))){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(2);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -5841,10 +5860,11 @@
return false;
}
- if (staProtocolRGV.rgvBoolean(2) && staProtocolRGVOther.rgvBoolean(1)){
+// if (staProtocolRGV.rgvBoolean(2) && staProtocolRGVOther.rgvBoolean(1)){
+ if (staProtocolRGV.rgvBoolean(2)){
if (staProtocolRGV.getNowRow() != staProtocolRGVOther.getNowRow()){
//绉昏蛋 == > 2
- if (jarRgvMoveTake(wrkMastExecute,2)){
+ if (!jarRgvMoveTake(wrkMastExecute,2)){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -5861,19 +5881,19 @@
return false;
}
//璋冭溅 == > 鍙栬揣
- if (jarSteTake(wrkMastExecute,SteLocaType.POINT20.id,SteLocaType.POINT22.id,SteTaskModeType.STE_WFFH_13,false)){
+ if (!jarSteTake(wrkMastExecute,SteLocaType.POINT20.id,SteLocaType.POINT22.id,SteTaskModeType.STE_WFFH_13,false)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触锛宻te鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(5);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
} else {
//璋冭溅 == > endRow
- if (jarRgvMoveTake(wrkMastExecute,SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarId()))){
+ if (!jarRgvMoveTake(wrkMastExecute,SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarId()))){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -5919,11 +5939,6 @@
return false;
}
-// //鍒ゆ柇灏忚溅鐘舵��
-// if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),1)){
-// return false;
-// }
-
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
StaProtocol staProtocolRGV = devpThread.getStation().get(basJar.getEnterRgvNo());
if (staProtocolRGV == null) {
@@ -5948,7 +5963,7 @@
if (staProtocolRGV.rgvBoolean(1) && staProtocolRGVOther.rgvBoolean(1)){
if (staProtocolRGV.getNowRow() != staProtocolRGVOther.getNowRow()){
//绉昏蛋 == > 2
- if (jarRgvMoveTake(wrkMastExecute,2)){
+ if (!jarRgvMoveTake(wrkMastExecute,2)){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -5958,32 +5973,33 @@
//鑷姩銆佺┖闂层��
if (jarProtocol.isAutoing() && jarProtocol.jarErr==0 && jarProtocol.isLeftDoor() && jarProtocol.isRightDoor()
&& jarProtocol.leftDoorOpen==0 && jarProtocol.leftDoorClose==0 && jarProtocol.rightDoorOpen==0 && jarProtocol.rightDoorClose==0){
+ //鍒ゆ柇灏忚溅鐘舵��
+ if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),1,SteStatusType.IDLE)){
+ return false;
+ }
if (SteAndJarUtil.steAndJarNowRow(staProtocolRGV.getNowRow() , jarProtocol.getJarNo())){
- //鍒ゆ柇灏忚溅鐘舵��
- if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),1,SteStatusType.IDLE)){
- return false;
- }
+
//璋冭溅 == > 鍙栬揣
- if (jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT21.id,SteTaskModeType.STE_WFQH_12,false)){
+ if (!jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT21.id,SteTaskModeType.STE_WFQH_12,false)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触锛宻te鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(3);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
} else {
//璋冭溅 == > endRow
- if (jarRgvMoveTake(wrkMastExecute,SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarId()))){
+ if (!jarRgvMoveTake(wrkMastExecute,SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarId()))){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(2);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -6058,7 +6074,7 @@
if (staProtocolRGV.rgvBoolean(1) && staProtocolRGVOther.rgvBoolean(1)){
if (staProtocolRGV.getNowRow() != staProtocolRGVOther.getNowRow()){
//绉昏蛋 == > 2
- if (jarRgvMoveTake(wrkMastExecute,2)){
+ if (!jarRgvMoveTake(wrkMastExecute,2)){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -6075,25 +6091,25 @@
return false;
}
//璋冭溅 == > 鍙栬揣
- if (jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT21.id,SteTaskModeType.STE_WFQH_12,false)){
+ if (!jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT21.id,SteTaskModeType.STE_WFQH_12,false)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触锛宻te鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(3);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
} else {
//璋冭溅 == > endRow
- if (jarRgvMoveTake(wrkMastExecute,SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarId()))){
+ if (!jarRgvMoveTake(wrkMastExecute,SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarId()))){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(2);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -6113,12 +6129,13 @@
/**
* JarWrkMastExecute浠诲姟==>涓嬪彂 //瀹屾垚
- * 7锛氱┛姊溅杩涘喎鍗存Ы\8锛氱┛姊溅绂诲紑鍐峰嵈妲�
+ * 7锛氱┛姊溅杩涘喎鍗存Ы 7 B=>C
+ * 8锛氱┛姊溅绂诲紑鍐峰嵈妲� 8 C=>B
* 浠诲姟涓嬪彂
*/
public synchronized boolean jarWrkMastExecuteActionExecute7(WrkMastExecute wrkMastExecute,Integer sign) {
try{
- List<WrkMastExecute> wrkMastExecuteByJarNo = wrkMastExecuteService.getWrkMastExecuteByJarNo(wrkMastExecute.getJarId());
+ List<WrkMastExecute> wrkMastExecuteByJarNo = wrkMastExecuteService.selectWrkMastExecuteByWrk(wrkMastExecute);
if (wrkMastExecuteByJarNo.size()!=1 || !wrkMastExecuteByJarNo.get(0).getWrkNo().equals(wrkMastExecute.getWrkNo())){
return false;
}
@@ -6184,7 +6201,7 @@
if (staProtocolRGV.rgvBoolean(1) && staProtocolRGVOther.rgvBoolean(1)){
if (staProtocolRGV.getNowRow() != staProtocolRGVOther.getNowRow()){
//绉昏蛋 == > 2
- if (jarRgvMoveTake(wrkMastExecute,2)){
+ if (!jarRgvMoveTake(wrkMastExecute,2)){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -6199,44 +6216,44 @@
if (SteAndJarUtil.steAndJarNowRow(staProtocolRGV.getNowRow() , jarProtocolOther.getJarNo())){
//鍒ゆ柇灏忚溅鐘舵��
- if (wrkMastExecute.getIoType()==7){
+ if (wrkMastExecute.getIoType()==7){ //7 B=>C
if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE)){
//璋冭溅 == > 绉诲姩
- if (jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT26.id,SteTaskModeType.STE_WFQH_12,false)){
+ if (jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT26.id,SteTaskModeType.STE_MOVE_14,false)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触锛宻te鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(3);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
- } else if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),3,SteStatusType.IDLE)){
+ } else if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),3,SteStatusType.IDLE)){
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(4);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
}
- } else {
- if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),3,SteStatusType.IDLE)){
+ } else { //8 C=>B
+ if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),3,SteStatusType.IDLE)){
//璋冭溅 == > 绉诲姩
- if (jarSteTake(wrkMastExecute,SteLocaType.POINT26.id,SteLocaType.POINT23.id,SteTaskModeType.STE_WFQH_12,false)){
+ if (!jarSteTake(wrkMastExecute,SteLocaType.POINT26.id,SteLocaType.POINT23.id,SteTaskModeType.STE_MOVE_14,false)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触锛宻te鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(3);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
- } else if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE)){
+ } else if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE)){
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(4);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -6245,13 +6262,13 @@
} else {
//璋冭溅 == > endRow
- if (jarRgvMoveTake(wrkMastExecute,SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarId()))){
+ if (!jarRgvMoveTake(wrkMastExecute,SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarId()))){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(2);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -6359,13 +6376,13 @@
//鍒ゆ柇灏忚溅鐘舵��
if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),3,SteStatusType.IDLE)){
//璋冭溅 == > 鍙栬揣
- if (jarSteTake(wrkMastExecute,SteLocaType.POINT26.id,SteLocaType.POINT24.id,SteTaskModeType.STE_WFQH_12,false)){
+ if (!jarSteTake(wrkMastExecute,SteLocaType.POINT26.id,SteLocaType.POINT24.id,SteTaskModeType.STE_WFQH_12,false)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触锛宻te鍙�={},浠诲姟鏁版嵁={},鍐峰嵈妲芥暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(basJar),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(1);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},鍐峰嵈妲芥暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(basJar),sign);
}
@@ -6419,7 +6436,7 @@
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(3);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("杈撻�佺嚎鍑哄簱鐩爣绔欏懡浠や笅鍙戝け璐�===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},鏀捐揣绔欑偣鏁版嵁={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(staProtocol),sign);
}
@@ -6438,7 +6455,7 @@
*/
public synchronized boolean jarWrkMastExecuteActionExecute10(WrkMastExecute wrkMastExecute,Integer sign) {
try{
- List<WrkMastExecute> wrkMastExecuteByJarNo = wrkMastExecuteService.getWrkMastExecuteByJarNo(wrkMastExecute.getJarId());
+ List<WrkMastExecute> wrkMastExecuteByJarNo = wrkMastExecuteService.selectWrkMastExecuteByWrk(wrkMastExecute);
if (wrkMastExecuteByJarNo.size()!=1 || !wrkMastExecuteByJarNo.get(0).getWrkNo().equals(wrkMastExecute.getWrkNo())){
return false;
}
@@ -6488,7 +6505,7 @@
if (staProtocolRGV.rgvBoolean(1) && staProtocolRGVOther.rgvBoolean(1)){
if (staProtocolRGV.getNowRow() != staProtocolRGVOther.getNowRow()){
//绉昏蛋 == > 2
- if (jarRgvMoveTake(wrkMastExecute,2)){
+ if (!jarRgvMoveTake(wrkMastExecute,2)){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -6502,44 +6519,44 @@
if (SteAndJarUtil.steAndJarNowRow(staProtocolRGV.getNowRow() , jarProtocol.getJarNo())){
//鍒ゆ柇灏忚溅鐘舵��
- if (wrkMastExecute.getIoType()==10){
- if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),1,SteStatusType.IDLE)){
+ if (wrkMastExecute.getIoType()==10){//10锛欰=>B
+ if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),1,SteStatusType.IDLE)){
//璋冭溅 == > 绉诲姩
- if (jarSteTake(wrkMastExecute,SteLocaType.POINT20.id,SteLocaType.POINT23.id,SteTaskModeType.STE_WFQH_12,false)){
+ if (!jarSteTake(wrkMastExecute,SteLocaType.POINT20.id,SteLocaType.POINT23.id,SteTaskModeType.STE_MOVE_14,false)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触锛宻te鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(3);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
- } else if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE)){
+ } else if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE)){
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(4);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
}
- } else {
- if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE)){
+ } else {//11:B=>A
+ if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE)){
//璋冭溅 == > 绉诲姩
- if (jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT20.id,SteTaskModeType.STE_WFQH_12,false)){
+ if (!jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT20.id,SteTaskModeType.STE_MOVE_14,false)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触锛宻te鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(3);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
- } else if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),1,SteStatusType.IDLE)){
+ } else if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),1,SteStatusType.IDLE)){
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(4);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -6548,13 +6565,13 @@
} else {
//璋冭溅 == > endRow
- if (jarRgvMoveTake(wrkMastExecute,SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarId()))){
+ if (!jarRgvMoveTake(wrkMastExecute,SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarId()))){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkType(1);
wrkMastExecute.setWrkSts(2);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -6639,11 +6656,15 @@
public synchronized boolean jarSteTake(WrkMastExecute wrkMastExecute,Integer startLoad,Integer endLoad,SteTaskModeType steTaskModeType,boolean complete){
try {
SteCommand steCommand = new SteCommand();
+ steCommand.setTaskNo(wrkMastExecute.getWrkNo().intValue());
steCommand.setSteNo(wrkMastExecute.getSteId());
steCommand.setStartLoad(startLoad);
steCommand.setEndLoad(endLoad);
steCommand.setTaskModeType(steTaskModeType);
steCommand.setComplete(complete);
+ if (!complete){
+ steCommand.setTaskMode(steTaskModeType.id.shortValue());
+ }
steCommand.setJarNo(wrkMastExecute.getJarId().shortValue());
if (!MessageQueue.offer(SlaveType.Ste, steCommand.getSteNo(), new Task(2, steCommand))) {
log.error("绌挎杞te鍛戒护涓嬪彂澶辫触锛屽爢鍨涙満鍙�={},浠诲姟鏁版嵁={},涓嬪彂鏁版嵁={},complete={}", steCommand.getSteNo(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steCommand),complete);
@@ -6676,7 +6697,7 @@
}
/**
- * JarWrkMastExecute浠诲姟瀹屾垚 //鏈畬鎴�
+ * JarWrkMastExecute浠诲姟瀹屾垚 //瀹屾垚
*/
public synchronized void jarWrkMastExecuteGenerateComplete(Integer sign) {
try{
@@ -6728,96 +6749,98 @@
continue;
}
if (steProtocol.getMode()==(short)1 && steProtocol.taskNo!=0 && steProtocol.getChargeStatus()==0){
- if (steProtocol.statusType.equals(SteStatusType.WAITING)){
-
- }
- WrkMastExecute wrkMastExecute = wrkMastExecuteService.getWrkMastExecuteByWrkNo(steProtocol.getTaskNo().longValue());
- if (!Cools.isEmpty(wrkMastExecute)){
- switch (wrkMastExecute.getIoType()){
- case 6:
- if (wrkMastExecute.getWrkSts()==3){//==>4
- //1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堝彇璐с��4锛氬彇璐у畬鎴愮瓑寰呬笅涓�姝ャ��5锛歋te绌挎鐗堟斁璐ц嚦鍐峰嵈姹犮��6锛氭斁璐у畬鎴愩��7锛氭洿鏂板畬鎴� //io_type = 6
- //ste浠诲姟绛夊緟瀹屾垚
- if (steProtocol.statusType.equals(SteStatusType.WAITING2)){
- //ste浠诲姟瀹屾垚
- if (jarSteTake(wrkMastExecute,null,null,null,true)){
- wrkMastExecute.setWrkSts(4);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
- log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
- wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
- }
- }
- }
- log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>涓嬪彂寮傚父锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
- wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
- return true;
- }
- case 5:
- if (wrkMastExecute.getWrkSts()==5){
- //1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歳gv鍙栬揣銆�4锛歳gv鍙栬揣瀹屾垚銆�5锛歋te绌挎鐗堝叆纭寲缃愩��6锛氬叆缃愬畬鎴愩��7锛氭洿鏂板畬鎴� //io_type = 5
- //ste浠诲姟瀹屾垚
+// if (steProtocol.statusType.equals(SteStatusType.WAITING)){
+//
+// }
+ List<WrkMastExecute> wrkMastExecuteByWrkNoList = wrkMastExecuteService.getWrkMastExecuteByWrkNoList(steProtocol.getTaskNo().longValue());
+ for (WrkMastExecute wrkMastExecute : wrkMastExecuteByWrkNoList){
+ if (!Cools.isEmpty(wrkMastExecute)){
+ switch (wrkMastExecute.getIoType()){
+ case 6:
if (wrkMastExecute.getWrkSts()==3){//==>4
//1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堝彇璐с��4锛氬彇璐у畬鎴愮瓑寰呬笅涓�姝ャ��5锛歋te绌挎鐗堟斁璐ц嚦鍐峰嵈姹犮��6锛氭斁璐у畬鎴愩��7锛氭洿鏂板畬鎴� //io_type = 6
//ste浠诲姟绛夊緟瀹屾垚
- if (steProtocol.statusType.equals(SteStatusType.WAITING)){
+ if (steProtocol.statusType.equals(SteStatusType.WAITING2)){
//ste浠诲姟瀹屾垚
if (jarSteTake(wrkMastExecute,null,null,null,true)){
- wrkMastExecute.setWrkSts(6);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ wrkMastExecute.setWrkSts(4);
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
}
+ return true;
}
}
log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>涓嬪彂寮傚父锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
return true;
}
- return true;
- }
- return false;
- case 7:
- case 8:
- case 10:
- case 11:
- //1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堢Щ鍔ㄤ腑銆�4锛氱Щ鍔ㄥ畬鎴愩��5锛氭洿鏂板畬鎴�
- if (wrkMastExecute.getWrkSts()==3){
- //ste浠诲姟瀹屾垚
- if (steProtocol.statusType.equals(SteStatusType.WAITING)){
+ case 5:
+ if (wrkMastExecute.getWrkSts()==5){
+ //1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歳gv鍙栬揣銆�4锛歳gv鍙栬揣瀹屾垚銆�5锛歋te绌挎鐗堝叆纭寲缃愩��6锛氬叆缃愬畬鎴愩��7锛氭洿鏂板畬鎴� //io_type = 5
//ste浠诲姟瀹屾垚
- if (jarSteTake(wrkMastExecute,null,null,null,true)){
- wrkMastExecute.setWrkSts(4);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
- log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
- wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+ if (steProtocol.statusType.equals(SteStatusType.WAITING)){
+ //ste浠诲姟瀹屾垚
+ if (jarSteTake(wrkMastExecute,null,null,null,true)){
+ wrkMastExecute.setWrkSts(6);
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
+ log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
+ wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+ }
+ return true;
}
}
+ log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>涓嬪彂寮傚父锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
+ wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+ return true;
}
- log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>涓嬪彂寮傚父锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
- wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
- return true;
- }
- return false;
- case 9:
- if (wrkMastExecute.getWrkSts()==1){
- //1锛歋te绌挎鐗堝彇鏀捐揣涓��2锛氭斁璐у畬鎴愮瓑寰呬笅涓�姝ャ��3锛氳緭閫佺嚎浠诲姟涓嬪彂瀹屾垚銆�4锛氭洿鏂板畬鎴� //io_type = 9
- //ste浠诲姟瀹屾垚
- if (steProtocol.statusType.equals(SteStatusType.WAITING)){
+ continue;
+ case 7:
+ case 8:
+ case 10:
+ case 11:
+ //1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堢Щ鍔ㄤ腑銆�4锛氱Щ鍔ㄥ畬鎴愩��5锛氭洿鏂板畬鎴�
+ if (wrkMastExecute.getWrkSts()==3){
//ste浠诲姟瀹屾垚
- if (jarSteTake(wrkMastExecute,null,null,null,true)){
- wrkMastExecute.setWrkSts(2);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
- log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
- wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+ if (steProtocol.statusType.equals(SteStatusType.WAITING)){
+ //ste浠诲姟瀹屾垚
+ if (jarSteTake(wrkMastExecute,null,null,null,true)){
+ wrkMastExecute.setWrkSts(4);
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
+ log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
+ wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+ }
+ return true;
}
}
+ log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>涓嬪彂寮傚父锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
+ wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+ return true;
}
- log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>涓嬪彂寮傚父锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
- wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
- return true;
- }
- default: return false;
+ continue;
+ case 9:
+ if (wrkMastExecute.getWrkSts()==1){
+ //1锛歋te绌挎鐗堝彇鏀捐揣涓��2锛氭斁璐у畬鎴愮瓑寰呬笅涓�姝ャ��3锛氳緭閫佺嚎浠诲姟涓嬪彂瀹屾垚銆�4锛氭洿鏂板畬鎴� //io_type = 9
+ //ste浠诲姟瀹屾垚
+ if (steProtocol.statusType.equals(SteStatusType.WAITING)){
+ //ste浠诲姟瀹屾垚
+ if (jarSteTake(wrkMastExecute,null,null,null,true)){
+ wrkMastExecute.setWrkSts(2);
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
+ log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
+ wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+ }
+ return true;
+ }
+ }
+ log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>涓嬪彂寮傚父锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
+ wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+ continue;
+ }
+ default: continue;
+ }
}
+
}
}
}
@@ -6879,7 +6902,7 @@
WrkMastExecute execute = new WrkMastExecute();
execute.setJarId(jarProtocol.getJarNo());
//鐩存帴鍏抽棬
- if (jarDoorTake(execute,JarTaskModeType.OPEN_THE_DOOR_COMPLETE)){
+ if (!jarDoorTake(execute,JarTaskModeType.OPEN_THE_DOOR_COMPLETE)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
execute.getJarId(), JSON.toJSON(execute), JSON.toJSON(jarProtocol),sign);
}
@@ -6888,12 +6911,12 @@
for (WrkMastExecute wrkMastExecute : wrkMastExecuteList){
if (wrkMastExecute.getIoType() == 1 || wrkMastExecute.getIoType() == 3){
//鐩存帴鍏抽棬
- if (jarDoorTake(wrkMastExecute,JarTaskModeType.OPEN_THE_DOOR_COMPLETE)){
+ if (!jarDoorTake(wrkMastExecute,JarTaskModeType.OPEN_THE_DOOR_COMPLETE)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkSts(4);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("骞宠 杞gv鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
return false;
@@ -6913,7 +6936,7 @@
WrkMastExecute execute = new WrkMastExecute();
execute.setJarId(jarProtocol.getJarNo());
//鐩存帴鍏抽棬
- if (jarDoorTake(execute,JarTaskModeType.CLOSE_THE_DOOR_COMPLETE)){
+ if (!jarDoorTake(execute,JarTaskModeType.CLOSE_THE_DOOR_COMPLETE)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
execute.getJarId(), JSON.toJSON(execute), JSON.toJSON(jarProtocol),sign);
}
@@ -6922,12 +6945,12 @@
for (WrkMastExecute wrkMastExecute : wrkMastExecuteList){
if (wrkMastExecute.getIoType() == 2 || wrkMastExecute.getIoType() == 4){
//鐩存帴鍏抽棬
- if (jarDoorTake(wrkMastExecute,JarTaskModeType.CLOSE_THE_DOOR_COMPLETE)){
+ if (!jarDoorTake(wrkMastExecute,JarTaskModeType.CLOSE_THE_DOOR_COMPLETE)){
log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
wrkMastExecute.setWrkSts(4);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("骞宠 杞gv鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
return false;
@@ -6979,7 +7002,7 @@
if (staProtocolRGV.getNowRow() == staProtocolRGVEnd.getNowRow()
&& staProtocolRGV.getNowRow() == SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarId())){
wrkMastExecute.setWrkSts(2);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("骞宠 杞gv鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},骞宠 杞gv鏁版嵁={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(staProtocolRGV),sign);
return false;
@@ -7015,28 +7038,20 @@
continue;
}
- StaProtocol staProtocolRGVEnd = devpThread.getStation().get(wrkMastExecute.getRgvEndId());
- if (staProtocolRGVEnd == null) {
- continue;
- } else {
- staProtocolRGVEnd = staProtocolRGVEnd.clone();
- }
- if (staProtocolRGVEnd == null) {
- continue;
- }
- if (staProtocolRGV.getNowRow() == staProtocolRGVEnd.getNowRow()
+
+ if ( staProtocolRGV.rgvBoolean(2)
&& staProtocolRGV.getNowRow() == SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarId())){
//璋冭溅 == > 鍙栬揣瀹屾垚澶嶄綅
if (!jarRgvGetFuTake(wrkMastExecute,true)){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(staProtocolRGV),sign);
- return false;
+ return true;
}
wrkMastExecute.setWrkSts(4);
- if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ if (!wrkMastExecuteService.updateById(wrkMastExecute)){
log.error("骞宠 杞gv鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},骞宠 杞gv鏁版嵁={},sign={}",
wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(staProtocolRGV),sign);
- return false;
+ return true;
}
return true;
}
@@ -7048,4 +7063,119 @@
return false;
}
+ /**
+ * Jar浠诲姟 绌挎杞︾Щ鍔ㄤ换鍔� //瀹屾垚
+ */
+ public synchronized boolean jarMastMove() {
+ try{
+ for (SteSlave steSlave : slaveProperties.getSte()){
+ SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steSlave.getId());
+ if (steThread == null) {
+ continue;
+ }
+ SteProtocol steProtocol = steThread.getSteProtocol();
+ if (steProtocol == null) {
+ continue;
+ }
+
+ if (wrkMastExecuteService.selectNoStart(steSlave.getId())!=0){
+ continue;
+ }
+
+ if (wrkMastExecuteService.selectMoveStart(steSlave.getId())!=0){
+ continue;
+ }
+
+ try{
+ if (jarWrkMastExecuteGenerateSteStatus(steSlave.getId(),1,SteStatusType.IDLE)){
+ List<WrkMastExecute> wrkMastExecutes = wrkMastExecuteService.selectWrkMastExecuteByTypeAndIoTyperAndWrkType(null, 5, null);
+ if (wrkMastExecutes.isEmpty()){
+ List<WrkMastExecute> wrkMastExecutesB = wrkMastExecuteService.selectWrkMastExecuteByTypeAndIoTyperAndWrkType(null, 6, null);
+ List<WrkMastExecute> wrkMastExecutesC = wrkMastExecuteService.selectWrkMastExecuteByTypeAndIoTyperAndWrkType(null, 9, null);
+
+ if (!wrkMastExecutesB.isEmpty() || !wrkMastExecutesC.isEmpty()){
+ WrkMastExecute wrkMastExecute = !wrkMastExecutesB.isEmpty() ? wrkMastExecutesB.get(0) : wrkMastExecutesC.get(0);
+ BasJar basJar = basJarMapper.selectById(wrkMastExecute.getJarId());
+ if (Cools.isEmpty(basJar)){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",wrkMastExecute.getJarId());
+ return false;
+ }
+ BasJarMast jarMastByWrkNo = basJarMastService.getJarMastByWrkNo(wrkMastExecute.getWrkNo());
+ //A==>B
+ if (!jarWrkMastExecuteGenerateExecute(basJar,jarMastByWrkNo,basJar.getJarNo(),new int[]{basJar.getOutSteNo(),basJar.getOutRgvNo(),10,1})){
+ log.error("JarWrkMastExecute浠诲姟鍒涘缓===>鎵ц寮傚父===銆嬪紓甯告暟鎹細BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(jarMastByWrkNo));
+ }
+ continue;
+ }
+ }
+ } else if (jarWrkMastExecuteGenerateSteStatus(steSlave.getId(),2,SteStatusType.IDLE)){
+ List<WrkMastExecute> wrkMastExecutes = wrkMastExecuteService.selectWrkMastExecuteByTypeAndIoTyperAndWrkType(null, 6, null);
+ if (wrkMastExecutes.isEmpty()){
+ List<WrkMastExecute> wrkMastExecutesA = wrkMastExecuteService.selectWrkMastExecuteByTypeAndIoTyperAndWrkType(null, 5, null);
+ List<WrkMastExecute> wrkMastExecutesC = wrkMastExecuteService.selectWrkMastExecuteByTypeAndIoTyperAndWrkType(null, 9, null);
+ if (!wrkMastExecutesA.isEmpty()){
+ WrkMastExecute wrkMastExecute = wrkMastExecutesA.get(0);
+ BasJar basJar = basJarMapper.selectById(wrkMastExecute.getJarId());
+ if (Cools.isEmpty(basJar)){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",wrkMastExecute.getJarId());
+ return false;
+ }
+ BasJarMast jarMastByWrkNo = basJarMastService.getJarMastByWrkNo(wrkMastExecute.getWrkNo());
+ //B==>A
+ if (!jarWrkMastExecuteGenerateExecute(basJar,jarMastByWrkNo,basJar.getJarNo(),new int[]{basJar.getOutSteNo(),basJar.getOutRgvNo(),11,1})){
+ log.error("JarWrkMastExecute浠诲姟鍒涘缓===>鎵ц寮傚父===銆嬪紓甯告暟鎹細BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(jarMastByWrkNo));
+ }
+ continue;
+ }
+
+ if (!wrkMastExecutesC.isEmpty()){
+ WrkMastExecute wrkMastExecute = wrkMastExecutesC.get(0);
+ BasJar basJar = basJarMapper.selectById(wrkMastExecute.getJarId());
+ if (Cools.isEmpty(basJar)){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",wrkMastExecute.getJarId());
+ return false;
+ }
+ BasJarMast jarMastByWrkNo = basJarMastService.getJarMastByWrkNo(wrkMastExecute.getWrkNo());
+ //B==>C
+ if (!jarWrkMastExecuteGenerateExecute(basJar,jarMastByWrkNo,basJar.getJarNo(),new int[]{basJar.getOutSteNo(),basJar.getOutRgvNo(),7,1})){
+ log.error("JarWrkMastExecute浠诲姟鍒涘缓===>鎵ц寮傚父===銆嬪紓甯告暟鎹細BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(jarMastByWrkNo));
+ }
+ continue;
+ }
+ }
+ } else if (jarWrkMastExecuteGenerateSteStatus(steSlave.getId(),3,SteStatusType.IDLE)){
+ List<WrkMastExecute> wrkMastExecutes = wrkMastExecuteService.selectWrkMastExecuteByTypeAndIoTyperAndWrkType(null, 9, null);
+ if (wrkMastExecutes.isEmpty()){
+ List<WrkMastExecute> wrkMastExecutesB = wrkMastExecuteService.selectWrkMastExecuteByTypeAndIoTyperAndWrkType(null, 9, null);
+ List<WrkMastExecute> wrkMastExecutesA = wrkMastExecuteService.selectWrkMastExecuteByTypeAndIoTyperAndWrkType(null, 6, null);
+ if (!wrkMastExecutesB.isEmpty() || !wrkMastExecutesA.isEmpty()){
+ WrkMastExecute wrkMastExecute = !wrkMastExecutesB.isEmpty() ? wrkMastExecutesB.get(0) : wrkMastExecutesA.get(0);
+ BasJar basJar = basJarMapper.selectById(wrkMastExecute.getJarId());
+ if (Cools.isEmpty(basJar)){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",wrkMastExecute.getJarId());
+ return false;
+ }
+ BasJarMast jarMastByWrkNo = basJarMastService.getJarMastByWrkNo(wrkMastExecute.getWrkNo());
+ //C==>B
+ if (!jarWrkMastExecuteGenerateExecute(basJar,jarMastByWrkNo,basJar.getJarNo(),new int[]{basJar.getOutSteNo(),basJar.getOutRgvNo(),8,1})){
+ log.error("JarWrkMastExecute浠诲姟鍒涘缓===>鎵ц寮傚父===銆嬪紓甯告暟鎹細BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(jarMastByWrkNo));
+ }
+ continue;
+ }
+ }
+ }
+ }catch (Exception e){
+ log.error("纭寲鍖哄煙鍒嗘浠诲姟瀹屾垚寮傚父,steProtocol={},寮傚父淇℃伅={}",JSON.toJSONString(steProtocol),e.getMessage());
+ }
+
+ WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectStart(steSlave.getId());
+
+
+ }
+ } catch (Exception e){
+ log.error("纭寲鍖哄煙鍒嗘浠诲姟瀹屾垚寮傚父,寮傚父淇℃伅={}",e.getMessage());
+ }
+ return false;
+ }
+
}
--
Gitblit v1.9.1