From 5cfaaffd38b1cd91e1279261fa7f5df0675117e0 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 九月 2025 16:13:04 +0800
Subject: [PATCH] 把erp中文修改成语言变量

---
 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml |    5 +++++
 1 files changed, 5 insertions(+), 0 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 2c7206a..65a1c44 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -59,6 +59,8 @@
         <result column="order_id" property="materialOutbound.orderId"/>
         <result column="project" property="materialOutbound.project"/>
         <result column="batch" property="materialOutbound.batch"/>
+
+        <result column="date_of_manufacture" property="materialOutboundDetail.dateOfManufacture"/>
     </resultMap>
 
 
@@ -1012,6 +1014,7 @@
     <select id="getMaterialLogReport" resultMap="selectMaterialOutboundLog">
         select *
         from mm.material_log ml left join mm.material_outbound mo on mo.material_outbound_id=ml.operation_order_number
+        left join mm.material_outbound_detail md on md.material_outbound_id=ml.operation_order_number and md.material_outbound_number=ml.operation_number
         <where>
             date(ml.operate_time)>=#{startDate} and date(ml.operate_time) &lt;= #{endDate} and ml.operate_type=#{type}
             <if test="materialLog.operateType != null and materialLog.operateType != ''">
@@ -1085,6 +1088,7 @@
         select CEILING(count(ml.id)/#{pageSize}) as 'pageTotal',
         count(ml.id) as 'total'
         from mm.material_log ml left join mm.material_outbound mo on mo.material_outbound_id=ml.operation_order_number
+        left join mm.material_outbound_detail md on md.material_outbound_id=ml.operation_order_number and md.material_outbound_number=ml.operation_number
         <where>
             date(ml.operate_time)>=#{startDate} and date(ml.operate_time) &lt;= #{endDate} and ml.operate_type=#{type}
             <if test="materialLog.operateType != null and materialLog.operateType != ''">
@@ -1155,6 +1159,7 @@
     <select id="exportMaterialLogReport" >
         select *
         from mm.material_log ml left join mm.material_outbound mo on mo.material_outbound_id=ml.operation_order_number
+                                left join mm.material_outbound_detail md on md.material_outbound_id=ml.operation_order_number and md.material_outbound_number=ml.operation_number
         where  date(ml.operate_time)>=#{dates[0]} and date(ml.operate_time) &lt;= #{dates[1]} and ml.operate_type=#{type}
 
     </select>

--
Gitblit v1.8.0