From ee4dc5d6c9d3bc8ae8e704f93fa6b233e8b42e8f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 31 五月 2024 11:49:55 +0800
Subject: [PATCH] 首页分成两张表格
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 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 cb84eab..cedcebe 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -34,6 +34,7 @@
<result column="batch" property="order.batch"/>
<result column="t_quantity" property="order.quantity"/>
+ <result column="calculate_type" property="order.calculateType"/>
<result column="customer_id" property="delivery.customerId"/>
@@ -151,7 +152,7 @@
values (
#{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeGrossArea},
#{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
- #{orderDetail.price}*#{orderDetail.deliveryDetail.quantity},'',1,#{orderDetail.otherColumns},now()
+ #{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now()
)
</insert>
@@ -351,6 +352,7 @@
select od.order_id,
od.order_number,
o.batch,
+ o.calculate_type,
fgi.quantity_available,
od.quantity- od.delivery_num as t_quantity,
od.quantity as o_quantity,
@@ -895,7 +897,7 @@
dd.money,
dd.area,
ifnull(od.processing_note,"") as processingNote,
- ifnull(od.building_number,"") as buildingNumber,
+ ifnull(od.remarks,"") as buildingNumber,
od.price
from delivery_detail dd
left join order_detail od on dd.order_id = od.order_id and dd.order_number = od.order_number
--
Gitblit v1.8.0