From 130fe64dd3eb0617ddc1f38afcd07656d56db27c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 12 十二月 2025 08:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml |   45 +++++++++++++++++++++++++++++++++++++--------
 1 files changed, 37 insertions(+), 8 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 417c11c..5fb149d 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -64,10 +64,23 @@
         fol.money,
         o.customer_name,
         o.project,
-        od.price
+        od.price,
+        CASE
+        WHEN #{type} = '鍏ュ簱' THEN
+            if(fgi.quantity_available>fol.quantity,fol.quantity,fgi.quantity_available)
+        ELSE
+            0
+        END AS quantity_available,
+        CASE
+        WHEN #{type} = '鍏ュ簱' THEN
+        if(fgi.quantity_available>fol.quantity,fol.quantity,fgi.quantity_available)
+        ELSE
+        0
+        END AS cancelAvailable
         from (select *
         from mm.finished_operate_log aa where aa.operate_type = #{type}  and 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 mm.finished_goods_inventory fgi on fgi.order_id = fol.order_id and fol.operation_number = fgi.order_number and fgi.box_no=fol.remarks
         left join sd.`order` o on o.order_id=fol.order_id
         <where>
             date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
@@ -135,16 +148,20 @@
                 and o.project regexp #{finishedOperateLog.order.project}
             </if>
         </where>
+        group by fol.order_id,fol.operation_number,fol.remarks
         order by fol.operate_time desc
         limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectStorageRecordLogPageTotal">
-        select CEILING(count(fol.id)/#{pageSize}) as 'pageTotal',
-        count(fol.id) as 'total'
+        select
+        CEILING(count(zu.id)/#{pageSize}) as 'pageTotal',
+        count(zu.id) as 'total' from (
+        select fol.id
         from (select *
         from mm.finished_operate_log aa where aa.operate_type = #{type}  and 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 mm.finished_goods_inventory fgi on fgi.order_id = fol.order_id and fol.operation_number = fgi.order_number and fgi.box_no=fol.remarks
         left join sd.`order` o on o.order_id=fol.order_id
         <where>
             date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
@@ -212,7 +229,9 @@
                 and o.project regexp #{finishedOperateLog.order.project}
             </if>
         </where>
+        group by fol.order_id,fol.operation_number,fol.remarks
         order by fol.`status` desc
+        ) as zu
     </select>
 
     <update id="updateToExamine">
@@ -221,6 +240,11 @@
 
     <update id="updateFinishedOperateLogState">
         update mm.finished_operate_log set status=#{type} where id=#{finishedOperateLog.id};
+    </update>
+
+    <update id="updateFinishedOperateLogQuantity">
+        update mm.finished_operate_log set quantity=quantity-#{finishedOperateLog.cancelAvailable},
+                                           area=area-#{deliveryDetailArea},money=money-#{deliveryDetailMoney}  where id=#{finishedOperateLog.id};
     </update>
 
     <select id="getSelectOperateRecord" resultMap="selectFinishedGoodsInventory">
@@ -803,17 +827,18 @@
                                             status,
                                             area,
                                             compute_area,
-                                            remarks
+                                            remarks,
+                                            money
         )
         values (
-                   #{oddNumber} ,#{orderDetail.orderId},"",#{orderDetail.orderNumber},"鍏ュ簱",#{userName},#{orderDetail.quantity},now(),"鏈鏍�",
-                #{orderDetail.computeGrossArea},#{orderDetail.computeArea},""
+                   #{oddNumber} ,#{orderDetail.orderId},#{processId},#{orderDetail.orderNumber},"鍏ュ簱",#{userName},#{orderDetail.quantity},now(),"鏈鏍�",
+                #{orderDetail.computeGrossArea},#{orderDetail.computeArea},"",#{orderDetail.grossAmount}
                )
     </insert>
 
-    <delete id="updateOrderFinishedOperateLog"  >
+    <update id="updateOrderFinishedOperateLog"  >
         update  mm.finished_operate_log set status="宸蹭綔搴�" where order_id=#{orderDetail.orderId} and operation_number=#{orderDetail.orderNumber} and operate_type="鍏ュ簱";
-    </delete>
+    </update>
 
     <select id="getSelectStorageRecordPint" resultMap="selectFinishedGoodsInventory">
         select fol.id,
@@ -1076,4 +1101,8 @@
         left join sd.`order` o on o.order_id=fol.order_id
         where fol.operation_order_number=#{deliveryId}
     </select>
+
+
+
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0