From cf4b24b7757bc76bb9c01fe936140073cb150711 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 十二月 2025 15:37:52 +0800
Subject: [PATCH] 成品报表新增平方毫米字段

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index 5fb149d..20752c8 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -23,6 +23,7 @@
         <result column="process_id" property="processId"/>
         <result column="money" property="money"/>
         <result column="area" property="area"/>
+        <result column="square_millimeter" property="squareMillimeter"/>
 
         <result column="width" property="orderDetail.width"/>
         <result column="height" property="orderDetail.height"/>
@@ -509,11 +510,13 @@
         o.customer_name,
         o.project,
         od.price,
-        o.order_type
+        o.order_type,
+        p.thickness * fol.area as square_millimeter
         from (select *
         from mm.finished_operate_log aa where  aa.status!='宸蹭綔搴�') fol
         left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
         left join sd.`order` o on o.order_id=fol.order_id
+        left join sd.product p on p.id=od.product_id
         <where>
             date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate} and fol.operate_type=#{type}
             <if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
@@ -594,6 +597,7 @@
         from mm.finished_operate_log aa where  aa.status!='宸蹭綔搴�') fol
         left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
         left join sd.`order` o on o.order_id=fol.order_id
+        left join sd.product p on p.id=od.product_id
         <where>
             date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate} and fol.operate_type=#{type}
             <if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
@@ -806,11 +810,13 @@
                o.customer_name,
                o.project,
                od.price,
-               o.order_type
+               o.order_type,
+               p.thickness * fol.area as square_millimeter
         from (select *
               from mm.finished_operate_log aa where  aa.status!='宸蹭綔搴�') fol
                  left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
                  left join sd.`order` o on o.order_id=fol.order_id
+                 left join sd.product p on p.id=od.product_id
         where  date(fol.operate_time)>=#{dates[0]} and date(fol.operate_time) &lt;= #{dates[1]} and fol.operate_type=#{type}
 
     </select>

--
Gitblit v1.8.0