From 23ef469c6bd9a1361743cf2e60066c043ad5fa0c Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期一, 15 七月 2024 08:40:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java | 4 ++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java | 1 +
src/main/java/com/zy/asrs/service/WrkMastExecuteService.java | 2 ++
src/main/resources/mapper/WrkMastExecuteMapper.xml | 7 +++++++
5 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
index 4691ac7..aaf6b64 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
@@ -32,6 +32,7 @@
Integer getWrkMastExecuteByJarIdCount(@Param("jarId") Integer jarId);
Integer selectNoStart(@Param("jarRegin") Integer jarRegin);
+ Integer selectNoStartCharge(@Param("jarRegin") Integer jarRegin);
Integer selectMoveStart(@Param("jarRegin") Integer jarRegin);
diff --git a/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java b/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
index 167ad70..e1656c7 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
@@ -25,6 +25,8 @@
Integer selectNoStart(Integer jarRegin);
+ Integer selectNoStartCharge(Integer jarRegin);
+
Integer selectMoveStart(Integer jarRegin);
Integer selectMoveStartCharge(Integer jarRegin);
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 db7df8d..d3fc512 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -7678,7 +7678,7 @@
if (steProtocol.getCharge()>95.0F || steProtocol.getFullCharge()){
} else if (steProtocol.getCharge()>50.0F){
- if (wrkMastExecuteService.selectNoStart(steSlave.getId())==0){
+ if (wrkMastExecuteService.selectNoStartCharge(steSlave.getId())==0){
if (wrkMastExecuteService.selectMoveStart(steSlave.getId())==0){
continue;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
index 352cd63..15c8f7f 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
@@ -55,6 +55,10 @@
public Integer selectNoStart(Integer jarRegin) {
return this.baseMapper.selectNoStart(jarRegin);
}
+ @Override
+ public Integer selectNoStartCharge(Integer jarRegin) {
+ return this.baseMapper.selectNoStartCharge(jarRegin);
+ }
@Override
public Integer selectMoveStart(Integer jarRegin) {
diff --git a/src/main/resources/mapper/WrkMastExecuteMapper.xml b/src/main/resources/mapper/WrkMastExecuteMapper.xml
index a2c7434..6ccba31 100644
--- a/src/main/resources/mapper/WrkMastExecuteMapper.xml
+++ b/src/main/resources/mapper/WrkMastExecuteMapper.xml
@@ -121,6 +121,13 @@
and jar_regin = #{jarRegin}
and wrk_type != 0
</select>
+ <select id="selectNoStartCharge" resultType="Integer">
+ select count(1) from jar_wrk_mast_execute
+ where 1=1
+ and jar_regin = #{jarRegin}
+ and wrk_type != 0
+ and io_type != 100
+ </select>
<select id="selectMoveStart" resultType="Integer">
select count(1) from jar_wrk_mast_execute
--
Gitblit v1.9.1