From e77056ff1b06e9b2512e95d6c3ca9d2fc5dee0b7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 14 十二月 2023 20:35:06 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkDetlLogMapper.xml | 1 +
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/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/service/WrkDetlLogService.java | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
index 5da40b8..539b861 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
@@ -11,6 +11,6 @@
@Repository
public interface WrkDetlLogMapper extends BaseMapper<WrkDetlLog> {
- List<WrkDetlLog> selectLatestByWorkNo(Integer workNo);
+ List<WrkDetlLog> selectLatestByWorkNo(Integer workNo, String barcode);
}
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlLogService.java b/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
index 36a32e5..c964843 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
@@ -7,6 +7,6 @@
public interface WrkDetlLogService extends IService<WrkDetlLog> {
- List<WrkDetlLog> selectLatestByWorkNo(Integer workNo);
+ List<WrkDetlLog> selectLatestByWorkNo(Integer workNo, String barcode);
}
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 ebea0fe..5ea2d08 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2934,7 +2934,7 @@
});
if (wrkDetls.isEmpty()) {//浠庡巻鍙叉。鏌ヨ
- List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectLatestByWorkNo(wrkNo);
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectLatestByWorkNo(wrkNo, barcode);
for (WrkDetlLog wrkDetlLog : wrkDetlLogs) {
ledCommand.getMatDtos().add(new MatDto(wrkDetlLog.getMatnr(), wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), wrkDetlLog.getAnfme(), wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));
}
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 c2cd44b..626e635 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
@@ -12,7 +12,7 @@
public class WrkDetlLogServiceImpl extends ServiceImpl<WrkDetlLogMapper, WrkDetlLog> implements WrkDetlLogService {
@Override
- public List<WrkDetlLog> selectLatestByWorkNo(Integer workNo) {
- return this.baseMapper.selectLatestByWorkNo(workNo);
+ public List<WrkDetlLog> selectLatestByWorkNo(Integer workNo, String barcode) {
+ return this.baseMapper.selectLatestByWorkNo(workNo, barcode);
}
}
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index 63a94b0..12f44aa 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -53,6 +53,7 @@
order by io_time desc) a
where wdl.wrk_no = a.wrk_no
and wdl.io_time = a.io_time
+ and zpallet = #{barcode}
</select>
</mapper>
--
Gitblit v1.9.1