From c3e3920e4e7fcda3dd986c00bb80188381e93015 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 四月 2024 09:59:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml | 191 ++++++++++++++++++++++++++++++-----------------
1 files changed, 123 insertions(+), 68 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml
index 99bea70..f83bba4 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml
@@ -63,6 +63,7 @@
<result column="o_quantity" property="quantity"/>
<result column="delivery_id" property="deliveryId"/>
<result column="delivery_number" property="deliveryNumber"/>
+ <result column="quantity" property="quantity"/>
<result column="area" property="area"/>
<result column="money" property="money"/>
<result column="delivery_detail_remakes" property="deliveryDetailRemakes"/>
@@ -81,6 +82,28 @@
<result column="delivery_date" property="delivery.deliveryDate"/>
<result column="creator" property="delivery.creator"/>
<result column="salesman" property="delivery.salesman"/>
+
+
+
+ </resultMap>
+
+ <resultMap id="selectDeliveryDetailOrderDetail" type="com.example.erp.entity.sd.DeliveryDetail">
+
+ <result column="order_number" property="orderNumber"/>
+ <result column="o_quantity" property="quantity"/>
+ <result column="delivery_id" property="deliveryId"/>
+ <result column="delivery_number" property="deliveryNumber"/>
+ <result column="quantity" property="quantity"/>
+ <result column="area" property="area"/>
+ <result column="money" property="money"/>
+ <result column="delivery_detail_remakes" property="deliveryDetailRemakes"/>
+ <result column="delivery_detail_state" property="deliveryDetailState"/>
+ <result column="create_time" property="createTime"/>
+
+ <result column="product_id" property="orderDetail.productId"/>
+ <result column="product_name" property="orderDetail.productName"/>
+ <result column="order_id" property="orderDetail.orderId"/>
+
@@ -500,68 +523,69 @@
from sd.delivery_detail dd
left join sd.delivery d on dd.delivery_id=d.delivery_id
<where>
+ and date(dd.create_time)>=#{startDate} and date(dd.create_time) <= #{endDate}
<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
- and dd.delivery_id regexp #{deliveryDetail.deliveryId}
+ and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
</if>
<if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
- and dd.delivery_number regexp #{deliveryDetail.deliveryNumber}
+ and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
</if>
<if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
- and dd.order_id regexp #{deliveryDetail.orderId}
+ and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
</if>
<if test="deliveryDetail.orderNumber != null and deliveryDetail.orderNumber != ''">
- and dd.order_number regexp #{deliveryDetail.orderNumber}
+ and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')
</if>
<if test="deliveryDetail.area != null and deliveryDetail.area != ''">
- and dd.area regexp #{deliveryDetail.area}
+ and dd.area like concat('%', #{deliveryDetail.area},'%')
</if>
<if test="deliveryDetail.money != null and deliveryDetail.money != ''">
- and dd.money regexp #{deliveryDetail.money}
+ and dd.money like concat('%', #{deliveryDetail.money},'%')
</if>
<if test="deliveryDetail.quantity != null and deliveryDetail.quantity != ''">
- and dd.quantity regexp #{deliveryDetail.quantity}
+ and dd.quantity like concat('%', #{deliveryDetail.quantity},'%')
</if>
<if test="deliveryDetail.deliveryDetailRemakes != null and deliveryDetail.deliveryDetailRemakes != ''">
- and dd.delivery_detail_remakes regexp #{deliveryDetail.deliveryDetailRemakes}
+ and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')
</if>
<if test="deliveryDetail.createTime != null and deliveryDetail.createTime != ''">
- and dd.create_time regexp #{deliveryDetail.createTime}
+ and dd.create_time like concat('%', #{deliveryDetail.createTime},'%')
</if>
- <if test="deliveryDetail.delivery.paymentTerms != null and deliveryDetail.delivery.paymentTerms != ''">
- and d.payment_terms regexp #{deliveryDetail.delivery.paymentTerms}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.paymentTerms != null and deliveryDetail.delivery.paymentTerms != '')">
+ and d.payment_terms like concat('%', #{deliveryDetail.delivery.paymentTerms},'%')
</if>
- <if test="deliveryDetail.delivery.project != null and deliveryDetail.delivery.project != ''">
- and d.project regexp #{deliveryDetail.delivery.project}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.project != null and deliveryDetail.delivery.project != '')">
+ and d.project like concat('%', #{deliveryDetail.delivery.project},'%')
</if>
- <if test="deliveryDetail.delivery.customerId != null and deliveryDetail.delivery.customerId != ''">
- and d.customer_id regexp #{deliveryDetail.delivery.customerId}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.customerId != null and deliveryDetail.delivery.customerId != '')">
+ and d.customer_id like concat('%', #{deliveryDetail.delivery.customerId},'%')
</if>
- <if test="deliveryDetail.delivery.customerName != null and deliveryDetail.delivery.customerName != ''">
- and d.customer_name regexp #{deliveryDetail.delivery.customerName}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.customerName != null and deliveryDetail.delivery.customerName != '')">
+ and d.customer_name like concat('%', #{deliveryDetail.delivery.customerName},'%')
</if>
- <if test="deliveryDetail.delivery.deliveryDate != null and deliveryDetail.delivery.deliveryDate != ''">
- and d.delivery_date regexp #{deliveryDetail.delivery.deliveryDate}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryDate != null and deliveryDetail.delivery.deliveryDate != '')">
+ and d.delivery_date like concat('%', #{deliveryDetail.delivery.deliveryDate},'%')
</if>
- <if test="deliveryDetail.delivery.payMethod != null and deliveryDetail.delivery.payMethod != ''">
- and d.pay_method regexp #{deliveryDetail.delivery.payMethod}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.payMethod != null and deliveryDetail.delivery.payMethod != '')">
+ and d.pay_method like concat('%', #{deliveryDetail.delivery.payMethod},'%')
</if>
- <if test="deliveryDetail.delivery.payDate != null and deliveryDetail.delivery.payDate != ''">
- and d.pay_date regexp #{deliveryDetail.delivery.payDate}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.payDate != null and deliveryDetail.delivery.payDate != '')">
+ and d.pay_date like concat('%', #{deliveryDetail.delivery.payDate},'%')
</if>
- <if test="deliveryDetail.delivery.salesman != null and deliveryDetail.delivery.salesman != ''">
- and d.salesman regexp #{deliveryDetail.delivery.salesman}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.salesman != null and deliveryDetail.delivery.salesman != '')">
+ and d.salesman like concat('%', #{deliveryDetail.delivery.salesman},'%')
</if>
- <if test="deliveryDetail.delivery.creator != null and deliveryDetail.delivery.creator != ''">
- and d.creator regexp #{deliveryDetail.delivery.creator}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.creator != null and deliveryDetail.delivery.creator != '')">
+ and d.creator like concat('%', #{deliveryDetail.delivery.creator},'%')
</if>
- <if test="deliveryDetail.delivery.contacts != null and deliveryDetail.delivery.contacts != ''">
- and d.contacts regexp #{deliveryDetail.delivery.contacts}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.contacts != null and deliveryDetail.delivery.contacts != '')">
+ and d.contacts like concat('%', #{deliveryDetail.delivery.contacts},'%')
</if>
- <if test="deliveryDetail.delivery.contactNumber != null and deliveryDetail.delivery.contactNumber != ''">
- and d.contact_number regexp #{deliveryDetail.delivery.contactNumber}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.contactNumber != null and deliveryDetail.delivery.contactNumber != '')">
+ and d.contact_number like concat('%', #{deliveryDetail.delivery.contactNumber},'%')
</if>
- <if test="deliveryDetail.delivery.deliveryAddress != null and deliveryDetail.delivery.deliveryAddress != ''">
- and d.delivery_address regexp #{deliveryDetail.delivery.deliveryAddress}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryAddress != null and deliveryDetail.delivery.deliveryAddress != '')">
+ and d.delivery_address like concat('%', #{deliveryDetail.delivery.deliveryAddress},'%')
</if>
</where>
@@ -569,78 +593,109 @@
limit #{offset},#{pageSize};
</select>
- <select id="getSelectDeliveryDetailReportPageTotal" resultMap="selectDeliveryDetail">
+ <select id="getSelectDeliveryDetailReportPageTotal">
select CEILING(count(dd.id)/#{pageSize}) as 'pageTotal',
count(dd.id) as 'total'
from sd.delivery_detail dd
left join sd.delivery d on dd.delivery_id=d.delivery_id
<where>
+ and date(dd.create_time)>=#{startDate} and date(dd.create_time) <= #{endDate}
<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
- and dd.delivery_id regexp #{deliveryDetail.deliveryId}
+ and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
</if>
<if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
- and dd.delivery_number regexp #{deliveryDetail.deliveryNumber}
+ and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
</if>
<if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
- and dd.order_id regexp #{deliveryDetail.orderId}
+ and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
</if>
<if test="deliveryDetail.orderNumber != null and deliveryDetail.orderNumber != ''">
- and dd.order_number regexp #{deliveryDetail.orderNumber}
+ and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')
</if>
<if test="deliveryDetail.area != null and deliveryDetail.area != ''">
- and dd.area regexp #{deliveryDetail.area}
+ and dd.area like concat('%', #{deliveryDetail.area},'%')
</if>
<if test="deliveryDetail.money != null and deliveryDetail.money != ''">
- and dd.money regexp #{deliveryDetail.money}
+ and dd.money like concat('%', #{deliveryDetail.money},'%')
</if>
<if test="deliveryDetail.quantity != null and deliveryDetail.quantity != ''">
- and dd.quantity regexp #{deliveryDetail.quantity}
+ and dd.quantity like concat('%', #{deliveryDetail.quantity},'%')
</if>
<if test="deliveryDetail.deliveryDetailRemakes != null and deliveryDetail.deliveryDetailRemakes != ''">
- and dd.delivery_detail_remakes regexp #{deliveryDetail.deliveryDetailRemakes}
+ and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')
</if>
<if test="deliveryDetail.createTime != null and deliveryDetail.createTime != ''">
- and dd.create_time regexp #{deliveryDetail.createTime}
+ and dd.create_time like concat('%', #{deliveryDetail.createTime},'%')
</if>
- <if test="deliveryDetail.delivery.paymentTerms != null and deliveryDetail.delivery.paymentTerms != ''">
- and d.payment_terms regexp #{deliveryDetail.delivery.paymentTerms}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.paymentTerms != null and deliveryDetail.delivery.paymentTerms != '')">
+ and d.payment_terms like concat('%', #{deliveryDetail.delivery.paymentTerms},'%')
</if>
- <if test="deliveryDetail.delivery.project != null and deliveryDetail.delivery.project != ''">
- and d.project regexp #{deliveryDetail.delivery.project}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.project != null and deliveryDetail.delivery.project != '')">
+ and d.project like concat('%', #{deliveryDetail.delivery.project},'%')
</if>
- <if test="deliveryDetail.delivery.customerId != null and deliveryDetail.delivery.customerId != ''">
- and d.customer_id regexp #{deliveryDetail.delivery.customerId}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.customerId != null and deliveryDetail.delivery.customerId != '')">
+ and d.customer_id like concat('%', #{deliveryDetail.delivery.customerId},'%')
</if>
- <if test="deliveryDetail.delivery.customerName != null and deliveryDetail.delivery.customerName != ''">
- and d.customer_name regexp #{deliveryDetail.delivery.customerName}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.customerName != null and deliveryDetail.delivery.customerName != '')">
+ and d.customer_name like concat('%', #{deliveryDetail.delivery.customerName},'%')
</if>
- <if test="deliveryDetail.delivery.deliveryDate != null and deliveryDetail.delivery.deliveryDate != ''">
- and d.delivery_date regexp #{deliveryDetail.delivery.deliveryDate}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryDate != null and deliveryDetail.delivery.deliveryDate != '')">
+ and d.delivery_date like concat('%', #{deliveryDetail.delivery.deliveryDate},'%')
</if>
- <if test="deliveryDetail.delivery.payMethod != null and deliveryDetail.delivery.payMethod != ''">
- and d.pay_method regexp #{deliveryDetail.delivery.payMethod}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.payMethod != null and deliveryDetail.delivery.payMethod != '')">
+ and d.pay_method like concat('%', #{deliveryDetail.delivery.payMethod},'%')
</if>
- <if test="deliveryDetail.delivery.payDate != null and deliveryDetail.delivery.payDate != ''">
- and d.pay_date regexp #{deliveryDetail.delivery.payDate}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.payDate != null and deliveryDetail.delivery.payDate != '')">
+ and d.pay_date like concat('%', #{deliveryDetail.delivery.payDate},'%')
</if>
- <if test="deliveryDetail.delivery.salesman != null and deliveryDetail.delivery.salesman != ''">
- and d.salesman regexp #{deliveryDetail.delivery.salesman}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.salesman != null and deliveryDetail.delivery.salesman != '')">
+ and d.salesman like concat('%', #{deliveryDetail.delivery.salesman},'%')
</if>
- <if test="deliveryDetail.delivery.creator != null and deliveryDetail.delivery.creator != ''">
- and d.creator regexp #{deliveryDetail.delivery.creator}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.creator != null and deliveryDetail.delivery.creator != '')">
+ and d.creator like concat('%', #{deliveryDetail.delivery.creator},'%')
</if>
- <if test="deliveryDetail.delivery.contacts != null and deliveryDetail.delivery.contacts != ''">
- and d.contacts regexp #{deliveryDetail.delivery.contacts}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.contacts != null and deliveryDetail.delivery.contacts != '')">
+ and d.contacts like concat('%', #{deliveryDetail.delivery.contacts},'%')
</if>
- <if test="deliveryDetail.delivery.contactNumber != null and deliveryDetail.delivery.contactNumber != ''">
- and d.contact_number regexp #{deliveryDetail.delivery.contactNumber}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.contactNumber != null and deliveryDetail.delivery.contactNumber != '')">
+ and d.contact_number like concat('%', #{deliveryDetail.delivery.contactNumber},'%')
</if>
- <if test="deliveryDetail.delivery.deliveryAddress != null and deliveryDetail.delivery.deliveryAddress != ''">
- and d.delivery_address regexp #{deliveryDetail.delivery.deliveryAddress}
+ <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryAddress != null and deliveryDetail.delivery.deliveryAddress != '')">
+ and d.delivery_address like concat('%', #{deliveryDetail.delivery.deliveryAddress},'%')
</if>
</where>
order by dd.delivery_id,dd.delivery_number
- limit #{offset},#{pageSize};
+ </select>
+
+ <select id="getSelectDeliveryPrinting" resultMap="selectDeliveryDetailOrderDetail" >
+ select dd.delivery_id,od.order_id,od.product_id,od.product_name,sum(dd.area) as area,sum(dd.money) as money,sum(dd.quantity) as quantity from
+ delivery_detail dd left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
+
+ <where>
+ <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
+ and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
+ </if>
+ </where>
+ group by od.order_id,od.product_name,od.product_id
+ </select>
+
+ <select id="getSelectDeliveryDetailPrinting" >
+ select od.order_id,
+ od.order_number,
+ od.product_name,
+ od.width,
+ od.height,
+ dd.quantity,
+ dd.money,
+ dd.area,
+ ifnull(od.processing_note,"") as processingNote,
+ ifnull(od.building_number,"") as buildingNumber,
+ od.price
+ from delivery_detail dd
+ left join order_detail od on dd.order_id = od.order_id and dd.order_number = od.order_number
+ where delivery_id = #{deliveryId}
+ and od.order_id = #{orderId}
+ and od.product_id = #{productId}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0