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 | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 7e84fb4..d74bcb9 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -41,6 +41,11 @@
<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">
@@ -53,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 *
@@ -99,5 +124,17 @@
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