From bf90cf8568301edb38920e8b0a0ce7e137a668ef Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 21 八月 2025 09:51:55 +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 | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 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 b96504e..e4c6272 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -7,6 +7,10 @@
<!--鏄犲皠鎴愬搧搴撳瓨-->
<resultMap id="selectFinishedGoodsInventory" type="com.example.erp.entity.mm.FinishedGoodsInventory">
<id column="fid" property="id"/>
+ <result column="id" property="id"/>
+ <result column="order_id" property="orderId"/>
+ <result column="order_number" property="orderNumber"/>
+ <result column="process_id" property="processId"/>
<result column="inventory" property="inventory"/>
<result column="area" property="area"/>
<result column="actual_signal_area" property="actualSignalArea"/>
@@ -88,6 +92,7 @@
<result column="order_id" property="deliveryDetail.orderId"/>
<result column="create_time" property="deliveryDetail.createTime"/>
<result column="dd_quantity" property="deliveryDetail.quantity"/>
+ <result column="box_no" property="deliveryDetail.boxNo"/>
<result column="project" property="order.project"/>
@@ -140,24 +145,30 @@
update_time=now(),area=actual_signal_area*quantity_available
where order_number=#{orderNumber} and order_id=#{orderId}
</update>
+ <update id="updateInventoryquantityIntBybox">
+ 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})
+ </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_number=#{orderNumber} and order_id=#{orderId}
+ where order_id=#{orderId} and order_number=#{orderNumber} and trim(box_no) = trim(#{boxNo})
</update>
<update id="updateInventoryInventoryInt">
update mm.finished_goods_inventory
set inventory=inventory+#{quantity}
- where order_number=#{orderNumber} and order_id=#{orderId}
+ where order_number=#{orderNumber} and order_id=#{orderId} and trim(box_no) = trim(#{remarks})
</update>
<update id="updateInventoryInventoryOut">
update mm.finished_goods_inventory
set inventory=inventory-#{quantity}
- where order_number=#{orderNumber} and order_id=#{orderId}
+ where order_number=#{orderNumber} and order_id=#{orderId} and trim(box_no) = trim(#{boxNo})
</update>
<select id="getSelectAllocate" resultMap="selectDeliveryFinishedGoodsInventory">
@@ -219,7 +230,7 @@
and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
</if>
</where>
- group by fgi.order_id, fgi.order_number
+ group by fgi.order_id, fgi.order_number,fgi.box_no
limit #{offset},#{pageSize};
</select>
@@ -281,7 +292,7 @@
<update id="updateDeliveryDetailState">
update sd.delivery_detail
set delivery_detail_state=#{state}
- where order_number=#{orderNumber} and order_id=#{orderId} and delivery_id=#{deliveryId}
+ where order_number=#{orderNumber} and order_id=#{orderId} and delivery_id=#{deliveryId} and trim(box_no) = trim(#{remarks})
</update>
<update id="updateInventoryquantityavailable">
@@ -372,7 +383,8 @@
od.building_number,
d.creator,
dd.delivery_detail_remakes,
- dd.create_time
+ dd.create_time,
+ dd.box_no
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
@@ -529,6 +541,7 @@
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}
</update>
<insert id="insertFinishedGoodsInventory" useGeneratedKeys="true" >
@@ -559,7 +572,7 @@
<select id="findOrderNumberdcount" >
select count(*)
from mm.`finished_goods_inventory`
- where order_number = #{orderNumber} and order_id=#{orderId};
+ where order_number = #{orderNumber} and order_id=#{orderId} and box_no=#{boxNo};
</select>
@@ -764,7 +777,10 @@
<select id="defaultfinishedGoods" resultMap="selectFinishedGoodsInventory">
- select od.order_number,
+ select
+ fgi.id,
+ fgi.process_id,
+ od.order_number,
o.order_id,
o.project,
o.order_type,
@@ -1017,7 +1033,11 @@
<select id="findDeliverydetail">
select * from sd.delivery_detail
- where order_number=#{orderNumber} and order_id=#{orderId} and delivery_id=#{deliveryId} and delivery_detail_state=0
+ where order_number=#{orderNumber}
+ and order_id=#{orderId}
+ and delivery_id=#{deliveryId}
+ and delivery_detail_state=0
+ and trim(#{boxNo}) =box_no
</select>
<select id="getSelectDeliveryDetailDeliveryId" resultMap="selectDelivery">
--
Gitblit v1.8.0