From 5a354d67a0e62c63bef598dfcc96e3d54f50d2b2 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 24 七月 2025 09:05:01 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
index 7fbb747..d173157 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
@@ -79,7 +79,7 @@
update sd.delivery set payment_terms=#{delivery.paymentTerms},
delivery_date=#{delivery.deliveryDate},
pay_method=#{delivery.payMethod},
- pay_date=#{delivery.payDate},contacts=#{delivery.creator},contact_number=#{delivery.contactNumber},
+ pay_date=#{delivery.payDate},contacts=#{delivery.contacts},contact_number=#{delivery.contactNumber},
delivery_address=#{delivery.deliveryAddress},
freight=#{delivery.freightPrice}*#{delivery.freightQuantity},
freight_price=#{delivery.freightPrice},
@@ -250,7 +250,7 @@
select
d.order_id,d.quantity,round(d.money,0) as money ,d.area,d.project,
d.customer_id,d.customer_name,d.creator,d.salesman,d.salesman_id,
- d.processing_note,d.contract_id
+ d.processing_note,d.contract_id,d.delivery_date
from sd.`order` d
<where>
<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
--
Gitblit v1.8.0