From 0ffd698f8e3a92e0f82f16ddad90c2c86f16bfdf Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期一, 15 七月 2024 13:29:39 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkDetlMapper.xml | 2 +-
src/main/resources/mapper/WrkDetlLogMapper.xml | 4 ++--
src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java | 2 +-
src/main/java/com/zy/asrs/controller/MobileController.java | 4 ++--
src/main/java/com/zy/asrs/service/WrkDetlLogService.java | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 8eb092a..e8e3056 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -224,7 +224,7 @@
WrkDetl wrkDetl = wrkDetlService.selectWrkDetlByOrderNoNotNull(batch);
// WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
if (Cools.isEmpty(wrkDetl)){
- WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlByOrderNoNotNull(batch);
+ WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlLogByOrderNoNotNull(batch);
// WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
if (Cools.isEmpty(wrkDetlLog)){
return R.error().add("鏈煡鍒版暟鎹�");
@@ -256,7 +256,7 @@
WrkDetl wrkDetl = wrkDetlService.selectWrkDetlByOrderNoNotNull(batch);
if (Cools.isEmpty(wrkDetl)) {
// WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
- WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlByOrderNoNotNull(batch);
+ WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlLogByOrderNoNotNull(batch);
if (Cools.isEmpty(wrkDetlLog)) {
return R.error().add("鏈煡鍒版暟鎹�:宸ヤ綔鏄庣粏涓虹┖");
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
index 6679898..48682e6 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
@@ -42,7 +42,7 @@
@Param("modiTimeStart") Date modiTimeStart,
@Param("modiTimeEnd") Date modiTimeEnd);
- WrkDetlLog selectWrkDetlByOrderNoNotNull(@Param("batch") String batch);
+ WrkDetlLog selectWrkDetlLogByOrderNoNotNull(@Param("batch") String batch);
}
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlLogService.java b/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
index 8416923..af72bb2 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
@@ -15,6 +15,6 @@
Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,Double anfme, Date modiTimeStart, Date modiTimeEnd);
- WrkDetlLog selectWrkDetlByOrderNoNotNull(String batch);
+ WrkDetlLog selectWrkDetlLogByOrderNoNotNull(String batch);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
index c2d3030..cce82a4 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
@@ -29,7 +29,7 @@
}
@Override
- public WrkDetlLog selectWrkDetlByOrderNoNotNull(String batch) {
- return this.baseMapper.selectWrkDetlByOrderNoNotNull(batch);
+ public WrkDetlLog selectWrkDetlLogByOrderNoNotNull(String batch) {
+ return this.baseMapper.selectWrkDetlLogByOrderNoNotNull(batch);
}
}
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index 0169081..1d01920 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -106,11 +106,11 @@
<include refid="batchSeq"></include>
</select>
- <select id="selectWrkDetlByOrderNoNotNull" resultMap="BaseResultMap">
+ <select id="selectWrkDetlLogByOrderNoNotNull" resultMap="BaseResultMap">
select top 1 * from asr_wrk_detl_log
where batch = #{batch}
and order_no is not null
- and order_no != ""
+ and order_no != ''
order by io_time
</select>
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index ac601b6..7f73c7f 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -141,7 +141,7 @@
select top 1 * from asr_wrk_detl
where batch = #{batch}
and order_no is not null
- and order_no != ""
+ and order_no != ''
order by io_time
</select>
--
Gitblit v1.9.1