From b51eadaa66a5c0ee6da0e418a3ba193dfc878fca Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 13:21:56 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/OrderDetlMapper.xml | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index f57cc3f..29f7523 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -8,11 +8,11 @@
<result column="order_id" property="orderId" />
<result column="order_no" property="orderNo" />
<result column="anfme" property="anfme" />
+ <result column="work_qty" property="workQty" />
<result column="qty" property="qty" />
<result column="matnr" property="matnr" />
<result column="maktx" property="maktx" />
<result column="batch" property="batch" />
-
<result column="specs" property="specs" />
<result column="model" property="model" />
<result column="color" property="color" />
@@ -39,13 +39,16 @@
<result column="source" property="source" />
<result column="inspect" property="inspect" />
<result column="danger" property="danger" />
-
<result column="status" property="status" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
+ <result column="temp1" property="temp1" />
+ <result column="temp2" property="temp2" />
+ <result column="temp3" property="temp3" />
+ <result column="temp4" property="temp4" />
</resultMap>
@@ -69,14 +72,9 @@
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>
+ <if test="batch!=null and batch!='' ">
+ and batch = #{batch}
+ </if>
</select>
<select id="selectWorkingDetls" resultMap="BaseResultMap">
@@ -130,6 +128,23 @@
and mdt.pakout = 1
<include refid="pakOutPageCondition"></include>
</select>
+ <select id="selectPrintData" resultType="com.zy.asrs.entity.param.PrintDataDto">
+ select
+ top 1 md.matnr ,
+ md.maktx ,
+ md.batch ,
+ md.specs ,
+ md.unit ,
+ md.anfme ,
+ md.supp_code as suppCode,
+ md.sku
+ from
+ man_order_detl md
+ inner join man_order mo on
+ md.order_id = mo.id
+ where
+ md.id = #{id}
+ </select>
<update id="increase">
update man_order_detl
@@ -149,7 +164,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}
@@ -170,4 +185,40 @@
and order_id = #{orderId}
</update>
+ <insert id="addToLogTable">
+ 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="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>
+ </update>
+
</mapper>
--
Gitblit v1.9.1