From ba78a4af86a2916ecec4a92bfef6bc4f5a4e6d8e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 07 三月 2024 13:44:02 +0800
Subject: [PATCH] 排产删除、审核，修改代码格式
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
index e592948..eb88665 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -209,7 +209,8 @@
</select>
<select id="getSelectAllocatePageTotal" >
- select CEILING(count(zu.order_number)/#{pageSize}) from
+ select CEILING(count(zu.order_number)/#{pageSize}) as 'pageTotal',
+ count(zu.order_number) as 'total' from
(select fgi.order_number as order_number
from mm.finished_goods_inventory fgi
left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
@@ -275,13 +276,15 @@
</update>
- <select id="getseletdeliveryDetailPageTotal" >
- select CEILING(count(dd.id)/#{pageSize})
+ <select id="getSelectDeliveryDetailPageTotal" >
+ select CEILING(count(dd.id)/#{pageSize}) as 'pageTotal',
+ count(dd.id) as 'total'
from sd.delivery_detail dd
left join sd.delivery d on dd.delivery_id = d.delivery_id
left join sd.order_detail od on od.order_id = dd.order_id and dd.order_number = od.order_number
left join sd.`order` o on o.order_id = dd.order_id
<where>
+ and dd.delivery_detail_state=1
<if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
</if>
@@ -336,7 +339,7 @@
limit #{offset},#{pageSize};
</select>
- <select id="getseletdeliveryDetail" resultMap="selectDelivery">
+ <select id="getSelectDeliveryDetail" resultMap="selectDelivery">
select dd.delivery_id,
dd.order_number,
dd.order_id,
@@ -357,9 +360,10 @@
from sd.delivery_detail dd
left join sd.delivery d on dd.delivery_id = d.delivery_id
left join sd.order_detail od on od.order_id = dd.order_id and dd.order_number = od.order_number
- left join sd.`order` o on o.order_id = dd.order_id where dd.delivery_detail_state=1
+ left join sd.`order` o on o.order_id = dd.order_id
<where>
+ and dd.delivery_detail_state=1
<if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
</if>
@@ -463,7 +467,7 @@
<update id="updateflowcard">
update pp.flow_card
- set received_quantity=received_quantity+${inventoryQuantity}
+ set received_quantity=received_quantity+${inventoryQuantity},storage_time=now()
where order_number=#{orderNumber} and process_id=#{processId} and order_id=#{order.orderId}
</update>
@@ -518,7 +522,7 @@
</select>
- <select id="getseletwarehousing" resultMap="selectFlowCard">
+ <select id="getSelectWarehousing" resultMap="selectFlowCard">
select
fc.id,
o.order_id,
@@ -590,8 +594,10 @@
group by fc.order_id,fc.order_number,fc.process_id order by fc.create_time
limit #{offset},#{pageSize};
</select>
- <select id="getseletwarehousingPageTotal" >
- select CEILING(count(zu.order_number)/#{pageSize}) from (
+ <select id="getSelectWarehousingPageTotal" >
+ select
+ CEILING(count(zu.order_number)/#{pageSize}) as 'pageTotal',
+ count(zu.order_number) as 'total' from (
select fc.order_number as order_number,fc.process_id from pp.flow_card fc left join sd.order_detail od on
fc.order_id=od.order_id and fc.order_number=od.order_number inner join sd.`order` o on o.order_id=fc.order_id
<where>
@@ -733,14 +739,14 @@
</where>
order by fgi.id
- limit #{offset},#{pageSize}
- ;
+ limit #{offset},#{pageSize};
</select>
<select id="getPageTotal">
select
- CEILING(count(fgi.id)/#{pageSize})
+ CEILING(count(fgi.id)/#{pageSize}) as 'pageTotal',
+ count(fgi.id) as 'total'
from finished_goods_inventory fgi
left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
left join sd.`order` o on fgi.order_id = o.order_id
--
Gitblit v1.8.0