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/core/thread/SteThread.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 18 +++++++++++++++---
src/main/java/com/zy/core/enums/SteTaskModeType.java | 4 ++--
src/main/java/com/zy/core/enums/SteStatusType.java | 1 +
4 files changed, 20 insertions(+), 7 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())){
diff --git a/src/main/java/com/zy/core/enums/SteStatusType.java b/src/main/java/com/zy/core/enums/SteStatusType.java
index 129e005..f30ae4f 100644
--- a/src/main/java/com/zy/core/enums/SteStatusType.java
+++ b/src/main/java/com/zy/core/enums/SteStatusType.java
@@ -8,6 +8,7 @@
SOS(2, "鍋滄涓�"),
SOS2(3, "鎶ヨ锛氭晠闅滀腑"),
SOS3(4, "澶嶄綅涓�"),
+ CHARGE(5, "鍏呯數涓�"),
WAITING(10, "绛夊緟纭"),
WAITING2(11, "鏈夌墿寰呬綔涓�"),
OTHER(100, "鍏跺畠"),
diff --git a/src/main/java/com/zy/core/enums/SteTaskModeType.java b/src/main/java/com/zy/core/enums/SteTaskModeType.java
index db4eace..5ea9a9e 100644
--- a/src/main/java/com/zy/core/enums/SteTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/SteTaskModeType.java
@@ -29,8 +29,8 @@
STE_WFQH_12(12,"寰�杩斿彇璐�"),
STE_WFFH_13(13,"寰�杩旀斁璐�"),
STE_MOVE_14(14,"绉诲姩"),
- START_CHARGE(16, "寮�濮嬪厖鐢�"), // 寮�濮嬪厖鐢�
- CLOSE_CHARGE(17, "鏂紑鍏呯數"), // 鏂紑鍏呯數
+ START_CHARGE(15, "寮�濮嬪厖鐢�"), // 寮�濮嬪厖鐢�
+ CLOSE_CHARGE(16, "鏂紑鍏呯數"), // 鏂紑鍏呯數
;
public Integer id;
diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index 4b538c2..483c4e7 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -155,8 +155,8 @@
boolean[] status2 = siemensS7Net.getByteTransform().TransBool(result.Content, 27, 1);
- steProtocol.setChargeStatus(status[0]?(short)1:(short)0);
- steProtocol.setTrack(status[1]?(short)1:(short)0);
+ steProtocol.setChargeStatus(status2[0]?(short)1:(short)0);
+ steProtocol.setTrack(status2[1]?(short)1:(short)0);
// steProtocol.setLoad(status2[6]?(short)1:(short)0);
steProtocol.setLoad(status2[7]?(short)1:(short)0);
--
Gitblit v1.9.1