From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/resources/mapper/OrderDetlMapper.xml | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 118 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 5d5fa60..b1ffd1a 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -62,6 +62,22 @@
and (batch IS NULL OR batch = '')
</otherwise>
</choose>
+ <choose>
+ <when test="csocode != null and csocode != ''">
+ and three_code = #{csocode}
+ </when>
+ <otherwise>
+ and (three_code IS NULL OR three_code = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="isocode != null and isocode != ''">
+ and dead_time = #{isocode}
+ </when>
+ <otherwise>
+ and (dead_time IS NULL OR dead_time = '')
+ </otherwise>
+ </choose>
</select>
<select id="selectItemByOrderNo" resultMap="BaseResultMap">
@@ -72,6 +88,26 @@
<if test="batch!=null and batch!='' ">
and batch = #{batch}
</if>
+ <if test="csocode!=null and csocode!='' ">
+ and three_code = #{csocode}
+ </if>
+ <if test="isocode!=null and isocode!='' ">
+ and dead_time = #{isocode}
+ </if>
+ </select>
+
+ <select id="selectItemNoneOfBatch" resultMap="BaseResultMap">
+ select top 1 * from man_order_detl
+ where 1=1
+ and order_no = #{orderNo}
+ and matnr = #{matnr}
+ </select>
+
+ <select id="selectItemOfBatch" resultMap="BaseResultMap">
+ select top 1 * from man_order_detl
+ where 1=1
+ and matnr = #{matnr}
+ and batch = #{batch}
</select>
<select id="selectWorkingDetls" resultMap="BaseResultMap">
@@ -83,7 +119,7 @@
<sql id="pakOutPageCondition">
<if test="order_id!=null and order_id!='' ">
- and mod.order_id like '%' + #{order_id} + '%'
+ and mod.order_id = #{order_id}
</if>
<if test="matnr!=null and matnr!='' ">
and mod.matnr like '%' + #{matnr} + '%'
@@ -126,6 +162,38 @@
<include refid="pakOutPageCondition"></include>
</select>
+ <update id="increaseAnfme">
+ update man_order_detl
+ set anfme = anfme + #{qty}
+ where 1=1
+ and order_id = #{orderId}
+ and matnr = #{matnr}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and batch = #{batch}
+ </when>
+ <otherwise>
+ and (batch IS NULL OR batch = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="csocode != null and csocode != ''">
+ and three_code = #{csocode}
+ </when>
+ <otherwise>
+ and (three_code IS NULL OR three_code = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="isocode != null and isocode != ''">
+ and dead_time = #{isocode}
+ </when>
+ <otherwise>
+ and (dead_time IS NULL OR dead_time = '')
+ </otherwise>
+ </choose>
+ </update>
+
<update id="increase">
update man_order_detl
set qty = qty + #{qty}
@@ -138,6 +206,22 @@
</when>
<otherwise>
and (batch IS NULL OR batch = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="csocode != null and csocode != ''">
+ and three_code = #{csocode}
+ </when>
+ <otherwise>
+ and (three_code IS NULL OR three_code = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="isocode != null and isocode != ''">
+ and dead_time = #{isocode}
+ </when>
+ <otherwise>
+ and (dead_time IS NULL OR dead_time = '')
</otherwise>
</choose>
</update>
@@ -156,6 +240,22 @@
and (batch IS NULL OR batch = '')
</otherwise>
</choose>
+ <choose>
+ <when test="csocode != null and csocode != ''">
+ and three_code = #{csocode}
+ </when>
+ <otherwise>
+ and (three_code IS NULL OR three_code = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="isocode != null and isocode != ''">
+ and dead_time = #{isocode}
+ </when>
+ <otherwise>
+ and (dead_time IS NULL OR dead_time = '')
+ </otherwise>
+ </choose>
</update>
<update id="modifyStatus">
@@ -165,4 +265,21 @@
and order_id = #{orderId}
</update>
+ <select id="selectRemainder" resultMap="BaseResultMap">
+ select
+ *
+ from man_order_detl
+ where 1=1
+ and anfme > qty
+ and order_id = #{orderId}
+ </select>
+
+ <select id="selectByMatnr" resultMap="BaseResultMap">
+ select
+ *
+ from man_order_detl
+ where 1=1
+ and matnr = #{matnr}
+ </select>
+
</mapper>
--
Gitblit v1.9.1