From 3c87c3ff67c2193ab5bfaa31f0fb1ad5a68cd5af Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 15 三月 2024 09:09:10 +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 |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 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 b8e2c0b..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}
@@ -105,9 +110,10 @@
     </select>
 
     <select id="getSelectOperateRecordLogPageTotal" >
-        select  CEILING(count(fol.id)/#{pageSize})
+        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}
@@ -220,7 +226,8 @@
     </select>
 
     <select id="getselectAllocateFinishedOperateLogPageTotal"  >
-        select  CEILING(count(fol.id)/#{pageSize})
+        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 = '璋冩嫧') fol
                  left join sd.order_detail od on fol.order_id = od.order_id and fol.end_operation_order_number = od.order_number
@@ -303,7 +310,7 @@
                                             operate_time
         )
         values (
-                   #{orderDetail.deliveryDetail.deliveryId} ,#{orderDetail.deliveryDetail.order_id},#{orderDetail.deliveryDetail.orderNumber}
+                   #{orderDetail.deliveryDetail.deliveryId} ,#{orderDetail.deliveryDetail.orderId},#{orderDetail.deliveryDetail.orderNumber}
                    ,"鍑哄簱",#{userName},#{orderDetail.warehouseNum},now()
                )
     </insert>

--
Gitblit v1.8.0