From 518797582b1d922a74fa6ccdf59da85d1aa8a47e Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 六月 2024 11:39:42 +0800
Subject: [PATCH] 提交发货打印

---
 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
index 328b8a2..3d888f4 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -150,7 +150,7 @@
         insert into sd.delivery_detail (delivery_id,delivery_number,order_number,
                                         area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time)
         values (
-                   #{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeGrossArea},
+                   #{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeArea}*#{orderDetail.deliveryDetail.quantity},
                 #{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
                 #{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now()
                )
@@ -888,7 +888,7 @@
     </select>
 
     <select id="getSelectOrderPrinting"  >
-        select od.order_id,od.product_id,od.product_name,sum(od.area) as area,sum(od.gross_amount) as money,sum(od.quantity) as quantity from
+        select od.order_id,od.product_id,od.product_name,sum(od.compute_gross_area) as area,sum(od.gross_amount) as money,sum(od.quantity) as quantity from
          order_detail od
         <where>
             <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
@@ -925,7 +925,7 @@
                od.height,
                od.quantity,
                od.gross_amount,
-               od.area,
+               od.compute_gross_area,
                ifnull(od.processing_note,"") as processingNote,
                ifnull(od.remarks,"") as buildingNumber,
                od.price

--
Gitblit v1.8.0