From 950424e50bcd42cff0913fef387c537ba7dedfcc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 13 二月 2025 13:59:57 +0800
Subject: [PATCH] 修改流程卡分架界面落架顺序不正确问题，调整流程卡打印半径显示逻辑
---
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml | 82 +++++++++++++++++++++++++++-------------
1 files changed, 55 insertions(+), 27 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 675f6c9..81a02cf 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -58,7 +58,7 @@
ms.json
from mm.material_inventory mi left join mm.material_store ms on mi.material_code=ms.id
<where>
- date(mi.create_time)>=#{startDate} and date(mi.create_time) <= #{endDate} and mi.available_quantity>0
+ and mi.available_quantity>0
</where>
order by mi.id desc
@@ -72,7 +72,7 @@
from
mm.material_inventory mi
<where>
- date(mi.create_time)>=#{startDate} and date(mi.create_time) <= #{endDate} and mi.available_quantity>0
+ and mi.available_quantity>0
</where>
limit #{offset},#{pageSize};
@@ -84,7 +84,7 @@
ou.id as useId,
ou.project_no as projectNo,
mi.inventory_quantity AS inventoryQuantity,
- mi.plan_quantity AS availableQuantity,
+ mi.available_quantity AS availableQuantity,
mi.plan_quantity AS planQuantity,
mi.id,
mi.inventory_organization as inventoryOrganization,
@@ -102,8 +102,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
- date(ou.create_time)>=#{startDate} and date(ou.create_time) <= #{endDate}
+ mi.plan_quantity>0 and op.state>=100 and ou.state=1
</where>
order by ou.id desc
@@ -112,16 +111,14 @@
<select id="getSelectMaterialInventoryEngineeringDatePageTotal">
select
- CEILING(count(id)/#{pageSize}) as 'pageTotal',
- count(id) as 'total'
- from
- pp.optimize_use ou
+ CEILING(count(ou.id)/#{pageSize}) as 'pageTotal',
+ count(ou.id) as 'total'
+ 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>
- ou.not_use_count>0 and ou.state=1 and
- date(ou.create_time)>=#{startDate} and date(ou.create_time) <= #{endDate}
+ mi.plan_quantity>0 and op.state>=100 and ou.state=1
</where>
- limit #{offset},#{pageSize};
</select>
@@ -154,7 +151,6 @@
</if>
</where>
- limit #{offset},#{pageSize};
</select>
<select id="getSelectMaterialInventoryPageTotal">
@@ -170,7 +166,6 @@
</where>
- limit #{offset},#{pageSize};
</select>
<select id="getSelectMaterialInventoryEngineering">
@@ -205,7 +200,6 @@
</where>
- limit #{offset},#{pageSize};
</select>
<select id="getSelectMaterialInventoryEngineeringPageTotal">
@@ -224,7 +218,6 @@
</where>
- limit #{offset},#{pageSize};
</select>
@@ -428,7 +421,6 @@
and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
</if>
</where>
- limit #{offset},#{pageSize};
</select>
<select id="getSelectMaterialOutboundEngineering" >
@@ -459,7 +451,6 @@
and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
</if>
</where>
- limit #{offset},#{pageSize};
</select>
<select id="getSelectMaterialOutboundDetailPageTotal">
@@ -473,7 +464,6 @@
and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
</if>
</where>
- limit #{offset},#{pageSize};
</select>
@@ -511,7 +501,6 @@
and rwd.returning_id regexp #{returningWarehouseDetail.returningId}
</if>
</where>
- limit #{offset},#{pageSize};
</select>
<select id="getSelectReturningWarehouseDetailPageTotal">
@@ -549,16 +538,36 @@
delete from mm.material_outbound_detail where material_outbound_id=#{materialOutboundId}
</delete>
+ <delete id="deleteMaterialLog" >
+ delete from mm.material_log where operation_order_number=#{materialOutboundId}
+ </delete>
+
<delete id="deleteReturningWarehouseDetail" >
delete from mm.returning_warehouse_detail where returning_id=#{returningId}
</delete>
+ <delete id="deleteReturningWarehouse" >
+ delete from mm.returning_warehouse where returning_id=#{returningId}
+ </delete>
+
<select id="getMaximum" >
- select count(*) from mm.material_outbound where date(create_time)=CURDATE()
+ select
+ ifnull(SUBSTR(max(right(material_outbound_id,8)) from 7),0)
+ from
+ mm.material_outbound as a
+ where
+ date(a.create_time) = curdate()
+
</select>
<select id="getMaximums" >
- select count(*) from mm.returning_warehouse where date(create_time)=CURDATE()
+ select
+ ifnull(SUBSTR(max(right(returning_id,8)) from 7),0)
+ from
+ mm.returning_warehouse as a
+ where
+ date(a.create_time) = curdate()
+
</select>
<select id="getMaterialOutboundCount" >
@@ -747,13 +756,19 @@
<update id="updateMaterialInventory" >
update mm.material_inventory set inventory_quantity=inventory_quantity+#{materialInventory.inventoryQuantity},
available_quantity=available_quantity+#{materialInventory.inventoryQuantity},
- total_area=total_area+#{totalArea}
+ total_area=single_piece_area*inventory_quantity
where material_code=#{materialCode} and date_of_manufacture=#{materialInventory.dateOfManufacture}
</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}
+ </update>
+
<update id="updateMaterialInventoryReturning" >
- update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity},
- total_area=total_area+#{totalArea}
+ update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity}
where material_code=#{materialCode} and
date_of_manufacture=#{returningWarehouseDetail.dateOfManufacture}
@@ -761,8 +776,7 @@
</update>
<update id="updateMaterialInventoryReturningNull" >
- update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity},
- total_area=total_area+#{totalArea}
+ update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity}
where material_code=#{materialCode} and
date_of_manufacture is null
@@ -1038,5 +1052,19 @@
</select>
+ <select id="deleteMaterialInventory">
+ delete from
+ mm.material_inventory mi
+ <where>
+ <if test="ids != null and ids != ''">
+ and mi.id in
+ <foreach item="id" collection="ids" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+
+ </where>
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0