From e9cef6167438763e2ecfd554bb0fc6ed7cb68243 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 15 三月 2023 10:12:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/WrkMastService.java | 2 ++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 7 +------
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 3 +++
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 6bfd8f0..8ac90e4 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -109,5 +109,8 @@
Integer selectExistInEmpty();
+ @Select("select * from where crn_no=#{crnNo} and io_type>=100 order by appe_time")
+ public List<WrkMast> selectWrkIoType(@Param("crnNo") Integer crnNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index 67469f8..3ec7f59 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -15,4 +15,6 @@
int getOutToStn182(Integer devpNo);
+ List<WrkMast> selectWrkIoType(Integer crnNo);
+
}
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 6bee175..bcb4ae6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -966,12 +966,7 @@
public synchronized void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol) {
String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();
//鎸夌収宸ヤ綔妗ｅ嚭搴�
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("crn_no", slave.getId())
- .and()
- .gt("io_type", 100)
- .orderBy("appe_time")
- );
+ List<WrkMast> wrkMasts = wrkMastService.selectWrkIoType(slave.getId());
if (!Cools.isEmpty(wrkMasts)) {
for (WrkMast wrkMast : wrkMasts) {
CrnSlave.CrnStn crnStn = null;
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 8c0b9e9..cfee07c 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -31,4 +31,9 @@
public int getOutToStn182(Integer devpNo) {
return selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devpNo).in("wrk_sts",11,12));
}
+
+ @Override
+ public List<WrkMast> selectWrkIoType(Integer crnNo) {
+ return this.baseMapper.selectWrkIoType(crnNo);
+ }
}
--
Gitblit v1.9.1