From 08cf3dfe654194fd4bc7723762dd91f30756bc20 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 10 一月 2024 12:36:24 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/resources/mapper/wms/WrkDetlMapper.xml | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/WrkDetlMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/WrkDetlMapper.xml
index c2c758a..4896f42 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/WrkDetlMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/WrkDetlMapper.xml
@@ -40,18 +40,18 @@
</update>
<select id="selectAndLogByOrderNo" resultType="com.zy.asrs.common.wms.entity.WrkDetl">
- select awd.*
- from wms_wrk_detl awd
- left join wms_wrk_mast awm on awd.wrk_no = awm.wrk_no and awd.io_time = awm.io_time
+ select wd.*
+ from wms_wrk_detl wd
+ left join wms_wrk_mast wm on wd.wrk_mast_id = wm.id and wd.host_id = wm.host_id
where order_no = #{orderNo}
- and host_id = #{hostId}
+ and wd.host_id = #{hostId}
union
- select distinct awdl.*
- from wms_wrk_detl_log awdl
- left join wms_wrk_mast_log awml on awdl.wrk_no = awml.wrk_no and awdl.io_time = awml.io_time
- where awdl.order_no = #{orderNo}
- and host_id = #{hostId}
- and (awml.manu_type is null or awml.manu_type != '鎵嬪姩鍙栨秷')
+ select distinct wdl.*
+ from wms_wrk_detl_log wdl
+ left join wms_wrk_mast_log wml on wdl.wrk_mast_id = wml.id and wdl.host_id = wml.host_id
+ where wdl.order_no = #{orderNo}
+ and wdl.host_id = #{hostId}
+ and (wml.manu_type is null or wml.manu_type != '鎵嬪姩鍙栨秷')
</select>
<select id="selectPakoutQuery" resultType="com.zy.asrs.common.wms.entity.WrkDetl">
--
Gitblit v1.9.1