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 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 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 2e92abc..f83bba4 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml
@@ -87,6 +87,28 @@
</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"/>
+
+
+
+
+ </resultMap>
+
<delete id="deleteDeliveryDetail">
delete from sd.delivery_detail where delivery_id=#{deliveryId}
</delete>
@@ -645,4 +667,35 @@
</where>
order by dd.delivery_id,dd.delivery_number
</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