From ce06fcc3113dc45647910deef0e4adeaa97bfa3f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 15 十月 2025 13:32:40 +0800
Subject: [PATCH] 语言修改

---
 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 50 insertions(+), 2 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 06eb1a9..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 != ''">
@@ -1152,12 +1156,56 @@
     </select>
 
 
-    <select id="exportMaterialLogReport">
-        select * from mm.material_log ml
+    <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>
 
+    <select id="exportMaterialLogReports" >
+        select *
+        from mm.material_log ml
+        where  date(ml.operate_time)>=#{dates[0]} and date(ml.operate_time) &lt;= #{dates[1]} and ml.operate_type=#{type}
+
+    </select>
+
+    <select id="exportMaterialLogOptimizeOutboundReport">
+        SELECT
+        ml.id,
+        ml.operate_type,
+        ml.operation_order_number,
+        ml.project_no,
+        ml.producer,
+        ml.inventory_area,
+        ml.remarks,
+        ml.inventory_id,
+        ml.material_code,
+        ml.material_name,
+        ml.unit,
+        ml.width,
+        ml.height,
+        ml.thickness,
+        ml.quantity,
+        round(ml.width*ml.height*ml.quantity/1000000,2) as area,
+        ou.use_count,
+        ou.not_use_count,
+        ml.operator,
+        ml.operate_time,
+        ml.project_no,
+        ml.operation_number
+
+        FROM
+        mm.material_log AS ml
+        LEFT JOIN pp.optimize_use AS ou ON ou.project_no = ml.project_no
+        AND ou.raw_stock_code = ml.inventory_id
+        WHERE
+        ou.project_no IS NOT NULL
+        AND date(ml.operate_time)>=#{dates[0]} and date(ml.operate_time) &lt;= #{dates[1]} and ml.operate_type='鐗╂枡鍑哄簱'
+        order by ml.id desc
+    </select>
+
     <select id="deleteMaterialInventory">
         delete from
         mm.material_inventory mi

--
Gitblit v1.8.0