From b13c552870d145f287dfd93a502e91cf9efc8ec3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 13 三月 2024 10:05:37 +0800
Subject: [PATCH] 修改界面中英文

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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 2e3abf2..63f8df2 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -32,8 +32,13 @@
         update mm.finished_operate_log set reviewed=#{userName},reviewed_time=now(),status=#{type} where operation_order_number=#{finishedOperateLog.operationOrderNumber};
     </update>
 
+    <update id="updateFinishedOperateLogState">
+        update mm.finished_operate_log set status=#{type} where id=#{finishedOperateLog.id};
+    </update>
+
     <select id="getSelectOperateRecord" resultMap="selectFinishedGoodsInventory">
-        select fol.operation_order_number,
+        select fol.id,
+               fol.operation_order_number,
                fol.order_id,
                fol.operation_number,
                fol.quantity,
@@ -50,7 +55,7 @@
                fol.type,
                fol.remarks
         from (select *
-              from mm.finished_operate_log aa where aa.operate_type = '棰嗗嚭' or aa.operate_type = '杩斿伐') fol
+              from mm.finished_operate_log aa where (aa.operate_type = '棰嗗嚭' or aa.operate_type = '杩斿伐') and aa.status!='宸蹭綔搴�') fol
                  left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
         <where>
                 date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
@@ -108,7 +113,7 @@
         select CEILING(count(fol.id)/#{pageSize}) as 'pageTotal',
         count(fol.id) as 'total'
         from (select *
-            from mm.finished_operate_log aa where aa.operate_type = '棰嗗嚭' or aa.operate_type = '杩斿伐') fol
+            from mm.finished_operate_log aa where (aa.operate_type = '棰嗗嚭' or aa.operate_type = '杩斿伐') and aa.status!='宸蹭綔搴�') fol
             left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
         <where>
                  date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}

--
Gitblit v1.8.0