From 3a6385e0d275b21f6e70c3588937c5e0972ca029 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 23 八月 2024 15:14:04 +0800
Subject: [PATCH] 捡料出库bug
---
src/main/resources/mapper/WrkDetlMapper.xml | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 0de341d..25f0cd8 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -97,9 +97,24 @@
</update>
<select id="selectAndLogByOrderNo" resultMap="BaseResultMap">
- select * from asr_wrk_detl where order_no = #{orderNo}
- union
- select * from asr_wrk_detl_log where order_no = #{orderNo}
+-- select * from asr_wrk_detl where order_no = #{orderNo}
+-- union
+-- select * from asr_wrk_detl_log where order_no = #{orderNo}
+ SELECT
+ d.*
+ FROM
+ asr_wrk_detl d
+ WHERE
+ order_no = #{orderNo} UNION
+ SELECT
+ d.*
+ FROM
+ asr_wrk_detl_log d
+ JOIN asr_wrk_mast_log m ON d.wrk_no= m.wrk_no
+ WHERE
+ d.order_no = #{orderNo}
+ AND m.io_time= d.io_time
+ AND m.io_type!= 53
</select>
<update id="updateInspect">
--
Gitblit v1.9.1