From b6a4013c6a8804fe0dbaab99cf86dfa8e3d55af5 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 16:30:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 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 06e50a0..142f9d5 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -554,7 +554,7 @@
<select id="getmaximum" >
- select count(*) from mm.finished_operate_log where operate_type =#{type} and date(operate_time)=CURDATE()
+ select count(*) from (select * from mm.finished_operate_log where operate_type =#{type} and date(operate_time)=CURDATE() group by operation_order_number) zu
</select>
<insert id="insertIntFinishedOperateLog" useGeneratedKeys="true" >
@@ -689,6 +689,10 @@
)
</insert>
+ <delete id="updateOrderFinishedOperateLog" >
+ update mm.finished_operate_log set status="宸蹭綔搴�" where order_id=#{orderDetail.orderId} and operation_number=#{orderDetail.orderNumber} and operate_type="鍏ュ簱";
+ </delete>
+
--
Gitblit v1.8.0