From 25c7cdf3ea9c4e63f16bbb52ce40e28bc65dc87c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 13 九月 2025 11:08:50 +0800
Subject: [PATCH] 1

---
 src/main/resources/mapper/OrderDetlMapper.xml |   71 ++++++++++++++++++++++++++++-------
 1 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index dede67e..169eb4d 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -100,19 +100,22 @@
     <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 &lt;= 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
+        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 &lt;= 2
+        and mo.status =
+        case when mo.doc_type = 25 then 0 else 1 end
+        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
@@ -125,6 +128,21 @@
         and mo.status = 1
         and mdt.pakout = 1
         <include refid="pakOutPageCondition"></include>
+    </select>
+    <select id="selectMoveLocDetl" resultMap="BaseResultMap">
+        select
+        md.*
+        from
+        man_order mo
+        left join man_order_detl md on
+        mo.order_no = md.order_no
+        where
+        mo.doc_type = 24
+        and mo.settle &lt;= 2
+        and md.danger = 0
+    </select>
+    <select id="selectDetlList" resultType="java.lang.String">
+        select brand from man_order_detl where order_no = #{orderNo}
     </select>
 
     <update id="increase">
@@ -171,7 +189,7 @@
     </insert>
     <insert id="batchDetls">
         INSERT INTO
-        man_order_detl(brand,batch,order_id,order_no,create_by,create_time,status,qty,anfme)
+        man_order_detl(brand,batch,order_id,order_no,specs,model,be_batch,create_by,create_time,status,qty,anfme,supp,memo)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -179,11 +197,16 @@
             #{item.batch},
             #{item.orderId},
             #{item.orderNo},
+             #{item.specs},
+             #{item.model},
+             #{item.beBatch},
             #{item.createBy},
             #{item.createTime},
             #{item.status},
             #{item.qty},
-            #{item.anfme}
+            #{item.anfme},
+             #{item.supp},
+             #{item.memo}
             )</foreach>
     </insert>
 
@@ -237,5 +260,25 @@
             #{item}
         </foreach>
     </update>
+    <update id="updateOrderDetlStatusByPackageNo">
+        update man_order_detl set inspect = #{status} where brand in
+        <foreach collection="brands" open="(" separator="," close=")" item="item"  index="index">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="selectByBrand" resultMap="BaseResultMap">
+        select *
+        from man_order_detl
+        where brand = #{brand}
+    </select>
+
+    <select id="selectByOrderNoAndPkgGroupNoAndVolumeNo" resultMap="BaseResultMap">
+        select *
+        from man_order_detl
+        where order_no = #{orderNo}
+        and brand = #{brand}
+        and model = #{model}
+    </select>
 
 </mapper>

--
Gitblit v1.9.1