From 658b3d9b66b11001935317c04521c7a37ce97db1 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期一, 15 七月 2024 10:11:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 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 bb8ab74..d3fc512 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -7460,6 +7460,9 @@
BasJarMast jarMastByWrkNo = new BasJarMast(basJar);
jarMastByWrkNo.setWrkNo(Integer.toUnsignedLong(wrkMastExecute.getWrkNo().intValue()));//宸ヤ綔鍙�
+ jarMastByWrkNo.setJarEnterStaNo(basJar.getEnterRgvNo());
+ jarMastByWrkNo.setEnterStaNo(basJar.getEnterRgvNo());
+ jarMastByWrkNo.setOutStaNo(basJar.getOutRgvNo());
//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));
@@ -7512,6 +7515,9 @@
BasJarMast jarMastByWrkNo = new BasJarMast(basJar);
jarMastByWrkNo.setWrkNo(Integer.toUnsignedLong(wrkMastExecute.getWrkNo().intValue()));//宸ヤ綔鍙�
+ jarMastByWrkNo.setJarEnterStaNo(basJar.getEnterRgvNo());
+ jarMastByWrkNo.setEnterStaNo(basJar.getEnterRgvNo());
+ jarMastByWrkNo.setOutStaNo(basJar.getOutRgvNo());
//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));
@@ -7579,6 +7585,8 @@
if (wrkMastExecuteService.selectMoveStart(steSlave.getId())!=0){
continue;
}
+ } else {
+ continue;
}
try{
@@ -7590,6 +7598,9 @@
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(7));//鍏呯數宸ヤ綔鍙�
BasJarMast basJarMast = new BasJarMast(basJar);
basJarMast.setWrkNo(Integer.toUnsignedLong(workNo));//宸ヤ綔鍙�
+ basJarMast.setJarEnterStaNo(basJar.getEnterRgvNo());
+ basJarMast.setEnterStaNo(basJar.getEnterRgvNo());
+ basJarMast.setOutStaNo(basJar.getOutRgvNo());
if (!jarWrkMastExecuteGenerateExecute(basJar,basJarMast,basJar.getJarNo(),new int[]{basJar.getOutSteNo(),basJar.getOutRgvNo(),100,1})){
log.error("JarWrkMastExecute鍏呯數浠诲姟鍒涘缓===>鎵ц寮傚父===銆嬪紓甯告暟鎹細BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(basJarMast));
}
@@ -7632,6 +7643,9 @@
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(7));//鍏呯數宸ヤ綔鍙�
BasJarMast basJarMast = new BasJarMast(basJar);
basJarMast.setWrkNo(Integer.toUnsignedLong(workNo));//宸ヤ綔鍙�
+ basJarMast.setJarEnterStaNo(basJar.getEnterRgvNo());
+ basJarMast.setEnterStaNo(basJar.getEnterRgvNo());
+ basJarMast.setOutStaNo(basJar.getOutRgvNo());
if (!jarWrkMastExecuteGenerateExecute(basJar,basJarMast,basJar.getJarNo(),new int[]{basJar.getOutSteNo(),basJar.getOutRgvNo(),100,1})){
log.error("JarWrkMastExecute鍏呯數浠诲姟鍒涘缓===>鎵ц寮傚父===銆嬪紓甯告暟鎹細BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(basJarMast));
}
@@ -7661,27 +7675,41 @@
if (steProtocol == null || steProtocol.getChargeStatus()!=1) {
continue;
}
- WrkMastExecute wrkMastExecuteByCharge = wrkMastExecuteService.getWrkMastExecuteByCharge(steSlave.getId());
- if (!Cools.isEmpty(wrkMastExecuteByCharge)){
- continue;
- }
- if (steProtocol.getCharge()>50.0F){
- if (wrkMastExecuteService.selectNoStart(steSlave.getId())==0){
+ if (steProtocol.getCharge()>95.0F || steProtocol.getFullCharge()){
+ } else if (steProtocol.getCharge()>50.0F){
+ if (wrkMastExecuteService.selectNoStartCharge(steSlave.getId())==0){
if (wrkMastExecuteService.selectMoveStart(steSlave.getId())==0){
continue;
}
}
- } else if (steProtocol.getCharge()>95.0F || steProtocol.getFullCharge()){
} else {
continue;
}
+ WrkMastExecute wrkMastExecuteByCharge = wrkMastExecuteService.getWrkMastExecuteByCharge(steSlave.getId());
+ if (Cools.isEmpty(wrkMastExecuteByCharge)){
+ BasJar basJar = basJarMapper.selectById(steSlave.getId()==1? 1:3);
+ int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(7));//鍏呯數宸ヤ綔鍙�
+ BasJarMast basJarMast = new BasJarMast(basJar);
+ basJarMast.setWrkNo(Integer.toUnsignedLong(workNo));//宸ヤ綔鍙�
+ basJarMast.setJarEnterStaNo(basJar.getEnterRgvNo());
+ basJarMast.setEnterStaNo(basJar.getEnterRgvNo());
+ basJarMast.setOutStaNo(basJar.getOutRgvNo());
+ wrkMastExecuteByCharge = new WrkMastExecute(basJarMast);
+ wrkMastExecuteByCharge.setJarId(basJar.getJarNo());
+ wrkMastExecuteByCharge.setSteId(steSlave.getId());//绌挎鏉縄D
+ wrkMastExecuteByCharge.setRgvId(basJar.getEnterRgvNo());//RGV ID enter
+ wrkMastExecuteByCharge.setRgvEndId(basJar.getOutRgvNo());//RGV ID out
+ wrkMastExecuteByCharge.setIoType(100);//浠诲姟绫诲瀷 0: 鏈煡 1: 寮�杩涙枡闂� 2: 鍏宠繘鏂欓棬 3: 寮�鍑烘枡闂� 4: 鍏冲嚭鏂欓棬 5: 鍏ョ～鍖栫綈 6: 鍏ュ喎鍗存Ы 7: 绌挎杞﹁繘鍐峰嵈妲� 8: 绌挎杞︾寮�鍐峰嵈妲� 9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A 100:灏忚溅鍏呯數浠诲姟
+ wrkMastExecuteByCharge.setType(1);//璁惧 0: 鏈煡 1: 纭寲缃� 2: 鍐峰嵈妲� 3: 纭寲缃�==>鍐峰嵈妲�
+ }
+
try{
- if (jarWrkMastExecuteGenerateSteStatusCharge(steSlave.getId(),1,SteStatusType.MOVING,true)){
+ if (jarWrkMastExecuteGenerateSteStatusCharge(steSlave.getId(),1,SteStatusType.CHARGE,true)){
//瀹屾垚鍏呯數浠诲姟
//璋冭溅 == > 鏂紑鍏呯數
- if (!jarSteTake(wrkMastExecuteByCharge,SteLocaType.POINT20.id,SteLocaType.POINT20.id,SteTaskModeType.CLOSE_CHARGE,false,wrkMastExecuteByCharge.getJarId())){
+ if (!jarSteTake(wrkMastExecuteByCharge,SteLocaType.POINT20.id,SteLocaType.POINT20.id,SteTaskModeType.CLOSE_CHARGE,true,wrkMastExecuteByCharge.getJarId())){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触锛宻te鍙�={},浠诲姟鏁版嵁={}",
wrkMastExecuteByCharge.getSteId(), JSON.toJSONString(wrkMastExecuteByCharge));
}
--
Gitblit v1.9.1