From 47eb3a7bb1e7901a6d45d9df8ea8b9c4fb28ae82 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 05 三月 2025 16:18:41 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 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..4a0d587 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -172,6 +172,7 @@
mi.inventory_quantity AS inventoryQuantity,
ou.not_use_count AS availableQuantity,
ou.not_use_count AS planQuantity,
+ ou.not_use_count AS outboundQuantity,
mi.id,
mi.inventory_organization as inventoryOrganization,
mi.material_code AS materialCode,
@@ -957,13 +958,13 @@
</if>
<if test="materialLog.inventoryId != null and materialLog.inventoryId != ''">
- and ml.inventoryId regexp #{materialLog.inventoryId}
+ and ml.inventory_id regexp #{materialLog.inventoryId}
</if>
<if test="materialLog.materialCode != null and materialLog.materialCode != ''">
- and ml.materialCode regexp #{materialLog.materialCode}
+ and ml.material_code regexp #{materialLog.materialCode}
</if>
<if test="materialLog.materialName != null and materialLog.materialName != ''">
- and ml.materialName regexp #{materialLog.materialName}
+ and ml.material_name regexp #{materialLog.materialName}
</if>
<if test="materialLog.producer != null and materialLog.producer != ''">
and ml.producer regexp #{materialLog.producer}
@@ -982,6 +983,9 @@
</if>
<if test="materialLog.remarks != null and materialLog.remarks != ''">
and ml.remarks regexp #{materialLog.remarksr}
+ </if>
+ <if test="materialLog.projectNo != null and materialLog.projectNo != ''">
+ and ml.project_no regexp #{materialLog.projectNo}
</if>
</where>
order by ml.id desc
@@ -1018,13 +1022,13 @@
</if>
<if test="materialLog.inventoryId != null and materialLog.inventoryId != ''">
- and ml.inventoryId regexp #{materialLog.inventoryId}
+ and ml.inventory_id regexp #{materialLog.inventoryId}
</if>
<if test="materialLog.materialCode != null and materialLog.materialCode != ''">
- and ml.materialCode regexp #{materialLog.materialCode}
+ and ml.material_code regexp #{materialLog.materialCode}
</if>
<if test="materialLog.materialName != null and materialLog.materialName != ''">
- and ml.materialName regexp #{materialLog.materialName}
+ and ml.material_name regexp #{materialLog.materialName}
</if>
<if test="materialLog.producer != null and materialLog.producer != ''">
and ml.producer regexp #{materialLog.producer}
@@ -1073,38 +1077,47 @@
</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>
- <select id="updateMaterialOutboundOptimizeUses">
+ <update id="updateMaterialOutboundOptimizeUses">
update mm.material_outbound_detail set outbound_quantity=outbound_quantity+#{quantity} where use_id=#{useId};
- </select>
+ </update>
+
+ <update id="updateOptimizeUsesMes">
+ update pp.optimize_use set not_use_count=not_use_count-#{quantity} where id=#{useId};
+ </update>
<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()
)
</insert>
+ <select id="selectProjectNo">
+ select project_no from pp.optimize_use where id=#{useId};
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0