From 51eea7d273f662228c73c216f7d8790f9e94ede6 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 31 十月 2025 10:21:26 +0800
Subject: [PATCH] 发货首页新增批次列
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml | 45 ++++++++++++++++++++++++++++++++++++++++++---
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue | 1 +
north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java | 2 ++
3 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
index f813054..80d457c 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
@@ -487,6 +487,7 @@
{field: 'customerName',width:120, title: t('customer.customerName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'orderId',width:120, title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'project',width:120, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'order.batch',width:120, title: t('order.batch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'money',width:120, title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'paymentTerms',width:120, title: t('delivery.paymentTerms'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'payMethod',width:120, title:t('delivery.paymentMethod'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java
index be8252a..1a53325 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java
@@ -42,4 +42,6 @@
private LocalDate createTime;
private LocalDate updateTime;
+ private Order order;
+
}
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 953bc40..7c5ff06 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
@@ -28,6 +28,37 @@
<result column="quantity_available" property="finishedGoodsInventory.quantityAvailable"/>
</resultMap>
+ <resultMap id="selectDeliveryOrder" type="com.example.erp.entity.sd.Delivery">
+
+ <result column="id" property="id"/>
+ <result column="delivery_state" property="deliveryState"/>
+ <result column="stock_state" property="stockState"/>
+ <result column="payment_terms" property="paymentTerms"/>
+ <result column="delivery_id" property="deliveryId"/>
+ <result column="order_id" property="orderId"/>
+ <result column="project" property="project"/>
+ <result column="customer_id" property="customerId"/>
+ <result column="customer_name" property="customerName"/>
+ <result column="delivery_date" property="deliveryDate"/>
+ <result column="pay_method" property="payMethod"/>
+ <result column="pay_date" property="payDate"/>
+ <result column="salesman_id" property="salesmanId"/>
+ <result column="salesman" property="salesman"/>
+ <result column="creator_id" property="creatorId"/>
+ <result column="creator" property="creator"/>
+ <result column="contacts" property="contacts"/>
+ <result column="contact_number" property="contactNumber"/>
+ <result column="delivery_address" property="deliveryAddress"/>
+ <result column="area" property="area"/>
+
+ <result column="quantity" property="quantity"/>
+ <result column="money" property="money"/>
+ <result column="other_money" property="otherMoney"/>
+ <result column="remarks" property="remarks"/>
+ <result column="create_time" property="createTime"/>
+ <result column="batch" property="order.batch"/>
+ </resultMap>
+
<delete id="deleteDelivery">
delete from sd.delivery where delivery_id=#{deliveryId}
@@ -272,8 +303,9 @@
limit 0,1
</select>
- <select id="getSelectShippingOrder">
+ <select id="getSelectShippingOrder" resultMap="selectDeliveryOrder">
select * from sd.delivery d left join sd.delivery_detail dd on d.delivery_id=dd.delivery_id
+ left join sd.order o on o.order_id=d.order_id
<where>
date(d.create_time)>=#{startDate} and date(d.create_time) <= #{endDate}
<if test="delivery.deliveryId != null and delivery.deliveryId != ''">
@@ -312,6 +344,9 @@
<if test="delivery.stockState != null ">
and d.stock_state = #{delivery.stockState}
</if>
+ <if test="delivery.order != null and delivery.order.batch != null and delivery.order.batch != ''">
+ and o.batch regexp #{delivery.order.batch}
+ </if>
</where>
group by d.delivery_id
@@ -321,9 +356,10 @@
<select id="getSelectShippingOrderPageTotal">
select
- CEILING(count(id)/#{pageSize}) as 'pageTotal',
- count(id) as 'total'
+ CEILING(count(d.id)/#{pageSize}) as 'pageTotal',
+ count(d.id) as 'total'
from sd.delivery d
+ left join sd.order o on o.order_id=d.order_id
<where>
date(d.create_time)>=#{startDate} and date(d.create_time) <= #{endDate}
<if test="delivery.deliveryId != null and delivery.deliveryId != ''">
@@ -362,6 +398,9 @@
<if test="delivery.stockState != null ">
and d.stock_state = #{delivery.stockState}
</if>
+ <if test="delivery.order != null and delivery.order.batch != null and delivery.order.batch != ''">
+ and o.batch regexp #{delivery.order.batch}
+ </if>
</where>
limit #{offset},#{pageSize};
</select>
--
Gitblit v1.8.0