From 290e5fd2e74efe19326f56e38c3391aaae23ffc5 Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期三, 24 十二月 2025 17:14:09 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/resources/mapper/OrderMapper.xml | 67 +++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 9e112d4..270025a 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -39,6 +39,8 @@
<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="pakin_pakout_status" property="pakinPakoutStatus" />
</resultMap>
@@ -62,4 +64,69 @@
order by create_time asc
</select>
+ <select id="selectComplete1" resultMap="BaseResultMap">
+ select top 5 *
+ from man_order
+ where 1=1
+ and settle = 1
+ and status = 1
+ order by create_time asc
+ </select>
+
+ <select id="selectComplete99" resultMap="BaseResultMap">
+ select top 5 *
+ from man_order
+ where 1=1
+ and settle = 99
+ and status = 1
+ 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="selectCompleteCheck" resultType="com.zy.asrs.entity.Order">
+ SELECT TOP
+ 20 *
+ FROM
+ man_check_order
+ WHERE
+ settle = 4
+ AND status = 1
+ AND doc_type = 4
+ </select>
+
</mapper>
--
Gitblit v1.9.1