From 91f2cd5b0f832091f654cce926585d2f05cad114 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 08 四月 2021 23:22:32 +0800
Subject: [PATCH] Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms into master
---
src/main/resources/mapper/LocDetlMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 9548d3b..8b9de7e 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -53,6 +53,9 @@
<if test="supplier!=null and supplier!=null">
and a.supplier like '%' + #{supplier} + '%'
</if>
+ <if test="warehouse!=null and warehouse!=null">
+ and a.warehouse like '%' + #{warehouse} + '%'
+ </if>
</sql>
<select id="getStockOutPage" resultMap="BaseResultMap">
@@ -95,7 +98,7 @@
BEGIN
<foreach collection="list" item="item" index="index">
update dbo.asr_loc_detl
- set mat_status = #{item.matStatusFlag,jdbcType=VARCHAR}
+ set mat_status = #{item.matStatus,jdbcType=VARCHAR}
where 1 = 1
<if test="item.locNo!=null and item.locNo!='' ">
and loc_no = #{item.locNo,jdbcType=VARCHAR}
--
Gitblit v1.9.1