From ad7b64d59cfdcd95c5da328d0e0b349df401eaf4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 四月 2024 09:53:46 +0800
Subject: [PATCH] 提交拉取
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml | 255 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 246 insertions(+), 9 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 8feedfa..2e92abc 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml
@@ -29,6 +29,7 @@
<result column="d_quantity" property="deliveryDetail.quantity"/>
<result column="money" property="deliveryDetail.money"/>
+ <result column="delivery_number" property="deliveryDetail.deliveryNumber"/>
<result column="delivery_detail_remakes" property="deliveryDetail.deliveryDetailRemakes"/>
<result column="batch" property="order.batch"/>
@@ -55,12 +56,55 @@
</resultMap>
+ <resultMap id="selectDeliveryDetail" type="com.example.erp.entity.sd.DeliveryDetail">
+
+ <result column="order_id" property="orderId"/>
+ <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="customer_id" property="delivery.customerId"/>
+ <result column="customer_name" property="delivery.customerName"/>
+ <result column="project" property="delivery.project"/>
+ <result column="pay_method" property="delivery.payMethod"/>
+ <result column="payment_terms" property="delivery.paymentTerms"/>
+ <result column="pay_date" property="delivery.payDate"/>
+ <result column="contacts" property="delivery.contacts"/>
+ <result column="contact_number" property="delivery.contactNumber"/>
+ <result column="delivery_address" property="delivery.deliveryAddress"/>
+ <result column="delivery_date" property="delivery.deliveryDate"/>
+ <result column="creator" property="delivery.creator"/>
+ <result column="salesman" property="delivery.salesman"/>
+
+
+
+ </resultMap>
+
+ <delete id="deleteDeliveryDetail">
+ delete from sd.delivery_detail where delivery_id=#{deliveryId}
+ </delete>
+
<update id="updateOrderDetailDeliveryNum">
- update sd.order_detail set delivery_num=#{deliveryDetail.quantity} where order_id=#{orderId} and order_number=#{orderNumber}
+ update sd.order_detail set delivery_num=delivery_num+#{deliveryDetail.quantity} where order_id=#{orderId} and order_number=#{orderNumber}
+ </update>
+
+ <update id="updateIsNotOrderDetailDeliveryNum">
+ update sd.order_detail set delivery_num=delivery_num-#{quantity} where order_id=#{orderId} and order_number=#{orderNumber}
</update>
<select id="getdeliveryDetailmaximum" >
select count(*) from sd.delivery_detail where delivery_id=#{deliveryId}
+ </select>
+
+ <select id="getIsNotDeliveryDetail" >
+ select * from sd.delivery_detail where delivery_id=#{deliveryId}
</select>
@@ -76,11 +120,32 @@
- <select id="getseletShippingOrderDetail" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
- select od.order_id,o.batch,fgi.quantity_available,od.quantity-dd.quantity as t_quantity,od.quantity as o_quantity,dd.quantity
- as d_quantity,od.building_number,od.product_id,od.product_name,od.price,fgi.storage_region,dd.money,od.width,
- od.height,od.shape,fgi.actual_signal_area,od.gross_area,od.compute_area,od.compute_gross_area,
- od.processing_note,od.edging_type,od.perimeter,dd.delivery_detail_remakes
+ <select id="getSelectShippingOrderDetail" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
+ select od.order_id,
+ o.batch,
+ dd.delivery_number,
+ fgi.quantity_available + dd.quantity as quantity_available,
+ od.order_number,
+ od.quantity-dd.quantity as t_quantity,
+ od.quantity as o_quantity,
+ dd.quantity as d_quantity,
+ od.building_number,
+ od.product_id,
+ od.product_name,
+ od.price,
+ fgi.storage_region,
+ dd.money,
+ od.width,
+ od.height,
+ od.shape,
+ fgi.actual_signal_area,
+ od.gross_area,
+ od.compute_area,
+ od.compute_gross_area,
+ od.processing_note,
+ od.edging_type,
+ od.perimeter,
+ dd.delivery_detail_remakes
from sd.delivery_detail dd
left join sd.delivery d on dd.delivery_id=d.delivery_id
left join sd.order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
@@ -158,10 +223,11 @@
</if>
</where>
+ order by dd.id desc
limit #{offset},#{pageSize};
</select>
- <select id="getseletShippingOrderDetailPageTotal">
+ <select id="getSelectShippingOrderDetailPageTotal">
select
CEILING(count(dd.id)/#{pageSize})
from sd.delivery_detail dd
@@ -243,7 +309,7 @@
limit #{offset},#{pageSize};
</select>
- <select id="getseletShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
+ <select id="getSelectShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
select od.order_id,
od.order_number,
o.batch,
@@ -336,7 +402,7 @@
limit #{offset},#{pageSize};
</select>
- <select id="getseletShippingOrderDetailsPageTotal">
+ <select id="getSelectShippingOrderDetailsPageTotal">
select
CEILING(count(od.id)/#{pageSize})
from sd.order_detail od
@@ -408,4 +474,175 @@
</where>
limit #{offset},#{pageSize};
</select>
+
+
+ <select id="getSelectDeliveryDetailReport" resultMap="selectDeliveryDetail">
+ select dd.delivery_id,
+ dd.delivery_number,
+ d.payment_terms,
+ d.project,
+ d.customer_id,
+ d.customer_name,
+ d.delivery_date,
+ d.pay_method,
+ d.pay_date,
+ d.salesman,
+ d.creator,
+ d.contacts,
+ d.contact_number,
+ d.delivery_address,
+ dd.order_id,
+ dd.order_number,
+ dd.area,
+ dd.money,
+ dd.quantity,
+ dd.delivery_detail_remakes,
+ dd.create_time
+ 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 like concat('%',#{deliveryDetail.deliveryId},'%')
+ </if>
+ <if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
+ and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
+ </if>
+ <if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
+ and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
+ </if>
+ <if test="deliveryDetail.orderNumber != null and deliveryDetail.orderNumber != ''">
+ and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')
+ </if>
+ <if test="deliveryDetail.area != null and deliveryDetail.area != ''">
+ and dd.area like concat('%', #{deliveryDetail.area},'%')
+ </if>
+ <if test="deliveryDetail.money != null and deliveryDetail.money != ''">
+ and dd.money like concat('%', #{deliveryDetail.money},'%')
+ </if>
+ <if test="deliveryDetail.quantity != null and deliveryDetail.quantity != ''">
+ and dd.quantity like concat('%', #{deliveryDetail.quantity},'%')
+ </if>
+ <if test="deliveryDetail.deliveryDetailRemakes != null and deliveryDetail.deliveryDetailRemakes != ''">
+ and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')
+ </if>
+ <if test="deliveryDetail.createTime != null and deliveryDetail.createTime != ''">
+ and dd.create_time like concat('%', #{deliveryDetail.createTime},'%')
+ </if>
+ <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!=null and (deliveryDetail.delivery.project != null and deliveryDetail.delivery.project != '')">
+ and d.project like concat('%', #{deliveryDetail.delivery.project},'%')
+ </if>
+ <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!=null and (deliveryDetail.delivery.customerName != null and deliveryDetail.delivery.customerName != '')">
+ and d.customer_name like concat('%', #{deliveryDetail.delivery.customerName},'%')
+ </if>
+ <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!=null and (deliveryDetail.delivery.payMethod != null and deliveryDetail.delivery.payMethod != '')">
+ and d.pay_method like concat('%', #{deliveryDetail.delivery.payMethod},'%')
+ </if>
+ <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!=null and (deliveryDetail.delivery.salesman != null and deliveryDetail.delivery.salesman != '')">
+ and d.salesman like concat('%', #{deliveryDetail.delivery.salesman},'%')
+ </if>
+ <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!=null and (deliveryDetail.delivery.contacts != null and deliveryDetail.delivery.contacts != '')">
+ and d.contacts like concat('%', #{deliveryDetail.delivery.contacts},'%')
+ </if>
+ <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!=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="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 like concat('%',#{deliveryDetail.deliveryId},'%')
+ </if>
+ <if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
+ and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
+ </if>
+ <if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
+ and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
+ </if>
+ <if test="deliveryDetail.orderNumber != null and deliveryDetail.orderNumber != ''">
+ and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')
+ </if>
+ <if test="deliveryDetail.area != null and deliveryDetail.area != ''">
+ and dd.area like concat('%', #{deliveryDetail.area},'%')
+ </if>
+ <if test="deliveryDetail.money != null and deliveryDetail.money != ''">
+ and dd.money like concat('%', #{deliveryDetail.money},'%')
+ </if>
+ <if test="deliveryDetail.quantity != null and deliveryDetail.quantity != ''">
+ and dd.quantity like concat('%', #{deliveryDetail.quantity},'%')
+ </if>
+ <if test="deliveryDetail.deliveryDetailRemakes != null and deliveryDetail.deliveryDetailRemakes != ''">
+ and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')
+ </if>
+ <if test="deliveryDetail.createTime != null and deliveryDetail.createTime != ''">
+ and dd.create_time like concat('%', #{deliveryDetail.createTime},'%')
+ </if>
+ <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!=null and (deliveryDetail.delivery.project != null and deliveryDetail.delivery.project != '')">
+ and d.project like concat('%', #{deliveryDetail.delivery.project},'%')
+ </if>
+ <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!=null and (deliveryDetail.delivery.customerName != null and deliveryDetail.delivery.customerName != '')">
+ and d.customer_name like concat('%', #{deliveryDetail.delivery.customerName},'%')
+ </if>
+ <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!=null and (deliveryDetail.delivery.payMethod != null and deliveryDetail.delivery.payMethod != '')">
+ and d.pay_method like concat('%', #{deliveryDetail.delivery.payMethod},'%')
+ </if>
+ <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!=null and (deliveryDetail.delivery.salesman != null and deliveryDetail.delivery.salesman != '')">
+ and d.salesman like concat('%', #{deliveryDetail.delivery.salesman},'%')
+ </if>
+ <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!=null and (deliveryDetail.delivery.contacts != null and deliveryDetail.delivery.contacts != '')">
+ and d.contacts like concat('%', #{deliveryDetail.delivery.contacts},'%')
+ </if>
+ <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!=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
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0