From bd3b23b214c7090d83c91f9b9a172d4f548033dd Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 27 十月 2025 16:44:45 +0800
Subject: [PATCH] 13
---
src/main/resources/mapper/LocDetlMapper.xml | 86 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 72 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 567f807..ef51f89 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -52,7 +52,6 @@
<result column="temp3" property="temp3" />
<result column="pg_no" property="sPgNO" />
<result column="pro_type" property="proType" />
- <result column="auto_id" property="autoId" />
<result column="out_order_no" property="outOrderNo" />
<result column="lu_hao" property="luHao" />
<result column="ware_id" property="wareId" />
@@ -62,23 +61,68 @@
<sql id="batchSeq">
<choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
+ <when test="locDetl.batch != null and locDetl.batch != ''">
+ and batch = #{locDetl.batch}
</when>
<otherwise>
and (batch IS NULL OR batch = '')
</otherwise>
</choose>
+
+ <choose>
+ <when test="locDetl.proType != null and locDetl.proType != ''">
+ and pro_type = #{locDetl.proType}
+ </when>
+ <otherwise>
+ and (pro_type IS NULL OR pro_type = '')
+ </otherwise>
+ </choose>
+
+ <choose>
+ <when test="locDetl.luHao != null and locDetl.luHao != ''">
+ and lu_hao = #{locDetl.luHao}
+ </when>
+ <otherwise>
+ and (lu_hao IS NULL OR lu_hao = '')
+ </otherwise>
+ </choose>
+
+ <choose>
+ <when test="locDetl.packing != null and locDetl.packing != ''">
+ and packing = #{locDetl.packing}
+ </when>
+ <otherwise>
+ and (packing IS NULL OR packing = '')
+ </otherwise>
+ </choose>
+
+ <choose>
+ <when test="locDetl.sPgNO != null and locDetl.sPgNO != ''">
+ and pg_no = #{locDetl.sPgNO}
+ </when>
+ <otherwise>
+ and (pg_no IS NULL OR pg_no = '')
+ </otherwise>
+ </choose>
+
+ <choose>
+ <when test="locDetl.outOrderNo != null and locDetl.outOrderNo != ''">
+ and out_order_no = #{locDetl.outOrderNo}
+ </when>
+ <otherwise>
+ and (out_order_no IS NULL OR out_order_no = '')
+ </otherwise>
+ </choose>
</sql>
- <select id="selectItem" resultMap="BaseResultMap">
- select top 1 *
- from asr_loc_detl
- where 1=1
- and loc_no = #{locNo}
- and matnr = #{matnr}
- <include refid="batchSeq"></include>
- </select>
+<!-- <select id="selectItem" resultMap="BaseResultMap">-->
+<!-- select top 1 *-->
+<!-- from asr_loc_detl-->
+<!-- where 1=1-->
+<!-- and loc_no = #{locNo}-->
+<!-- and matnr = #{matnr}-->
+<!-- <include refid="batchSeq"></include>-->
+<!-- </select>-->
<select id="selectItem2" resultMap="BaseResultMap">
select top 1 *
@@ -88,11 +132,19 @@
and matnr = #{matnr}
</select>
+ <select id="selectItem3" resultMap="BaseResultMap">
+ select *
+ from asr_loc_detl
+ where 1=1
+ and loc_no = #{locNo}
+ and matnr = #{matnr}
+ </select>
+
<delete id="deleteItem">
delete from asr_loc_detl
where 1=1
and loc_no = #{locNo}
- and matnr = #{matnr}
+ and matnr = #{locDetl.matnr}
<include refid="batchSeq"></include>
</delete>
@@ -102,7 +154,7 @@
, modi_time = getdate()
where 1=1
and loc_no = #{locNo}
- and matnr = #{matnr}
+ and matnr = #{locDetl.matnr}
<include refid="batchSeq"></include>
</update>
@@ -273,7 +325,7 @@
<!-- </if>-->
<if test="matnr != null and matnr != ''">
and a.matnr = #{matnr}
- and (a.pg_no is null or LEN(LTRIM(RTRIM(pg_no))) = 0)
+-- and (a.pg_no is null or LEN(LTRIM(RTRIM(pg_no))) = 0)
</if>
<if test="locNos != null and locNos.size > 0">
@@ -469,6 +521,12 @@
<id column="outOrderNo" property="outOrderNo" />
<id column="batch" property="batch" />
<id column="model" property="model" />
+
+ <id column="luHao" property="luHao" />
+ <id column="packing" property="packing" />
+ <id column="proType" property="proType" />
+ <id column="color" property="color" />
+
</resultMap>
<select id="asrsAndErpList" resultMap="stockStatisDTO">
--
Gitblit v1.9.1