From 48bd9e20aa649145c9bf643e375c0cd86f7bb800 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 04 九月 2025 08:28:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 101 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 84 insertions(+), 17 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 ad2341a..fa6bf57 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -149,26 +149,51 @@
update mm.finished_goods_inventory
set quantity_available=quantity_available+#{quantity},
update_time=now(),area=actual_signal_area*quantity_available
- where order_number=#{orderNumber} and order_id=#{orderId} and trim(box_no) = trim(#{boxNo})
+ where order_number=#{orderNumber} and order_id=#{orderId}
+ <if test="boxNo != null ">
+ and trim(box_no) = trim(#{boxNo})
+ </if>
+ <if test="boxNo == null ">
+ and box_no is null
+ </if>
</update>
<update id="updateInventoryquantityOut">
update mm.finished_goods_inventory
set quantity_available=quantity_available-#{quantity},
update_time=now(),area=actual_signal_area*quantity_available
- where order_id=#{orderId} and order_number=#{orderNumber} and trim(box_no) = trim(#{boxNo})
+ where order_id=#{orderId} and order_number=#{orderNumber}
+ <if test="boxNo != null ">
+ and trim(box_no) = trim(#{boxNo})
+ </if>
+ <if test="boxNo == null ">
+ and box_no is null
+ </if>
</update>
<update id="updateInventoryInventoryInt">
update mm.finished_goods_inventory
set inventory=inventory+#{quantity}
- where order_number=#{orderNumber} and order_id=#{orderId} and trim(box_no) = trim(#{remarks})
+ where order_number=#{orderNumber} and order_id=#{orderId}
+ <if test="remarks != null ">
+ and trim(box_no) = trim(#{remarks})
+ </if>
+ <if test="remarks == null ">
+ and box_no is null
+ </if>
</update>
<update id="updateInventoryInventoryOut">
update mm.finished_goods_inventory
set inventory=inventory-#{quantity}
- where order_number=#{orderNumber} and order_id=#{orderId} and trim(box_no) = trim(#{boxNo})
+ where order_number=#{orderNumber} and order_id=#{orderId}
+ <if test="boxNo != null ">
+ and trim(box_no) = trim(#{boxNo})
+ </if>
+ <if test="boxNo == null ">
+ and box_no is null
+ </if>
+
</update>
<select id="getSelectAllocate" resultMap="selectDeliveryFinishedGoodsInventory">
@@ -292,7 +317,13 @@
<update id="updateDeliveryDetailState">
update sd.delivery_detail
set delivery_detail_state=#{state}
- where order_number=#{orderNumber} and order_id=#{orderId} and delivery_id=#{deliveryId} and trim(box_no) = trim(#{remarks})
+ where order_number=#{orderNumber} and order_id=#{orderId} and delivery_id=#{deliveryId}
+ <if test="remarks != null ">
+ and trim(box_no) = trim(#{remarks})
+ </if>
+ <if test="remarks == null ">
+ and box_no is null
+ </if>
</update>
<update id="updateInventoryquantityavailable">
@@ -471,6 +502,10 @@
select ifnull(sum(quantity),0) from sd.`delivery_detail` where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}
</select>
+ <select id="findFinishedOperateLogQuantity" >
+ select sum(quantity) from mm.finished_operate_log where operate_type='鍑哄簱' and status='鏈鏍�' and order_id=#{orderId}
+ </select>
+
<update id="updateOrderWarehousingState">
update sd.`order`
set warehousing=#{state}
@@ -530,10 +565,17 @@
<if test="remark != null and remark != ''">
, remark= #{remark}
</if>
- <if test="container != null and container != ''">
+ <if test="container != null ">
, box_no= #{container}
</if>
- where order_number=#{flowCard.orderNumber} and order_id=#{flowCard.order.orderId} and box_no= #{container}
+ where order_number=#{flowCard.orderNumber} and order_id=#{flowCard.order.orderId}
+ <if test="container != null ">
+ and box_no= #{container}
+ </if>
+ <if test="container == null ">
+ and box_no is null
+ </if>
+
</update>
<update id="updateInventoryOut">
@@ -541,7 +583,12 @@
set inventory=inventory-${finishedOperateLog.quantity},quantity_available=quantity_available-${finishedOperateLog.quantity},
update_time=now(),area=actual_signal_area*quantity_available
where order_number=#{finishedOperateLog.operationNumber} and order_id=#{finishedOperateLog.orderId}
- and box_no=#{finishedOperateLog.remarks}
+ <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
+ and box_no=#{finishedOperateLog.remarks}
+ </if>
+ <if test="finishedOperateLog.remarks == null ">
+ and box_no is null
+ </if>
</update>
<insert id="insertFinishedGoodsInventory" useGeneratedKeys="true" >
@@ -572,14 +619,26 @@
<select id="findOrderNumberdcount" >
select count(*)
from mm.`finished_goods_inventory`
- where order_number = #{orderNumber} and order_id=#{orderId} and box_no=#{boxNo};
+ where order_number = #{orderNumber} and order_id=#{orderId}
+ <if test="boxNo != null ">
+ and box_no=#{boxNo}
+ </if>
+ <if test="boxNo == null ">
+ and box_no is null
+ </if>
</select>
<select id="findOrderNumberdContainercount" >
select count(*)
from mm.`finished_goods_inventory`
- where order_number = #{orderNumber} and order_id=#{orderId} and box_no=#{container};
+ where order_number = #{orderNumber} and order_id=#{orderId}
+ <if test="container != null ">
+ and box_no=#{container}
+ </if>
+ <if test="container == null ">
+ and box_no is null
+ </if>
</select>
@@ -893,15 +952,18 @@
</where>
order by fgi.update_time desc
- limit #{offset},#{pageSize};
+ <!-- limit #{offset},#{pageSize}-->
+ ;
</select>
<select id="getPageTotal">
select
- CEILING(count(fgi.id)/#{pageSize}) as 'pageTotal',
+ 1 as 'pageTotal',
+ <!-- CEILING(count(fgi.id)/#{pageSize}) as 'pageTotal', -->
+
count(fgi.id) as 'total'
- from finished_goods_inventory fgi
+ 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
left join sd.`order` o on fgi.order_id = o.order_id
<where>
@@ -987,7 +1049,7 @@
</where>
order by fgi.update_time desc
- limit #{offset},#{pageSize}
+ <!-- limit #{offset},#{pageSize} as 'pageTotal', -->
;
</select>
@@ -1037,7 +1099,12 @@
and order_id=#{orderId}
and delivery_id=#{deliveryId}
and delivery_detail_state=0
- and trim(#{boxNo}) =box_no
+ <if test="boxNo != null ">
+ and box_no=trim(#{boxNo})
+ </if>
+ <if test="boxNo == null ">
+ and box_no is null
+ </if>
</select>
<select id="getSelectDeliveryDetailDeliveryId" resultMap="selectDelivery">
@@ -1071,11 +1138,11 @@
<select id="getPrintTitleByBox">
select kkk.*,
rw.teams_groups_name as teams_groups_name2
- from(select o.order_id,
+ from(select #{orderId} as order_id,
o.customer_name,
o.customer_id,
o.project,
- o.batch,
+ (select batch from sd.`order` pp1 where pp1.order_id =#{orderId} ) as batch,
fol.box_no as 'remarks',
SUM(fol.quantity_available) as quantity,
ROUND( sum(od.width * od.height * fol.quantity_available) / 1000000, 2 ) as area,
--
Gitblit v1.8.0