From 12f2fd73462da331478fabc7eaa79fc35b1a59b3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 19 七月 2024 16:41:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index 038e89b..d4f84ff 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -100,7 +100,7 @@
and fol.remarks regexp #{finishedOperateLog.remarksr}
</if>
</where>
- order by fol.`status` desc
+ order by fol.operate_time desc
limit #{offset},#{pageSize};
</select>
@@ -159,7 +159,6 @@
</if>
</where>
order by fol.`status` desc
- limit #{offset},#{pageSize};
</select>
<update id="updateToExamine">
@@ -297,8 +296,6 @@
and fol.remarks regexp #{finishedOperateLog.remarksr}
</if>
</where>
- order by fol.`status` desc
- limit #{offset},#{pageSize};
</select>
<select id="getselectAllocateFinishedOperateLog" resultMap="selectFinishedGoodsInventory" >
@@ -404,7 +401,6 @@
and fol.operate_time regexp #{finishedOperateLog.operateTime}
</if>
</where>
- limit #{offset},#{pageSize};
</select>
@@ -545,8 +541,6 @@
and fol.remarks regexp #{finishedOperateLog.remarksr}
</if>
</where>
- order by fol.`status` desc
- limit #{offset},#{pageSize};
</select>
<select id="getselectFinishedOperateLog" >
@@ -648,7 +642,7 @@
)
</insert>
- <select id="exportFinishedOperateLogReport" resultMap="selectFinishedGoodsInventory">
+ <select id="exportFinishedOperateLogReport">
select fol.id,
fol.operation_order_number,
fol.order_id,
@@ -677,5 +671,23 @@
</select>
+ <insert id="insertOrderFinishedOperateLog" useGeneratedKeys="true" >
+ insert into mm.finished_operate_log(operation_order_number,
+ order_id,
+ process_id,
+ operation_number,
+ operate_type,
+ operator,
+ quantity,
+ operate_time,
+ status
+ )
+ values (
+ #{oddNumber} ,#{orderDetail.orderId},"",#{orderDetail.orderNumber},"鍏ュ簱",#{userName},#{orderDetail.quantity},now(),"鏈鏍�"
+ )
+ </insert>
+
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0