From 9ccc8bd3a53160a40cf60f14e5867f6ce9f6c58f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 16:49:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml | 73 ++++++++++++++++++++++++++++++------
1 files changed, 61 insertions(+), 12 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 7fbb747..57931dc 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}
@@ -79,7 +110,7 @@
update sd.delivery set payment_terms=#{delivery.paymentTerms},
delivery_date=#{delivery.deliveryDate},
pay_method=#{delivery.payMethod},
- pay_date=#{delivery.payDate},contacts=#{delivery.creator},contact_number=#{delivery.contactNumber},
+ pay_date=#{delivery.payDate},contacts=#{delivery.contacts},contact_number=#{delivery.contactNumber},
delivery_address=#{delivery.deliveryAddress},
freight=#{delivery.freightPrice}*#{delivery.freightQuantity},
freight_price=#{delivery.freightPrice},
@@ -148,9 +179,6 @@
<if test="order.createTime != null and order.createTime != ''">
and o.create_time REGEXP #{order.createTime}
</if>
- <if test="order.finishedGoodsInventory.quantityAvailable != null and order.finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available REGEXP #{order.finishedGoodsInventory.quantityAvailable}
- </if>
</where>
group by o.order_id order by o.id desc
limit #{offset},#{pageSize};
@@ -206,9 +234,6 @@
<if test="order.createTime != null and order.createTime != ''">
and o.create_time REGEXP #{order.createTime}
</if>
- <if test="order.finishedGoodsInventory.quantityAvailable != null and order.finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available REGEXP #{order.finishedGoodsInventory.quantityAvailable}
- </if>
</where>
group by o.order_id limit #{offset},#{pageSize}) as zu;
@@ -250,7 +275,7 @@
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.processing_note,d.contract_id
+ d.processing_note,d.contract_id,d.delivery_date
from sd.`order` d
<where>
<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
@@ -272,8 +297,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,18 +338,31 @@
<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
- order by d.id desc
+ order by
+ <if test="orderBy == null ">
+ d.id desc
+ </if>
+ <if test="orderBy == 'desc'">
+ d.${field} desc
+ </if>
+ <if test="orderBy == 'asc'">
+ d.${field}
+ </if>
limit #{offset},#{pageSize};
</select>
<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 +401,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>
@@ -372,4 +414,11 @@
where delivery_id = #{deliveryId}
</update>
+
+ <select id="selectByDate">
+ select * from sd.delivery
+ where date(create_time) between #{startDate} and #{endDate}
+ </select>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0