From bb85dbc5fc9a9ddda99132ae16887fd27959a854 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 06 一月 2025 16:18:48 +0800
Subject: [PATCH] 补充注释、语言，转工单时添加未勾选数据时的弹窗，修改报工新增查询复合工序不能查询出每一层的问题，修改次破报表响应超时问题
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml | 10 ++++++++--
1 files changed, 8 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 3ca6c8c..83678dc 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">
@@ -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
from sd.`order` d
<where>
<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
--
Gitblit v1.8.0