From 9c0dbc95b469f9f28184afa83fedaaba7a0b8d49 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 12 三月 2026 13:51:43 +0800
Subject: [PATCH] erp出库作业完善 1.出库任务下发给wcs之前会先卡住，等erp发立即出库时再给wcs下发（补丁，后需要删掉） 2.给wcs自动下发出库任务 3.新增出库任务完成后上报erp接口（三次上报失败后直接转历史档这个地方有点问题）
---
src/main/resources/mapper/OrderMapper.xml | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index c1b06a4..8038400 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>
@@ -58,7 +60,42 @@
from man_order
where 1=1
and settle = 4
+-- and settle = 97
+ and status = 1
+ order by create_time asc
+ </select>
+ <select id="selectComplete10" resultMap="BaseResultMap">
+ select top 5 *
+ from man_order
+ where 1=1
+ and settle = 10
+ and status = 1
+ order by create_time asc
+ </select>
+ <select id="selectComplete9" resultMap="BaseResultMap">
+ select top 5 *
+ from man_order
+ where 1=1
+ and settle = 9
+ and status = 1
+ 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>
@@ -84,4 +121,40 @@
</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="AllStatusSatisfyOrder" resultType="String">
+ select order_no
+ from man_order
+ where move_status = #{moveStatus}
+ </select>
+
+ <update id="updateOrderStatus">
+ update man_order
+ set move_status = 1
+ where 1=1
+ and order_no = #{orderNo}
+ </update>
+
+ <update id="updateOrderStatus4">
+ update man_order
+ set pay_type = null,
+ settle = 4
+ where 1=1
+ and order_no = #{orderNo}
+ </update>
+
</mapper>
--
Gitblit v1.9.1