From 0a567fd9c3baeb8022c77fa1a6a96d4c60cfa11c Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 23 五月 2024 08:18:47 +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 | 89 +++++++++++++++++++++++++++++++++-----------
1 files changed, 67 insertions(+), 22 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 3594b93..a230530 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -64,6 +64,7 @@
<result column="product_name" property="productName"/>
<result column="product_id" property="productId"/>
<result column="warehouse_num" property="warehouseNum"/>
+ <result column="delivery_num" property="deliveryNum"/>
<result column="order_number" property="deliveryDetail.orderNumber"/>
<result column="delivery_id" property="deliveryDetail.deliveryId"/>
@@ -71,12 +72,13 @@
<result column="delivery_detail_remakes" property="deliveryDetail.deliveryDetailRemakes"/>
<result column="order_id" property="deliveryDetail.orderId"/>
<result column="create_time" property="deliveryDetail.createTime"/>
+ <result column="dd_quantity" property="deliveryDetail.quantity"/>
<result column="project" property="order.project"/>
<result column="creator" property="delivery.creator"/>
<result column="customer_name" property="delivery.customerName"/>
- <result column="quantity" property="delivery.quantity"/>
+ <result column="d_quantity" property="delivery.quantity"/>
<result column="area" property="delivery.area"/>
@@ -161,7 +163,7 @@
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>
- and fgi.quantity_available>0
+ and fgi.status = 0 and fgi.quantity_available>0
<if test="orderDetail.finishedGoodsInventory.orderId != null and orderDetail.finishedGoodsInventory.orderId != ''">
and fgi.order_id regexp #{orderDetail.finishedGoodsInventory.orderId}
</if>
@@ -208,7 +210,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
@@ -263,7 +266,7 @@
<update id="updateDeliveryDetailState">
update sd.delivery_detail
set delivery_detail_state=#{state}
- where order_number=#{orderDetail.deliveryDetail.orderNumber} and order_id=#{orderDetail.deliveryDetail.orderId}
+ where order_number=#{orderNumber} and order_id=#{orderId} and delivery_id=#{deliveryId}
</update>
<update id="updateInventoryquantityavailable">
@@ -274,13 +277,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>
@@ -330,12 +335,12 @@
and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
</if>
</where>
- order by dd.id
+ order by dd.id desc
limit #{offset},#{pageSize};
</select>
- <select id="getseletdeliveryDetail" resultMap="selectDelivery">
+ <select id="getSelectDeliveryDetail" resultMap="selectDelivery">
select dd.delivery_id,
dd.order_number,
dd.order_id,
@@ -345,8 +350,9 @@
d.customer_name,
od.width,
od.height,
- d.quantity,
+ dd.quantity as dd_quantity,
od.warehouse_num,
+ od.delivery_num,
d.area,
od.building_number,
d.creator,
@@ -355,9 +361,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 and d.delivery_state=2
<if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
</if>
@@ -408,7 +415,7 @@
</if>
</where>
- order by dd.id
+ order by dd.id desc
limit #{offset},#{pageSize};
</select>
@@ -419,6 +426,18 @@
<select id="findOrderNumberdsum" >
select sum(warehouse_num) from sd.order_detail where order_id=#{orderId}
+ </select>
+
+ <select id="findOrderDeliveryQuantitySum" >
+ select sum(delivery_num) from sd.order_detail where order_id=#{orderId}
+ </select>
+
+ <select id="findDeliveryQuantity" >
+ select quantity from sd.`delivery` where delivery_id=#{deliveryId}
+ </select>
+
+ <select id="findDeliverydetailsum" >
+ select sum(quantity) from sd.`delivery_detail` where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}
</select>
<update id="updateOrderWarehousingState">
@@ -432,6 +451,13 @@
set delivery=#{state}
where order_id=#{orderId}
</update>
+
+ <update id="updateDeliveryDeliveryState">
+ update sd.`delivery`
+ set stock_state=#{state}
+ where delivery_id=#{deliveryId}
+ </update>
+
<update id="updateIntOrderNumberConut">
update sd.order_detail
@@ -447,8 +473,14 @@
<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>
+
+ <update id="updateflowcardOut">
+ update pp.flow_card
+ set received_quantity=received_quantity-${finishedOperateLog.quantity},storage_time=now()
+ where order_number=#{finishedOperateLog.operationNumber} and process_id=#{finishedOperateLog.processId} and order_id=#{finishedOperateLog.orderId}
</update>
<update id="updateInventory">
@@ -464,9 +496,17 @@
where order_number=#{flowCard.orderNumber} and order_id=#{flowCard.order.orderId}
</update>
+ <update id="updateInventoryOut">
+ update mm.finished_goods_inventory
+ 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}
+ </update>
+
<insert id="insertFinishedGoodsInventory" useGeneratedKeys="true" >
insert into mm.finished_goods_inventory (order_id,
order_number,
+ process_id,
inventory,
actual_signal_area,
area,
@@ -480,7 +520,7 @@
remark
)
values (
- #{flowCard.order.orderId} ,#{flowCard.orderNumber},#{flowCard.inventoryQuantity},ROUND(#{flowCard.orderDetail.width}*#{flowCard.orderDetail.height}/1000000,2),
+ #{flowCard.order.orderId} ,#{flowCard.orderNumber},#{flowCard.processId},#{flowCard.inventoryQuantity},ROUND(#{flowCard.orderDetail.width}*#{flowCard.orderDetail.height}/1000000,2),
ROUND(#{flowCard.orderDetail.width}*#{flowCard.orderDetail.height}*#{flowCard.inventoryQuantity}/1000000,2),
#{flowCard.inventoryQuantity},null,#{storageRegion},
0,now(),now(),null,#{remark}
@@ -502,7 +542,7 @@
</select>
- <select id="getseletwarehousing" resultMap="selectFlowCard">
+ <select id="getSelectWarehousing" resultMap="selectFlowCard">
select
fc.id,
o.order_id,
@@ -515,7 +555,7 @@
o.project,
fc.order_number,
od.quantity,
- fc.inventory_quantity,
+ fc.inventory_quantity-fc.received_quantity as inventory_quantity,
o.area,
fc.process_id,
fc.received_quantity,
@@ -571,11 +611,13 @@
</if>
</where>
- group by fc.order_id,fc.order_number,fc.process_id order by fc.create_time
+ group by fc.order_id,fc.order_number,fc.process_id order by fc.create_time desc
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>
@@ -715,16 +757,16 @@
</if>
</where>
- order by fgi.id
+ order by fgi.id desc
- 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
@@ -795,4 +837,7 @@
;
</select>
+
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0