From f9e742b17c47d9f0df3a56caa09f18c8f99aa3f8 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 03 七月 2025 17:44:37 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderDetlMapper.xml | 272 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 256 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 26707d9..3a38e6c 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" />
@@ -37,15 +37,15 @@
<result column="dead_time" property="deadTime" />
<result column="dead_warn" property="deadWarn" />
<result column="source" property="source" />
- <result column="check" property="check" />
+ <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="bom_code" property="bomCode" />
</resultMap>
@@ -69,14 +69,25 @@
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="selectItemByOrderNo2" resultMap="BaseResultMap">
+ select * from man_order_detl
+ where 1=1
+ and order_no = #{orderNo}
+ and matnr = #{matnr}
+ <if test="batch!=null and batch!='' ">
+ and batch = #{batch}
+ </if>
+ <if test="bomCode!=null and bomCode!='' ">
+ and bom_code = #{bomCode}
+ </if>
+ <if test="threeCode!=null and threeCode!='' ">
+ and three_code = #{threeCode}
+ </if>
</select>
<select id="selectWorkingDetls" resultMap="BaseResultMap">
@@ -86,14 +97,89 @@
and qty < anfme
</select>
+ <sql id="pakOutPageCondition">
+ <if test="order_id!=null and order_id!='' ">
+ and mod.order_id like '%' + #{order_id} + '%'
+ </if>
+ <if test="matnr!=null and matnr!='' ">
+ and mod.matnr like '%' + #{matnr} + '%'
+ </if>
+ <if test="maktx!=null and maktx!='' ">
+ and mod.maktx like '%' + #{maktx} + '%'
+ </if>
+ <if test="batch!=null and batch!='' ">
+ and mod.batch like '%' + #{batch} + '%'
+ </if>
+ </sql>
+
+ <select id="getPakoutPage" resultMap="BaseResultMap">
+ select * from
+ (
+ select
+ ROW_NUMBER() over (order by mo.create_time desc) as row,
+ mod.*
+ from man_order_detl mod
+ inner join man_order mo on mod.order_id = mo.id
+ inner join man_doc_type mdt on mo.doc_type = mdt.doc_id
+ where 1=1
+ and mo.settle <= 2
+ and mo.status = 1
+ and mdt.pakout = 1
+ <include refid="pakOutPageCondition"></include>
+ ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ </select>
+
+ <select id="getPakoutPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+ select
+ count(1)
+ from man_order_detl mod
+ inner join man_order mo on mod.order_id = mo.id
+ inner join man_doc_type mdt on mo.doc_type = mdt.doc_id
+ where 1=1
+ and mo.settle <= 2
+ and mo.status = 1
+ and mdt.pakout = 1
+ <include refid="pakOutPageCondition"></include>
+ </select>
+ <select id="checkAllDetlFinish" resultType="java.lang.Integer">
+ SELECT count(*) From man_order_detl WHERE qty < anfme and order_no = #{orderNo}
+ </select>
+ <select id="sameOrderComb" resultType="java.lang.Integer">
+ SELECT SUM(anfme) FROM cust_wait_pakin WHERE 1=1
+ <if test="orderNo!=null and orderNo!='' ">
+ and order_no like '%' + #{orderNo} + '%'
+ </if>
+ and matnr = #{matnr}
+ <choose>
+ <when test="batch != null and batch!='' ">
+ and batch = #{batch}
+ </when>
+ <otherwise>
+ and (batch IS NULL OR batch = '')
+ </otherwise>
+ </choose>
+ </select>
+ <select id="selectCountToAsrByMatnr" resultType="java.lang.Long">
+ SELECT ISNULL(SUM(anfme), 0) FROM asr_loc_detl WHERE matnr = #{matnr}
+ <if test="batch!=null and batch!='' ">
+ and batch = #{batch}
+ </if>
+ </select>
+ <select id="selectCountToManByMatnr" resultType="java.lang.Long">
+ SELECT ISNULL(SUM(anfme), 0) FROM man_loc_detl WHERE matnr = #{matnr}
+ <if test="batch!=null and batch!='' ">
+ and batch = #{batch}
+ </if>
+ </select>
+
<update id="increase">
update man_order_detl
- set qty = qty + #{qty}
+ set work_qty = work_qty + #{qty}
where 1=1
and order_id = #{orderId}
and matnr = #{matnr}
<choose>
- <when test="batch != null and batch != ''">
+ <when test="batch != null and batch!='' ">
and batch = #{batch}
</when>
<otherwise>
@@ -104,7 +190,34 @@
<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}
+ <choose>
+ <when test="batch != null ">
+ and batch = #{batch}
+ </when>
+ <otherwise>
+ and (batch IS NULL )
+ </otherwise>
+ </choose>
+ </update>
+
+ <update id="modifyStatus">
+ update man_order_detl
+ set status = #{status}
+ where 1=1
+ 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}
@@ -118,11 +231,138 @@
</choose>
</update>
- <update id="modifyStatus">
+ <update id="increaseQtyByOrderNo2">
update man_order_detl
- set status = #{status}
+ 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>
+ <choose>
+ <when test="bomCode != null and bomCode != ''">
+ and bom_code = #{bomCode}
+ </when>
+ <otherwise>
+ and (bom_code IS NULL OR bom_code = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="threeCode != null and threeCode != ''">
+ and three_code = #{threeCode}
+ </when>
+ <otherwise>
+ and (three_code IS NULL OR three_code = '')
+ </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>
+
+ <update id="increaseWorkQty2">
+ 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>
+ <choose>
+ <when test="bomCode != null and bomCode != ''">
+ and bom_code = #{bomCode}
+ </when>
+ <otherwise>
+ and (bom_code IS NULL OR bom_code = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="threeCode != null and threeCode != ''">
+ and three_code = #{threeCode}
+ </when>
+ <otherwise>
+ and (three_code IS NULL OR three_code = '')
+ </otherwise>
+ </choose>
+ </update>
+
+ <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>
+ </update>
+
+ <update id="increaseAnfme2">
+ 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>
+ <when test="bumNum != null and bumNum != ''">
+ and bom_code = #{bumNum}
+ </when>
+ <when test="threeCode != null and threeCode != ''">
+ and three_code = #{threeCode}
+ </when>
+ <otherwise>
+ and (batch IS NULL OR batch = '')
+ </otherwise>
+ </choose>
+ </update>
+
+ <update id="increaseWorkQtyByOrderNo">
+ update man_order_detl
+ set work_qty = work_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>
</mapper>
--
Gitblit v1.9.1