From a26e834d87b2f03dd7768fddb1c3ba946a08c314 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 05 七月 2024 18:20:25 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml | 6 +++++-
1 files changed, 5 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 bc3dad1..bf3d5be 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
@@ -130,6 +130,10 @@
limit #{offset},#{pageSize};
</select>
+ <select id="selectOrderId" >
+ select * from sd.`order` where order_id=#{orderId}
+ </select>
+
<select id="getSelectOrderInventoryPageTotal" >
select CEILING(count(zu.order_id)/#{pageSize}) as 'pageTotal',
count(zu.order_id) as 'total' from
@@ -218,7 +222,7 @@
<select id="getSelectShippingOrderDetailPrinting" >
select
- d.order_id,d.quantity,d.money,d.area,d.project,
+ 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
from sd.`order` d
<where>
--
Gitblit v1.8.0