From a7d5b34a0fa720e5fd3dce1975e9dee94774a78e Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 01 九月 2025 09:31:40 +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 | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 b46655a..804b60f 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -1297,7 +1297,6 @@
<select id="getSelectMaterialInventoryMes">
select
mi.material_code AS materialCode,
- mi.producer,
sum(mi.available_quantity) AS quantity,
JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.width')) AS width,
JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.height')) AS height,
@@ -1310,4 +1309,14 @@
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