From 77c7984fb636f81a87208aea2bcffc701f6419e8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 23 十月 2024 16:01:26 +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 | 105 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 93 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 017ceac..eff0aa6 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -72,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"/>
@@ -265,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} and delivery_id=#{orderDetail.deliveryDetail.deliveryId}
+ where order_number=#{orderNumber} and order_id=#{orderId} and delivery_id=#{deliveryId}
</update>
<update id="updateInventoryquantityavailable">
@@ -334,7 +335,7 @@
and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
</if>
</where>
- order by dd.id
+ order by dd.id desc
limit #{offset},#{pageSize};
</select>
@@ -349,7 +350,7 @@
d.customer_name,
od.width,
od.height,
- d.quantity,
+ dd.quantity as dd_quantity,
od.warehouse_num,
od.delivery_num,
d.area,
@@ -363,7 +364,7 @@
left join sd.`order` o on o.order_id = dd.order_id
<where>
- and dd.delivery_detail_state=1
+ 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>
@@ -414,7 +415,7 @@
</if>
</where>
- order by dd.id
+ order by dd.id desc
limit #{offset},#{pageSize};
</select>
@@ -427,12 +428,16 @@
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 ifnull(sum(quantity),0) from sd.`delivery_detail` where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}
</select>
<update id="updateOrderWarehousingState">
@@ -453,9 +458,10 @@
where delivery_id=#{deliveryId}
</update>
+
<update id="updateIntOrderNumberConut">
update sd.order_detail
- set warehouse_num=warehouse_num+${quantity}
+ set warehouse_num=warehouse_num+${quantity},update_time=now()
where order_number=#{orderNumber} and order_id=#{orderId}
</update>
@@ -465,10 +471,22 @@
where order_number=#{orderNumber} and order_id=#{orderId}
</update>
+ <update id="updateOrderNumberConut">
+ update sd.order_detail
+ set warehouse_num=${quantity},update_time=now()
+ where order_number=#{orderNumber} and order_id=#{orderId}
+ </update>
+
<update id="updateflowcard">
update pp.flow_card
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">
@@ -484,9 +502,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,
@@ -500,7 +526,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}
@@ -509,6 +535,13 @@
<select id="findOrderNumberdcount" >
select count(*)
+ from mm.`finished_goods_inventory`
+ where order_number = #{orderNumber} and order_id=#{orderId};
+
+ </select>
+
+ <select id="findOrderNumberd" >
+ select *
from mm.`finished_goods_inventory`
where order_number = #{orderNumber} and order_id=#{orderId};
@@ -535,7 +568,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,
@@ -591,7 +624,7 @@
</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="getSelectWarehousingPageTotal" >
@@ -737,7 +770,7 @@
</if>
</where>
- order by fgi.id
+ order by fgi.id desc
limit #{offset},#{pageSize};
</select>
@@ -817,4 +850,52 @@
;
</select>
+ <select id="getSelectOrderDetail" >
+ select * from sd.order_detail where order_id=#{orderId}
+ </select>
+
+ <insert id="insertOrderFinishedGoodsInventory" useGeneratedKeys="true" >
+ insert into mm.finished_goods_inventory (order_id,
+ order_number,
+ process_id,
+ inventory,
+ actual_signal_area,
+ area,
+ quantity_available,
+ warehouse_number,
+ storage_region,
+ `status`,
+ enter_storage_time,
+ update_time,
+ end_time,
+ remark
+ )
+ values (
+ #{orderDetail.orderId} ,#{orderDetail.orderNumber},"",#{orderDetail.quantity},#{orderDetail.computeArea},
+ #{orderDetail.computeGrossArea},
+ #{orderDetail.quantity},null,"",
+ 0,now(),now(),null,""
+ )
+ </insert>
+
+ <update id="updateOrderInventory">
+ update mm.finished_goods_inventory
+ set inventory=${orderDetail.quantity},quantity_available=${orderDetail.quantity},
+ update_time=now(),area=actual_signal_area*quantity_available
+ where order_number=#{orderDetail.orderNumber} and order_id=#{orderDetail.orderId}
+ </update>
+
+ <select id="findFlowCard">
+ select * from pp.flow_card
+ where order_number=#{orderNumber} and process_id=#{processId} and order_id=#{order.orderId} group by process_id
+ </select>
+
+ <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
+ </select>
+
+
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0