From c69c4dd89ef52edcee896c6a9c150aa6c2809e84 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 17 二月 2025 13:55:39 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
index 728d5a4..5fc2cbc 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -1073,14 +1073,15 @@
</select>
<select id="getSelectOptimizeUses">
- select * from pp.optimize_use mo where project_no=#{projectNo} and width=#{width} and height=#{height}
+ select * from pp.optimize_use where project_no=#{projectNo} and width=#{width} and height=#{height} and state=1
</select>
<select id="getSelectMaterialOutboundOptimizeUses">
- select * from mm.material_outbound_detail mo where
+ select * from mm.material_outbound_detail mo
<where>
+ mo.material_outbound_id=#{materialOutboundId}
<if test="useId != null">
- and use_id=#{useId}
+ and mo.use_id=#{useId}
</if>
</where>
</select>
@@ -1089,17 +1090,21 @@
update mm.material_outbound_detail set outbound_quantity=outbound_quantity+#{quantity} where use_id=#{useId};
</select>
+ <select id="updateOptimizeUsesMes">
+ update pp.optimize_use set not_use_count=not_use_count-#{quantity} where id=#{useId};
+ </select>
+
<insert id="insertMaterialOutboundDetailOptimizeUses" useGeneratedKeys="true" >
insert into mm.material_outbound_detail (material_outbound_id,material_outbound_number,material_code,use_id,inventory_id,inventory_organization,
outbound_quantity,single_piece_area,inventory_area,date_of_manufacture)
values (
#{materialOutboundId} ,#{number},#{materialCode},#{useId},#{inventoryId},'鍘熺墖搴�',#{outboundQuantity},
- #{materialOutboundDetail.singlePieceArea},#{materialOutboundDetail.inventoryArea},#{materialOutboundDetail.dateOfManufacture}
+ #{singlePieceArea},#{inventoryArea},#{dateOfManufacture}
)
</insert>
<insert id="insertMaterialOutboundOptimizeUses" useGeneratedKeys="true" >
- insert into mm.material_outbound(material_outbound_id,material_requisition_personnel,material_requisition_team,order_id,outbound_type,
+ insert into mm.material_outbound(material_outbound_id,order_id,outbound_type,
warehouse_manager,material_requisition_date,reviewed_state,reviewed,create_time,reviewed_time)
values (
#{materialOutboundId} ,#{projectNo},'鏍囧噯鍑哄簱',#{name},now(),1,#{name},now(),now()
--
Gitblit v1.8.0