From 4d910bae3ebb40e9ab0db6f9addb99636ce8de63 Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期六, 21 九月 2024 08:09:41 +0800 Subject: [PATCH] 1 --- src/main/resources/mapper/OrderDetlMapper.xml | 11 ++++++++--- src/main/resources/mapper/WrkDetlMapper.xml | 1 - src/main/resources/mapper/WrkDetlLogMapper.xml | 1 - 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml index 14f5809..c1224ca 100644 --- a/src/main/resources/mapper/OrderDetlMapper.xml +++ b/src/main/resources/mapper/OrderDetlMapper.xml @@ -80,9 +80,14 @@ where 1=1 and order_no = #{orderNo} and matnr = #{matnr} - <if test="batch!=null and batch!='' "> - and batch = #{batch} - </if> + <choose> + <when test="batch != null and batch != ''"> + and batch = #{batch} + </when> + <otherwise> + and (batch IS NULL OR batch = '') + </otherwise> + </choose> </select> <select id="selectWorkingDetls" resultMap="BaseResultMap"> diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml index 95e96d1..a2a468e 100644 --- a/src/main/resources/mapper/WrkDetlLogMapper.xml +++ b/src/main/resources/mapper/WrkDetlLogMapper.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" /> diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml index 11a4e89..d12a84f 100644 --- a/src/main/resources/mapper/WrkDetlMapper.xml +++ b/src/main/resources/mapper/WrkDetlMapper.xml @@ -53,7 +53,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" /> -- Gitblit v1.9.1