From ab290efb7df666e173fcd88c32f066f333825c5e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 18 十月 2025 08:50:01 +0800
Subject: [PATCH] 联调
---
src/main/resources/mapper/OrderDetlMapper.xml | 73 +++++++++++++++++++++++++++++-------
1 files changed, 59 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index b8e55d7..f7ae4f7 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -46,6 +46,19 @@
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
+ <result column="i_no" property="iNo" />
+ <result column="temp1" property="temp1" />
+ <result column="temp2" property="temp2" />
+ <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" />
+ <result column="ware_mame" property="wareName" />
+ <result column="packing" property="packing" />
+ <result column="det_id" property="detId"/>
</resultMap>
<select id="selectItem" resultMap="BaseResultMap">
@@ -68,9 +81,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">
@@ -143,7 +161,7 @@
<update id="decrease">
update man_order_detl
- set qty = qty - #{qty}
+ set work_qty = work_qty - #{qty}
where 1=1
and order_no = #{orderNo}
and matnr = #{matnr}
@@ -157,6 +175,13 @@
</choose>
</update>
+ <update id="decrease2">
+ update man_order_detl
+ set work_qty = work_qty - #{qty}
+ where 1=1
+ and id = #{id}
+ </update>
+
<update id="modifyStatus">
update man_order_detl
set status = #{status}
@@ -168,20 +193,40 @@
INSERT INTO man_order_detl_log SELECT * FROM man_order_detl WHERE id = #{id}
</insert>
+<!-- <update id="increaseQtyByOrderNo">-->
+<!-- update man_order_detl-->
+<!-- set qty = qty + #{qty}-->
+<!-- where 1=1-->
+<!-- and order_no = #{orderNo}-->
+<!-- and matnr = #{matnr}-->
+<!-- <choose>-->
+<!-- <when test="batch != null and batch != ''">-->
+<!-- and batch = #{batch}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and (batch IS NULL OR batch = '')-->
+<!-- </otherwise>-->
+<!-- </choose>-->
+<!-- </update>-->
+
+ <update id="increaseQtyById">
+ update man_order_detl
+ set qty = qty + #{qty}
+ where 1=1
+ and id = #{id}
+ </update>
+
<update id="increaseWorkQty">
update man_order_detl
set work_qty = work_qty + #{workQty}
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>
+ and id = #{id}
</update>
+
+ <select id="listByOrderNo" resultMap="BaseResultMap">
+ select * from man_order_detl
+ where 1=1
+ and order_no = #{orderNo}
+ </select>
</mapper>
--
Gitblit v1.9.1