From 54c2f0fda44123782e5241ff7d1ad6e81c95f2b2 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 12 十一月 2024 15:52:32 +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 | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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..0c70752 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">
@@ -300,6 +305,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 +355,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