From b9e4e2edbb3767ee347a91d2238544ae736b53c0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 22 七月 2025 10:29:27 +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 | 309 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 278 insertions(+), 31 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 17c2508..21934e4 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">
@@ -83,7 +109,7 @@
ou.project_no as projectNo,
mi.inventory_quantity AS inventoryQuantity,
mi.available_quantity AS availableQuantity,
- mi.plan_quantity AS planQuantity,
+ ou.not_use_count AS planQuantity,
mi.id,
mi.inventory_organization as inventoryOrganization,
mi.material_code AS materialCode,
@@ -100,7 +126,7 @@
ms.json from pp.optimize_use ou left join mm.material_inventory mi on ou.raw_stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id
left join pp.optimize_project op on op.project_no=ou.project_no
<where>
- mi.plan_quantity>0 and op.state>=100 and ou.state=1
+ ou.not_use_count>0 and mi.plan_quantity>0 and op.state>=100 and ou.state=1
</where>
order by ou.id desc
@@ -170,8 +196,9 @@
ou.id as useId,
ou.project_no as projectNo,
mi.inventory_quantity AS inventoryQuantity,
- mi.plan_quantity AS availableQuantity,
- mi.plan_quantity AS planQuantity,
+ 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,
@@ -246,8 +273,14 @@
<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.reviewed_state desc,mo.create_time desc
+ order by mo.create_time desc
limit #{offset},#{pageSize};
</select>
@@ -280,8 +313,13 @@
<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>
- limit #{offset},#{pageSize};
</select>
@@ -363,7 +401,6 @@
and rw.batch regexp #{returningWarehouse.batch}
</if>
</where>
- limit #{offset},#{pageSize};
</select>
<select id="getSelectMaterialOutbound">
@@ -422,6 +459,7 @@
<select id="getSelectMaterialOutboundEngineering" >
select
+ ou.id as useId,
ou.project_no as projectNo,
modd.inventory_id as id,
modd.inventory_organization as inventoryOrganization,
@@ -511,7 +549,6 @@
and rwd.returning_id regexp #{returningWarehouseDetail.returningId}
</if>
</where>
- limit #{offset},#{pageSize};
</select>
@@ -537,6 +574,10 @@
<delete id="deleteMaterialLog" >
delete from mm.material_log where operation_order_number=#{materialOutboundId}
+ </delete>
+
+ <delete id="deleteMaterialLogById" >
+ delete from mm.material_log where id=#{id}
</delete>
<delete id="deleteReturningWarehouseDetail" >
@@ -584,11 +625,11 @@
</select>
<select id="getMaterialInventoryCount" >
- select count(*) 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}
</select>
<select id="getMaterialInventoryCountNull" >
- select count(*) 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
</select>
<select id="getMaterialInventoryCountId" >
@@ -609,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>
@@ -624,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>
@@ -682,14 +725,14 @@
</insert>
<update id="updateMaterialInventoryAvailableOptOut">
- update mm.material_inventory
- set available_quantity=available_quantity-#{quantity}
+ update pp.optimize_use
+ set not_use_count=not_use_count-#{quantity}
where id=#{useId}
</update>
<update id="updateMaterialInventoryAvailableOptInt">
- update mm.material_inventory
- set available_quantity=available_quantity+#{quantity}
+ update pp.optimize_use
+ set not_use_count=not_use_count+#{quantity}
where id=#{useId}
</update>
@@ -705,15 +748,27 @@
where id=#{inventoryId}
</update>
- <update id="updateMaterialInventoryInventoryOut">
+ <update id="updateMaterialInventoryInventoryPlanQuantityOut">
update mm.material_inventory
set inventory_quantity=inventory_quantity-#{quantity},plan_quantity=if(plan_quantity-#{quantity}>=0,plan_quantity-#{quantity},0),total_area=inventory_quantity*single_piece_area
where id=#{inventoryId}
</update>
- <update id="updateMaterialInventoryInventoryInt">
+ <update id="updateMaterialInventoryInventoryPlanQuantityInt">
update mm.material_inventory
set inventory_quantity=inventory_quantity+#{quantity},plan_quantity=plan_quantity+#{quantity},total_area=inventory_quantity*single_piece_area
+ where id=#{inventoryId}
+ </update>
+
+ <update id="updateMaterialInventoryInventoryOut">
+ update mm.material_inventory
+ set inventory_quantity=inventory_quantity-#{quantity},total_area=inventory_quantity*single_piece_area
+ where id=#{inventoryId}
+ </update>
+
+ <update id="updateMaterialInventoryInventoryInt">
+ update mm.material_inventory
+ set inventory_quantity=inventory_quantity+#{quantity},total_area=inventory_quantity*single_piece_area
where id=#{inventoryId}
</update>
@@ -726,6 +781,13 @@
<update id="updateMaterialInventoryAvailableInventoryInt">
update mm.material_inventory
set available_quantity=available_quantity+#{quantity},inventory_quantity=inventory_quantity+#{quantity},total_area=inventory_quantity*single_piece_area
+ where id=#{inventoryId}
+ </update>
+
+ <update id="updateMaterialInventoryAvailableInventoryOutMes">
+ update mm.material_inventory
+ set available_quantity=available_quantity-#{quantity},inventory_quantity=inventory_quantity-#{quantity},
+ plan_quantity=plan_quantity-#{quantity},total_area=inventory_quantity*single_piece_area
where id=#{inventoryId}
</update>
@@ -761,7 +823,21 @@
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}
+ where material_code=#{materialCode} and date_of_manufacture is null
+ </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}
+ </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
</update>
<update id="updateMaterialInventoryReturning" >
@@ -924,9 +1000,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 != ''">
@@ -952,13 +1028,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}
@@ -976,7 +1052,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
@@ -987,7 +1075,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 != ''">
@@ -1013,13 +1101,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}
@@ -1037,7 +1125,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>
@@ -1063,5 +1163,152 @@
</where>
</select>
+ <select id="getSelectMaterialOutboundProjectNo">
+ select * from mm.material_outbound mo where order_id=#{projectNo}
+ </select>
+ <select id="getSelectOptimizeUses">
+ 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>
+ mo.material_outbound_id=#{materialOutboundId}
+ <if test="useId != null">
+ and mo.use_id=#{useId}
+ </if>
+ </where>
+ </select>
+
+ <update id="updateMaterialOutboundOptimizeUses">
+ update mm.material_outbound_detail set outbound_quantity=outbound_quantity+#{quantity} where use_id=#{useId};
+ </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},
+ #{singlePieceArea},#{inventoryArea},#{dateOfManufacture}
+ )
+ </insert>
+
+ <insert id="insertMaterialOutboundOptimizeUses" useGeneratedKeys="true" >
+ 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>
+
+ <select id="getOptimizeOutboundReport">
+ SELECT
+ ml.operation_order_number,
+ ml.project_no,
+ ml.inventory_id,
+ ml.material_name,
+ ml.unit,
+ ml.width,
+ ml.height,
+ ml.thickness,
+ ml.quantity,
+ round(ml.width*ml.height*ml.quantity/1000000,2) as area,
+ ou.use_count,
+ ou.not_use_count,
+ ml.operator,
+ ml.operate_time
+
+ FROM
+ mm.material_log AS ml
+ LEFT JOIN pp.optimize_use AS ou ON ou.project_no = ml.project_no
+ AND ou.raw_stock_code = ml.inventory_id
+ WHERE
+ ou.project_no IS NOT NULL
+ AND date( ml.operate_time )>= #{startDate} and date(ml.operate_time) <= #{endDate}
+ and ml.operate_type=#{type}
+
+ <if test="materialLog.operationOrderNumber != null and materialLog.operationOrderNumber != ''">
+ and ml.operation_order_number regexp #{materialLog.operationOrderNumber}
+ </if>
+ <if test="materialLog.useCount != null and materialLog.useCount != ''">
+ and ou.use_count regexp #{materialLog.useCount}
+ </if>
+ <if test="materialLog.quantity != null and materialLog.quantity != ''">
+ and ml.quantity regexp #{materialLog.quantity}
+ </if>
+ <if test="materialLog.width != null and materialLog.width != ''">
+ and ml.width regexp REGEXP_REPLACE(#{materialLog.width},'\\.0+$','')
+ </if>
+ <if test="materialLog.height != null and materialLog.height != ''">
+ and ml.height regexp REGEXP_REPLACE(#{materialLog.height},'\\.0+$','')
+ </if>
+ <if test="materialLog.thickness != null and materialLog.thickness != ''">
+ and ml.thickness regexp REGEXP_REPLACE(#{materialLog.thickness},'\\.0+$','')
+ </if>
+
+ <if test="materialLog.inventoryId != null and materialLog.inventoryId != ''">
+ and ml.inventory_id regexp #{materialLog.inventoryId}
+ </if>
+
+ <if test="materialLog.materialName != null and materialLog.materialName != ''">
+ and ml.material_name regexp #{materialLog.materialName}
+ </if>
+ <if test="materialLog.producer != null and materialLog.producer != ''">
+ and ml.producer regexp #{materialLog.producer}
+ </if>
+ <if test="materialLog.unit != null and materialLog.unit != ''">
+ and ml.unit regexp #{materialLog.unit}
+ </if>
+ <if test="materialLog.operator != null and materialLog.operator != ''">
+ and ml.operator regexp #{materialLog.operator}
+ </if>
+ <if test="materialLog.remarks != null and materialLog.remarks != ''">
+ and ml.remarks regexp #{materialLog.remarksr}
+ </if>
+ order by ml.id desc
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="getOptimizeOutboundReportTotal">
+ SELECT
+ CEILING(count(ml.id)/#{pageSize}) as 'pageTotal',
+ count(ml.id) as 'total'
+
+ FROM
+ mm.material_log AS ml
+ LEFT JOIN pp.optimize_use AS ou ON ou.project_no = ml.project_no
+ AND ou.raw_stock_code = ml.inventory_id
+ WHERE
+ ou.project_no IS NOT NULL
+ AND date( ml.operate_time )>= #{startDate} and date(ml.operate_time) <= #{endDate}
+ and ml.operate_type=#{type}
+ </select>
+
+
+ <select id="getSelectMaterialInventoryMes">
+ select
+ mi.id,
+ mi.material_code AS materialCode,
+ mi.producer,
+ sum(mi.available_quantity) AS availableQuantity,
+ 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,
+ JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.unit')) AS unit
+ 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>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0