From b8202fa27280e1fc0ff962c874e94e625abeb7b8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 03 七月 2025 16:22:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 66 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 5f16fdd..954679f 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -436,8 +436,12 @@
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">
@@ -471,6 +475,12 @@
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()
@@ -492,6 +502,9 @@
</if>
<if test="remark != null and remark != ''">
, remark= #{remark}
+ </if>
+ <if test="container != null and container != ''">
+ , box_no= #{container}
</if>
where order_number=#{flowCard.orderNumber} and order_id=#{flowCard.order.orderId}
</update>
@@ -515,6 +528,7 @@
storage_region,
`status`,
enter_storage_time,
+ box_no,
update_time,
end_time,
remark
@@ -523,7 +537,7 @@
#{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}
+ 0,now(),#{container},now(),null,#{remark}
)
</insert>
@@ -537,6 +551,13 @@
<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>
@@ -567,10 +588,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>
@@ -628,7 +650,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>
@@ -704,7 +726,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>
@@ -764,7 +786,7 @@
</if>
</where>
- order by fgi.id desc
+ order by fgi.update_time desc
limit #{offset},#{pageSize};
</select>
@@ -778,7 +800,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>
@@ -839,7 +861,7 @@
</where>
- order by fgi.id desc
+ order by fgi.update_time desc
limit #{offset},#{pageSize}
;
</select>
@@ -879,7 +901,42 @@
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