From 2d98b2ec8e7f523e2047730534068d4d9b382c60 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 14 七月 2024 21:49:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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..be439a6 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));
@@ -7590,6 +7596,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 +7641,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));
}
@@ -7662,7 +7674,7 @@
continue;
}
WrkMastExecute wrkMastExecuteByCharge = wrkMastExecuteService.getWrkMastExecuteByCharge(steSlave.getId());
- if (!Cools.isEmpty(wrkMastExecuteByCharge)){
+ if (Cools.isEmpty(wrkMastExecuteByCharge)){
continue;
}
@@ -7672,13 +7684,13 @@
continue;
}
}
- } else if (steProtocol.getCharge()>95.0F || steProtocol.getFullCharge()){
+ } else if (steProtocol.getCharge()>97.0F || steProtocol.getFullCharge()){
} else {
continue;
}
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())){
--
Gitblit v1.9.1