From fc28d01cfa022d0f91ec719490342d726db2e105 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 九月 2025 08:32:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml | 134 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 117 insertions(+), 17 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 0a1965e..a7b58af 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -35,6 +35,32 @@
</resultMap>
+ <resultMap id="selectMaterialOutboundLog" type="com.example.erp.entity.mm.MaterialLog" >
+ <id column="id" property="id"/>
+ <result column="operation_order_number" property="operationOrderNumber"/>
+ <result column="operate_type" property="operateType"/>
+ <result column="operation_number" property="operationNumber"/>
+ <result column="inventory_id" property="inventoryId"/>
+ <result column="material_code" property="materialCode"/>
+ <result column="material_name" property="materialName"/>
+ <result column="producer" property="producer"/>
+ <result column="unit" property="unit"/>
+ <result column="width" property="width"/>
+ <result column="height" property="height"/>
+ <result column="thickness" property="thickness"/>
+ <result column="quantity" property="quantity"/>
+ <result column="single_piece_area" property="singlePieceArea"/>
+ <result column="inventory_area" property="inventoryArea"/>
+ <result column="operator" property="operator"/>
+ <result column="remarks" property="remarks"/>
+ <result column="operate_time" property="operateTime"/>
+ <result column="use_count" property="useCount"/>
+
+ <result column="order_id" property="materialOutbound.orderId"/>
+ <result column="project" property="materialOutbound.project"/>
+ <result column="batch" property="materialOutbound.batch"/>
+ </resultMap>
+
<select id="getSelectMaterialInventoryDate">
@@ -247,6 +273,12 @@
<if test="materialOutbound.reviewed != null and materialOutbound.reviewed != ''">
and mo.reviewed regexp #{materialOutbound.reviewed}
</if>
+ <if test="materialOutbound.project != null and materialOutbound.project != ''">
+ and mo.project regexp #{materialOutbound.project}
+ </if>
+ <if test="materialOutbound.batch != null and materialOutbound.batch != ''">
+ and mo.batch regexp #{materialOutbound.batch}
+ </if>
</where>
order by mo.create_time desc
limit #{offset},#{pageSize};
@@ -280,6 +312,12 @@
</if>
<if test="materialOutbound.reviewed != null and materialOutbound.reviewed != ''">
and mo.reviewed regexp #{materialOutbound.reviewed}
+ </if>
+ <if test="materialOutbound.project != null and materialOutbound.project != ''">
+ and mo.project regexp #{materialOutbound.project}
+ </if>
+ <if test="materialOutbound.batch != null and materialOutbound.batch != ''">
+ and mo.batch regexp #{materialOutbound.batch}
</if>
</where>
</select>
@@ -587,19 +625,19 @@
</select>
<select id="getMaterialInventoryCount" >
- select * from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
+ select * from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture} and producer=#{producer}
</select>
<select id="getMaterialInventoryCountNull" >
- select * from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture is null
+ select * from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture is null and producer=#{producer}
</select>
<select id="getMaterialInventoryCountId" >
- select id from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
+ select id from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture} and producer=#{producer}
</select>
<select id="getMaterialInventoryCountNullId" >
- select id from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture is null
+ select id from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture is null and producer=#{producer}
</select>
<select id="getIsNotMaterialOutboundDetail" >
@@ -612,11 +650,11 @@
<insert id="insertMaterialOutbound" useGeneratedKeys="true" >
insert into mm.material_outbound(material_outbound_id,material_requisition_personnel,material_requisition_team,order_id,outbound_type,
- warehouse_manager,material_requisition_date,reviewed_state,create_time)
+ warehouse_manager,material_requisition_date,reviewed_state,create_time,project,batch)
values (
#{number} ,#{materialOutbound.materialRequisitionPersonnel},#{materialOutbound.materialRequisitionTeam},
#{materialOutbound.orderId},#{materialOutbound.outboundType},#{materialOutbound.warehouseManager},#{materialOutbound.materialRequisitionDate},
- 0,now()
+ 0,now(),#{materialOutbound.project},#{materialOutbound.batch}
)
</insert>
@@ -627,7 +665,9 @@
order_id=#{materialOutbound.orderId},
outbound_type=#{materialOutbound.outboundType},
warehouse_manager=#{materialOutbound.warehouseManager},
- material_requisition_date=#{materialOutbound.materialRequisitionDate}
+ material_requisition_date=#{materialOutbound.materialRequisitionDate},
+ project=#{materialOutbound.project},
+ batch=#{materialOutbound.batch}
where material_outbound_id = #{number}
</insert>
@@ -777,33 +817,34 @@
available_quantity=available_quantity+#{materialInventory.inventoryQuantity},
total_area=single_piece_area*inventory_quantity
where material_code=#{materialCode} and date_of_manufacture=#{materialInventory.dateOfManufacture}
+ and producer=#{materialInventory.producer}
</update>
<update id="updateMaterialInventoryNull" >
update mm.material_inventory set inventory_quantity=inventory_quantity+#{materialInventory.inventoryQuantity},
available_quantity=available_quantity+#{materialInventory.inventoryQuantity},
total_area=single_piece_area*inventory_quantity
- where material_code=#{materialCode} and date_of_manufacture is null
+ where material_code=#{materialCode} and date_of_manufacture is null and producer=#{materialInventory.producer}
</update>
<update id="updateMaterialInventoryOut" >
update mm.material_inventory set inventory_quantity=inventory_quantity-#{quantity},
available_quantity=available_quantity-#{quantity},
total_area=single_piece_area*inventory_quantity
- where material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
+ where material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture} and producer=#{producer}
</update>
<update id="updateMaterialInventoryNullOut" >
update mm.material_inventory set inventory_quantity=inventory_quantity-#{quantity},
available_quantity=available_quantity-#{quantity},
total_area=single_piece_area*inventory_quantity
- where material_code=#{materialCode} and date_of_manufacture is null
+ where material_code=#{materialCode} and date_of_manufacture is null and producer=#{producer}
</update>
<update id="updateMaterialInventoryReturning" >
update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity}
where material_code=#{materialCode} and
- date_of_manufacture=#{returningWarehouseDetail.dateOfManufacture}
+ date_of_manufacture=#{returningWarehouseDetail.dateOfManufacture} and producer=#{returningWarehouseDetail.producer}
</update>
@@ -811,7 +852,7 @@
<update id="updateMaterialInventoryReturningNull" >
update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity}
where material_code=#{materialCode} and
- date_of_manufacture is null
+ date_of_manufacture is null and producer=#{returningWarehouseDetail.producer}
</update>
@@ -960,9 +1001,9 @@
where mi.id = #{id}
</select>
- <select id="getMaterialLogReport" >
+ <select id="getMaterialLogReport" resultMap="selectMaterialOutboundLog">
select *
- from mm.material_log ml
+ from mm.material_log ml left join mm.material_outbound mo on mo.material_outbound_id=ml.operation_order_number
<where>
date(ml.operate_time)>=#{startDate} and date(ml.operate_time) <= #{endDate} and ml.operate_type=#{type}
<if test="materialLog.operateType != null and materialLog.operateType != ''">
@@ -1012,10 +1053,19 @@
and ml.operator regexp #{materialLog.operator}
</if>
<if test="materialLog.remarks != null and materialLog.remarks != ''">
- and ml.remarks regexp #{materialLog.remarksr}
+ and ml.remarks regexp #{materialLog.remarks}
</if>
<if test="materialLog.projectNo != null and materialLog.projectNo != ''">
and ml.project_no regexp #{materialLog.projectNo}
+ </if>
+ <if test="materialLog.materialOutbound!=null and (materialLog.materialOutbound.orderId != null and materialLog.materialOutbound.orderId != '')">
+ and mo.order_id regexp #{materialLog.materialOutbound.orderId}
+ </if>
+ <if test=" materialLog.materialOutbound!=null and materialLog.materialOutbound.project != null and materialLog.materialOutbound.project != ''">
+ and mo.project regexp #{materialLog.materialOutbound.project}
+ </if>
+ <if test=" materialLog.materialOutbound!=null and materialLog.materialOutbound.batch != null and materialLog.materialOutbound.batch != ''">
+ and mo.batch regexp #{materialLog.materialOutbound.batch}
</if>
</where>
order by ml.id desc
@@ -1026,7 +1076,7 @@
<select id="getMaterialLogReportTotal">
select CEILING(count(ml.id)/#{pageSize}) as 'pageTotal',
count(ml.id) as 'total'
- from mm.material_log ml
+ from mm.material_log ml left join mm.material_outbound mo on mo.material_outbound_id=ml.operation_order_number
<where>
date(ml.operate_time)>=#{startDate} and date(ml.operate_time) <= #{endDate} and ml.operate_type=#{type}
<if test="materialLog.operateType != null and materialLog.operateType != ''">
@@ -1076,7 +1126,19 @@
and ml.operator regexp #{materialLog.operator}
</if>
<if test="materialLog.remarks != null and materialLog.remarks != ''">
- and ml.remarks regexp #{materialLog.remarksr}
+ and ml.remarks regexp #{materialLog.remarks}
+ </if>
+ <if test="materialLog.projectNo != null and materialLog.projectNo != ''">
+ and ml.project_no regexp #{materialLog.projectNo}
+ </if>
+ <if test="materialLog.materialOutbound!=null and (materialLog.materialOutbound.orderId != null and materialLog.materialOutbound.orderId != '')">
+ and mo.order_id regexp #{materialLog.materialOutbound.orderId}
+ </if>
+ <if test=" materialLog.materialOutbound!=null and materialLog.materialOutbound.project != null and materialLog.materialOutbound.project != ''">
+ and mo.project regexp #{materialLog.materialOutbound.project}
+ </if>
+ <if test=" materialLog.materialOutbound!=null and materialLog.materialOutbound.batch != null and materialLog.materialOutbound.batch != ''">
+ and mo.batch regexp #{materialLog.materialOutbound.batch}
</if>
</where>
</select>
@@ -1231,4 +1293,42 @@
AND date( ml.operate_time )>= #{startDate} and date(ml.operate_time) <= #{endDate}
and ml.operate_type=#{type}
</select>
+
+
+ <select id="getSelectMaterialInventoryMes">
+ select
+ mi.material_code AS materialCode,
+ sum(mi.available_quantity) AS quantity,
+ JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.width')) AS width,
+ JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.height')) AS height,
+ JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.thickness')) AS thickness,
+ JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.name')) AS name,
+ JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.model')) AS model
+ from mm.material_inventory mi left join mm.material_store ms on mi.material_code=ms.id
+ where mi.available_quantity>0
+ group by mi.material_code
+ order by mi.id desc
+ </select>
+
+ <update id="updateMaterialInventoryAll" >
+ update mm.material_inventory set date_of_manufacture=#{materialInventory.dateOfManufacture},
+ producer=#{materialInventory.producer},
+ quality_guarantee_period=#{materialInventory.qualityGuaranteePeriod},
+ inventory_area=#{materialInventory.inventoryArea},
+ remarks=#{materialInventory.remarks},
+ inventory_organization=#{materialInventory.inventoryOrganization}
+ where id=#{materialInventoryId}
+ </update>
+
+ <update id="updateMaterialInventoryOne" >
+ update mm.material_inventory set
+ quality_guarantee_period=#{materialInventory.qualityGuaranteePeriod},
+ inventory_area=#{materialInventory.inventoryArea},
+ remarks=#{materialInventory.remarks},
+ available_quantity=available_quantity+#{materialInventory.availableQuantity},
+ inventory_quantity=inventory_quantity+#{materialInventory.inventoryQuantity},
+ total_area=inventory_quantity*single_piece_area
+ where id=#{materialInventoryId}
+ </update>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0