From bf23d66c841f7bc7de098a93b9a61fffe04d9cfb Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 28 二月 2024 18:41:13 +0800
Subject: [PATCH] 提交右键菜单以及拖拉选中功能
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 8 +++++---
1 files changed, 5 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 b8e2c0b..2e3abf2 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -105,7 +105,8 @@
</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
left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
@@ -220,7 +221,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 +305,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