From 675ed4fa602e79e220e76fcdbc56e4630c0fb21c Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 17 七月 2024 17:17:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++++++
src/main/resources/mapper/BasJarMastMapper.xml | 14 ++++++++++++++
src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/service/BasJarMastService.java | 2 ++
src/main/java/com/zy/asrs/mapper/BasJarMastMapper.java | 2 ++
5 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/BasJarMastMapper.java b/src/main/java/com/zy/asrs/mapper/BasJarMastMapper.java
index 7696029..65b9ae9 100644
--- a/src/main/java/com/zy/asrs/mapper/BasJarMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasJarMastMapper.java
@@ -21,6 +21,8 @@
List<BasJarMast> getJarMastByJarIdAndStatusListB(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
+ List<BasJarMast> getJarMastByJarIdAndStatusListCharge(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
+
BasJarMast getJarMastByJarIdMax(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
BasJarMast getJarMastByJarIdMaxB(@Param("jarId") Integer jarId,@Param("statusList") List<Integer> statusList);
diff --git a/src/main/java/com/zy/asrs/service/BasJarMastService.java b/src/main/java/com/zy/asrs/service/BasJarMastService.java
index dd00056..ff43bbc 100644
--- a/src/main/java/com/zy/asrs/service/BasJarMastService.java
+++ b/src/main/java/com/zy/asrs/service/BasJarMastService.java
@@ -15,6 +15,8 @@
List<BasJarMast> getJarMastByJarIdAndStatusList(Integer jarId,List<Integer> statusList);
+ List<BasJarMast> getJarMastByJarIdAndStatusListCharge(Integer jarId,List<Integer> statusList);
+
List<BasJarMast> getJarMastByJarIdAndStatusListB(Integer jarId,List<Integer> statusList);
List<BasJarMast> getJarMastByJarIdAndStatusList(Integer jarId,Integer type);
diff --git a/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
index b320e29..451a215 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
@@ -44,6 +44,11 @@
}
@Override
+ public List<BasJarMast> getJarMastByJarIdAndStatusListCharge(Integer jarId,List<Integer> statusList) {
+ return this.baseMapper.getJarMastByJarIdAndStatusListCharge(jarId,statusList);
+ }
+
+ @Override
public List<BasJarMast> getJarMastByJarIdAndStatusList(Integer jarId,Integer type) {
ArrayList<Integer> statusList = new ArrayList<>();
switch (type){
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 d4e0038..f27f5b2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -7842,6 +7842,14 @@
continue;
}
} else if (steProtocol.getCharge()<80.0F){
+ List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusListCharge(steSlave.getId(), new ArrayList<Integer>() {{
+ add(5);
+ add(11);
+ add(16);
+ }});
+ if(!basJarMastList.isEmpty()){
+ continue;
+ }
if (wrkMastExecuteService.selectNoStart(steSlave.getId())!=0){
continue;
}
diff --git a/src/main/resources/mapper/BasJarMastMapper.xml b/src/main/resources/mapper/BasJarMastMapper.xml
index 6b72f0e..d713143 100644
--- a/src/main/resources/mapper/BasJarMastMapper.xml
+++ b/src/main/resources/mapper/BasJarMastMapper.xml
@@ -67,6 +67,20 @@
order by jar_loc_digit desc
</select>
+ <select id="getJarMastByJarIdAndStatusListCharge" resultMap="BaseResultMap">
+ select * from asr_bas_jar_mast
+ where 1=1
+ and
+ (
+ status not in
+ <foreach collection="statusList" item="status" index="index" open="(" close=")" separator=",">
+ #{status}
+ </foreach>
+ )
+ and jar_regin = #{jarId}
+ order by jar_loc_digit desc
+ </select>
+
<select id="getJarMastByJarIdMax" resultMap="BaseResultMap">
select top 1 * from asr_bas_jar_mast
where 1=1
--
Gitblit v1.9.1