From 7cf8f8fc1abca63423c1fb4618363f8a9d283f9d Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期二, 04 十一月 2025 14:56:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
index 575b2ee..e88ee48 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -73,6 +73,7 @@
         <result column="delivery_detail_remakes" property="deliveryDetailRemakes"/>
         <result column="delivery_detail_state" property="deliveryDetailState"/>
         <result column="create_time" property="createTime"/>
+        <result column="box_no" property="boxNo"/>
 
         <result column="customer_id" property="delivery.customerId"/>
         <result column="customer_name" property="delivery.customerName"/>
@@ -94,6 +95,7 @@
         <result column="product_name" property="orderDetail.productName"/>
         <result column="width" property="orderDetail.width"/>
         <result column="height" property="orderDetail.height"/>
+        <result column="building_number" property="orderDetail.buildingNumber"/>
 
         <result column="other_money" property="order.otherMoney"/>
         <result column="batch" property="order.batch"/>
@@ -592,7 +594,9 @@
         d.freight,
         o.batch,
         od.width,
-        od.height
+        od.height,
+        od.building_number,
+        dd.box_no
         from sd.delivery_detail dd
         left join sd.delivery d on dd.delivery_id=d.delivery_id
         left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
@@ -607,6 +611,12 @@
             </if>
             <if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.height != null and deliveryDetail.orderDetail.height != '')">
                 and od.height regexp REGEXP_REPLACE(#{deliveryDetail.orderDetail.height},'\\.0+$','')
+            </if>
+            <if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.buildingNumber != null and deliveryDetail.orderDetail.buildingNumber != '')">
+                and od.building_number like concat('%',#{deliveryDetail.orderDetail.buildingNumber},'%')
+            </if>
+            <if test="deliveryDetail.boxNo != null and deliveryDetail.boxNo != ''">
+                and dd.box_no like concat('%',#{deliveryDetail.boxNo},'%')
             </if>
             <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
                 and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
@@ -707,6 +717,21 @@
         left join sd.`order` o on dd.order_id=o.order_id
         <where>
             and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}
+            <if test="deliveryDetail.order!=null and (deliveryDetail.order.batch != null and deliveryDetail.order.batch != '')">
+                and o.batch like concat('%',#{deliveryDetail.order.batch},'%')
+            </if>
+            <if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.width != null and deliveryDetail.orderDetail.width != '')">
+                and od.width regexp REGEXP_REPLACE(#{deliveryDetail.orderDetail.width},'\\.0+$','')
+            </if>
+            <if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.height != null and deliveryDetail.orderDetail.height != '')">
+                and od.height regexp REGEXP_REPLACE(#{deliveryDetail.orderDetail.height},'\\.0+$','')
+            </if>
+            <if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.buildingNumber != null and deliveryDetail.orderDetail.buildingNumber != '')">
+                and od.building_number like concat('%',#{deliveryDetail.orderDetail.buildingNumber},'%')
+            </if>
+            <if test="deliveryDetail.boxNo != null and deliveryDetail.boxNo != ''">
+                and dd.box_no like concat('%',#{deliveryDetail.boxNo},'%')
+            </if>
             <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
                 and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
             </if>
@@ -791,6 +816,7 @@
             <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightPrice != null )">
                 and d.freight_price regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freightPrice},'\\.0+$','')
             </if>
+
         </where>
         order by dd.delivery_id,dd.delivery_number
     </select>
@@ -1322,7 +1348,9 @@
         d.freight_quantity,
         od.width,
         od.height,
-        o.batch
+        o.batch,
+        od.building_number,
+        dd.box_no
         from sd.delivery_detail dd
         left join sd.delivery d on dd.delivery_id=d.delivery_id
         left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number

--
Gitblit v1.8.0