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/OrderMapper.xml |   75 +++++++++++++++++++++++++++++++++++++
 1 files changed, 75 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 9e112d4..d74bcb9 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -39,7 +39,13 @@
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
         <result column="memo" property="memo" />
+        <result column="move_status" property="moveStatus" />
 
+        <result column="temp1" property="temp1" />
+        <result column="temp2" property="temp2" />
+        <result column="temp3" property="temp3" />
+        <result column="ware_id" property="wareId" />
+        <result column="ware_name" property="wareName" />
     </resultMap>
 
     <update id="updateSettle">
@@ -52,6 +58,26 @@
         where 1=1
         and id = #{orderId}
     </update>
+    <update id="updateSettleAndGroupingFlag">
+        update
+            man_order
+        set
+            settle = #{settle},
+            account_day = #{account_day} ,
+            update_time = getdate()
+        where
+            1 = 1
+          and id = #{orderId}
+    </update>
+
+    <select id="selectWork" resultMap="BaseResultMap">
+        select top 5 *
+        from man_order
+        where 1=1
+          and settle = 2
+          and status = 1
+        order by create_time asc
+    </select>
 
     <select id="selectComplete" resultMap="BaseResultMap">
         select top 5 *
@@ -62,4 +88,53 @@
         order by create_time asc
     </select>
 
+    <select id="selectComplete8" resultMap="BaseResultMap">
+        select top 5 *
+        from man_order
+        where 1=1
+        and settle = 8
+        and status = 1
+        order by create_time asc
+    </select>
+
+    <insert id="addToLogTable">
+        INSERT INTO man_order_log SELECT * FROM man_order WHERE id = #{id}
+    </insert>
+
+    <select id="selectorderNoL" resultMap="BaseResultMap">
+        select top 10 *
+        from man_order
+        where 1=1
+        <if test="orderNo != null">
+            and order_no = #{orderNo}
+        </if>
+    </select>
+
+    <select id="selectOrderMoveStatus" resultMap="BaseResultMap">
+        select top 1 *
+        from man_order
+        where 1=1
+        and move_status = 2
+    </select>
+
+    <select id="selectOrderMoveStatusInitial" resultMap="BaseResultMap">
+        select top 1 *
+        from man_order
+        where 1=1
+        and move_status = 1
+        order by update_time
+    </select>
+    <select id="selectNotGroupingList" resultMap="BaseResultMap">
+        select
+            *
+        from
+            man_order mo
+                left join man_doc_type mdt on
+                mo.doc_type = mdt.doc_id
+        where
+            mdt.pakin = 1
+          and mo.account_day = 0
+          and mo.settle = 1
+    </select>
+
 </mapper>

--
Gitblit v1.9.1