From e748d7c052c9b06f2a2ffe5dbc1cb21babfdbdb4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 05 七月 2024 10:09:07 +0800
Subject: [PATCH] 添加右键菜单相关语言，对应界面添加客户名称字段，配置标签打印按钮和打印类型下拉框
---
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 9ab2ac2..bf3d5be 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
@@ -37,7 +37,7 @@
</update>
<update id="updatedelivery">
- update sd.delivery set area=#{area},quantity=#{quantity},money=#{money} where delivery_id=#{oddNumber}
+ update sd.delivery set area=#{area},quantity=#{quantity},money=#{money},other_money=#{otherMoney} where delivery_id=#{oddNumber}
</update>
@@ -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
@@ -216,6 +220,19 @@
</where>
</select>
+ <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
+ from sd.`order` d
+ <where>
+ <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
+ and d.order_id like concat('%',#{orderDetail.orderId},'%')
+ </if>
+
+ </where>
+ </select>
+
<select id="getSelectShippingOrderDetailDeliverys" >
select customer_id,customer_name,project,salesman,salesman_id,contacts,contact_number,delivery_address from sd.`order`
--
Gitblit v1.8.0