From f268121e9fe9116c19f84412b3ea992d68acf542 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 18 七月 2025 14:05:26 +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 | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 a7ca291..d173157 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
@@ -42,7 +42,12 @@
<select id="getmaximum" >
- select count(*) from sd.delivery where date(create_time)=CURDATE()
+ select
+ ifnull(SUBSTR(max(right(delivery_id,8)) from 7),0)
+ from
+ sd.delivery as a
+ where
+ date(a.create_time) = curdate()
</select>
<select id="getmaximumMonth">
@@ -74,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},
@@ -244,7 +249,8 @@
<select id="getSelectShippingOrderDetailPrinting" >
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.customer_id,d.customer_name,d.creator,d.salesman,d.salesman_id,
+ d.processing_note,d.contract_id,d.delivery_date
from sd.`order` d
<where>
<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
@@ -300,6 +306,12 @@
<if test="delivery.area != null and delivery.area != ''">
and d.area regexp REGEXP_REPLACE(#{delivery.area},'\\.0+$','')
</if>
+ <if test="delivery.deliveryState != null ">
+ and d.delivery_state = #{delivery.deliveryState}
+ </if>
+ <if test="delivery.stockState != null ">
+ and d.stock_state = #{delivery.stockState}
+ </if>
</where>
group by d.delivery_id
@@ -344,6 +356,12 @@
<if test="delivery.area != null and delivery.area != ''">
and d.area regexp REGEXP_REPLACE(#{delivery.area},'\\.0+$','')
</if>
+ <if test="delivery.deliveryState != null ">
+ and d.delivery_state = #{delivery.deliveryState}
+ </if>
+ <if test="delivery.stockState != null ">
+ and d.stock_state = #{delivery.stockState}
+ </if>
</where>
limit #{offset},#{pageSize};
</select>
--
Gitblit v1.8.0