From b499a7e1dbcc4b9dbcdcaa46bbf5c24271bf6698 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 11 八月 2025 16:54:05 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml | 18 +++++++++++++-----
1 files changed, 13 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 21934e4..804b60f 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -1296,19 +1296,27 @@
<select id="getSelectMaterialInventoryMes">
select
- mi.id,
mi.material_code AS materialCode,
- mi.producer,
- sum(mi.available_quantity) AS availableQuantity,
+ 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,
- JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.unit')) AS unit
+ 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>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0