From 606e7a619b7d3f6388c19c462b74f60ea2334ea4 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 25 二月 2025 08:55:25 +0800
Subject: [PATCH] 修改配置文件
---
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 5fc2cbc..6a98ee0 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -172,6 +172,7 @@
mi.inventory_quantity AS inventoryQuantity,
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,
@@ -957,13 +958,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}
@@ -1018,13 +1019,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}
--
Gitblit v1.8.0