From 7aac0b821663de152ef665a030ebbef1d34b41f2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 16 四月 2025 11:31:20 +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 | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 111 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 d380c35..7944b3a 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -428,12 +428,20 @@
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="findOrderDelivery" >
+ select * from sd.`delivery` where order_id=#{orderId}
+ </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">
@@ -457,13 +465,19 @@
<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>
<update id="updateOutOrderNumberConut">
update sd.order_detail
set warehouse_num=warehouse_num-${quantity}
+ 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>
@@ -530,6 +544,20 @@
</select>
+ <select id="findOrderNumberd" >
+ select *
+ from mm.`finished_goods_inventory`
+ where order_number = #{orderNumber} and order_id=#{orderId};
+
+ </select>
+
+ <select id="findOrderDetailNumberd" >
+ select *
+ from sd.`order_detail`
+ where order_number = #{orderNumber} and order_id=#{orderId};
+
+ </select>
+
<select id="finishedGoodsInventorybycount" >
select quantity_available
from mm.`finished_goods_inventory`
@@ -556,10 +584,11 @@
fc.process_id,
fc.received_quantity,
o.batch
- 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
+ from (select *,min(inventory_quantity) as min_inventory_quantity from pp.flow_card group by order_id,order_number,process_id) as 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>
- and fc.received_quantity <![CDATA[<]]> fc.inventory_quantity
+ and fc.received_quantity <![CDATA[<]]> fc.min_inventory_quantity and o.create_order>0
<if test="flowCard.order.orderId != null and flowCard.order.orderId != ''">
and o.order_id regexp #{flowCard.order.orderId}
</if>
@@ -617,7 +646,7 @@
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>
- and fc.received_quantity <![CDATA[<]]> fc.inventory_quantity
+ and fc.received_quantity <![CDATA[<]]> fc.inventory_quantity and o.create_order>0
<if test="flowCard.order.orderId != null and flowCard.order.orderId != ''">
and o.order_id regexp #{flowCard.order.orderId}
</if>
@@ -693,7 +722,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.status = 0 and fgi.quantity_available>0
+ and fgi.status = 0 and fgi.quantity_available>0 and o.create_order>0
<if test="finishedGoodsInventory.orderDetail.width != null and finishedGoodsInventory.orderDetail.width != ''">
and od.width regexp #{finishedGoodsInventory.orderDetail.width}
</if>
@@ -753,7 +782,7 @@
</if>
</where>
- order by fgi.id desc
+ order by fgi.update_time desc
limit #{offset},#{pageSize};
</select>
@@ -767,7 +796,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.status = 0 and fgi.quantity_available>0
+ and fgi.status = 0 and fgi.quantity_available>0 and o.create_order>0
<if test="finishedGoodsInventory.orderDetail.width != null and finishedGoodsInventory.orderDetail.width != ''">
and od.width regexp #{finishedGoodsInventory.orderDetail.width}
</if>
@@ -828,9 +857,82 @@
</where>
- order by fgi.id desc
+ order by fgi.update_time desc
limit #{offset},#{pageSize}
;
</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>
+
+ <select id="getSelectDeliveryDetailDeliveryId" resultMap="selectDelivery">
+ select dd.delivery_id,
+ dd.order_number,
+ dd.order_id,
+ o.project,
+ od.product_id,
+ od.product_name,
+ d.customer_name,
+ od.width,
+ od.height,
+ dd.quantity as dd_quantity,
+ od.warehouse_num,
+ od.delivery_num,
+ d.area,
+ od.building_number,
+ d.creator,
+ dd.delivery_detail_remakes,
+ dd.create_time
+ 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_id= #{deliveryId}
+
+ </select>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0