From 23c6db6db89c6021bb44d6cd2511789cd82e73af Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 13 六月 2024 16:13:13 +0800
Subject: [PATCH] 订单明细中加入字段拱高
---
north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml | 211 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 141 insertions(+), 70 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml b/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
index 80b4bb7..aa8ed69 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
@@ -3,42 +3,41 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.pp.ProductionSchedulingMapper">
- <resultMap id="ProductionSchedulingMap" type="com.example.erp.entity.pp.ProductionScheduling">
+ <resultMap id="productionSchedulingMap" type="com.example.erp.entity.pp.ProductionScheduling">
<result column="processes" property="processes"/>
<result column="scheduling_quantity" property="schedulingQuantity"/>
<result column="order_number" property="orderNumber"/>
<result column="scheduling_id" property="schedulingId"/>
- <result column="order_id" property="orderId"/>
+ <result column="order_id" property="orderGlassDetail.orderId"/>
+ <result column="technology_number" property="technologyNumber"/>
+ <result column="pendingProductionQuantity" property="pendingProductionQuantity"/>
+ <result column="pendingProductionArea" property="pendingProductionArea"/>
+ <result column="productionScheduledQuantity" property="productionScheduledQuantity"/>
+ <result column="productionScheduledArea" property="productionScheduledArea"/>
+ <result column="review_status" property="reviewStatus"/>
<!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
- <association property="order" javaType="com.example.erp.entity.sd.Order">
- <result column="project" property="project"/>
- <result column="order_id" property="orderId"/>
- <result column="customer_name" property="customerName"/>
- <result column="batch" property="batch"/>
- <result column="other_remarks" property="otherRemarks"/>
- <result column="icon" property="icon"/>
- <result column="order_type" property="orderType"/>
- <result column="salesman" property="salesman"/>
- <result column="processing_note" property="processingNote"/>
- <result column="delivery_address" property="deliveryAddress"/>
- </association>
- <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
- <result column="order_id" property="orderId"/>
- <result column="product_id" property="productId"/>
- <result column="product_name" property="productName"/>
- <result column="compute_gross_area" property="computeGrossArea"/>
- <result column="processing_note" property="processingNote"/>
- <result column="quantity" property="quantity"/>
- <result column="compute_gross_area" property="computeGrossArea"/>
- <result column="perimeter" property="perimeter"/>
- <result column="order_number" property="orderNumber"/>
- <result column="width" property="width"/>
- <result column="height" property="height"/>
- <result column="shape" property="shape"/>
- <result column="weight" property="weight"/>
- </association>
-
-
+ <result column="project" property="order.project"/>
+ <result column="customer_name" property="order.customerName"/>
+ <result column="batch" property="order.batch"/>
+ <result column="other_remarks" property="order.otherRemarks"/>
+ <result column="icon" property="order.icon"/>
+ <result column="order_type" property="order.orderType"/>
+ <result column="salesman" property="order.salesman"/>
+ <result column="processing_note" property="order.processingNote"/>
+ <result column="delivery_address" property="order.deliveryAddress"/>
+ <result column="product_id" property="orderDetail.productId"/>
+ <result column="product_name" property="orderDetail.productName"/>
+ <result column="compute_gross_area" property="orderDetail.computeGrossArea"/>
+ <result column="quantity" property="orderDetail.quantity"/>
+ <result column="perimeter" property="orderDetail.perimeter"/>
+ <result column="width" property="orderDetail.width"/>
+ <result column="height" property="orderDetail.height"/>
+ <result column="shape" property="orderDetail.shape"/>
+ <result column="weight" property="orderDetail.weight"/>
+ <result column="child_width" property="orderGlassDetail.childWidth"/>
+ <result column="child_height" property="orderGlassDetail.childHeight"/>
+ <result column="area" property="orderGlassDetail.area"/>
+ <result column="glass_child" property="orderGlassDetail.glassChild"/>
</resultMap>
@@ -114,41 +113,65 @@
order by ps.id desc
</select>
<!-- 鏌ヨ鏈帓浜ф暟鎹�-->
- <select id="selectNoSchedulingMp">
+ <select id="selectNoSchedulingMp" resultMap="productionSchedulingMap">
select ogd.order_id,
- o.customer_name,
- o.project,
- ogd.order_number,
- ogd.technology_number,
- ogd.child_width,
- ogd.child_height,
- od.quantity,
- round(ogd.child_width * ogd.child_height * od.quantity / 1000000, 2) as area,
- (od.quantity - IFNULL((ps.schedulingQuantity), 0)) as scheduling_quantity,
- (od.quantity - IFNULL((ps.schedulingQuantity), 0)) as pendingProductionQuantity,
- round(ogd.child_width * ogd.child_height * (od.quantity - IFNULL((ps.schedulingQuantity), 0)) / 1000000, 2)
- as pendingProductionArea,
- IFNULL(ps.schedulingQuantity, 0) as productionScheduledQuantity,
- round(ogd.child_width * ogd.child_height * (IFNULL(ps.schedulingQuantity, 0)) / 1000000,
- 2) as productionScheduledArea,
- ogd.glass_child,
- od.shape
+ o.customer_name,
+ o.project,
+ ogd.order_number,
+ ogd.technology_number,
+ ogd.child_width,
+ ogd.child_height,
+ od.quantity,
+ round(ogd.child_width * ogd.child_height * od.quantity / 1000000, 2) as area,
+ (od.quantity - IFNULL((ps.schedulingQuantity), 0)) as schedulingQuantity,
+ (od.quantity - IFNULL((ps.schedulingQuantity), 0)) as pendingProductionQuantity,
+ round(ogd.child_width * ogd.child_height * (od.quantity - IFNULL((ps.schedulingQuantity), 0)) / 1000000,
+ 2)
+ as pendingProductionArea,
+ IFNULL(ps.schedulingQuantity, 0) as productionScheduledQuantity,
+ round(ogd.child_width * ogd.child_height * (IFNULL(ps.schedulingQuantity, 0)) / 1000000,
+ 2) as productionScheduledArea,
+ ogd.glass_child,
+ od.shape
from sd.order_glass_detail as ogd
- left join sd.order as o on ogd.order_id = o.order_id
- left join sd.order_detail as od on od.order_id=ogd.order_id and od.order_number=ogd.order_number
- left join sd.order_process_detail as opd on opd.order_id=ogd.order_id and opd.order_number=ogd.order_number and opd.technology_number=ogd.technology_number
- left join
- (select order_id,order_number,technology_number,SUM(scheduling_quantity) as schedulingQuantity from production_scheduling where processes=#{processes} group by order_id,order_number,technology_number) as ps on ps.order_id = ogd.order_id and ps.order_number = ogd.order_number and ps.technology_number=ogd.technology_number
+ left join sd.order as o on ogd.order_id = o.order_id
+ left join sd.order_detail as od on od.order_id = ogd.order_id and od.order_number = ogd.order_number
+ left join sd.order_process_detail as opd
+ on opd.order_id = ogd.order_id and opd.order_number = ogd.order_number and
+ opd.technology_number = ogd.technology_number
+ left join
+ (select order_id, order_number, technology_number, SUM(scheduling_quantity) as schedulingQuantity
+ from production_scheduling
+ where processes = #{processes}
+ group by order_id, order_number, technology_number) as ps
+ on ps.order_id = ogd.order_id and ps.order_number = ogd.order_number and
+ ps.technology_number = ogd.technology_number
where (od.quantity - IFNULL((ps.schedulingQuantity), 0)) > 0
- and od.create_time between #{selectTime1} and #{selectTime2} and opd.reporting_work_num_count=0
+ and od.create_time between #{selectTime1} and #{selectTime2}
+ and opd.reporting_work_num_count = 0
- and position(#{orderId} in ogd.order_id)
--- and position("鍒囧壊" in ps.processes)
-
- group by ogd.order_id, ogd.order_number,ogd.technology_number
+ and position(#{orderId} in ogd.order_id)
+ -- and position("鍒囧壊" in ps.processes)
+ <if test="productionScheduling.orderId != null and productionScheduling.orderId != ''">
+ and ogd.order_id regexp #{productionScheduling.orderId}
+ </if>
+ <if test="productionScheduling.order.customerName != null and productionScheduling.order.customerName != ''">
+ and o.customer_name regexp #{productionScheduling.order.customerName}
+ </if>
+ <if test="productionScheduling.order.project != null and productionScheduling.order.project != ''">
+ and o.project regexp #{productionScheduling.order.project}
+ </if>
+ <if test="productionScheduling.orderNumber != null and productionScheduling.orderNumber != ''">
+ and ogd.order_number regexp #{productionScheduling.orderNumber}
+ </if>
+ <if test="productionScheduling.technologyNumber != null and productionScheduling.technologyNumber != ''">
+ and ogd.technology_number regexp #{productionScheduling.technologyNumber}
+ </if>
+ group by ogd.order_id, ogd.order_number, ogd.technology_number
order by ogd.order_id desc
+ limit #{offset},#{pageSize};
</select>
<!-- 棣栨鏌ヨ鎺掍骇鏁版嵁-->
<select id="selectLastSchedulingMp">
@@ -161,30 +184,39 @@
ogd.child_height,
od.quantity,
round(ogd.child_width * ogd.child_height * od.quantity / 1000000, 2) as area,
- (od.quantity - IFNULL((ps.schedulingQuantity), 0)) as scheduling_quantity,
- (od.quantity - IFNULL((ps.schedulingQuantity), 0)) as pendingProductionQuantity,
- round(ogd.child_width * ogd.child_height * (od.quantity - IFNULL((ps.schedulingQuantity), 0)) / 1000000, 2)
+ (od.quantity - IFNULL((ps.schedulingQuantity), 0)) as scheduling_quantity,
+ (od.quantity - IFNULL((ps.schedulingQuantity), 0)) as pendingProductionQuantity,
+ round(ogd.child_width * ogd.child_height * (od.quantity - IFNULL((ps.schedulingQuantity), 0)) / 1000000,
+ 2)
as pendingProductionArea,
- IFNULL(ps.schedulingQuantity, 0) as productionScheduledQuantity,
+ IFNULL(ps.schedulingQuantity, 0) as productionScheduledQuantity,
round(ogd.child_width * ogd.child_height * (IFNULL(ps.schedulingQuantity, 0)) / 1000000,
- 2) as productionScheduledArea,
+ 2) as productionScheduledArea,
ogd.glass_child,
od.shape
from sd.order_glass_detail as ogd
left join sd.order as o on ogd.order_id = o.order_id
- left join sd.order_detail as od on od.order_id=ogd.order_id and od.order_number=ogd.order_number
- left join sd.order_process_detail as opd on opd.order_id=ogd.order_id and opd.order_number=ogd.order_number and opd.technology_number=ogd.technology_number
+ left join sd.order_detail as od on od.order_id = ogd.order_id and od.order_number = ogd.order_number
+ left join sd.order_process_detail as opd
+ on opd.order_id = ogd.order_id and opd.order_number = ogd.order_number and
+ opd.technology_number = ogd.technology_number
left join
- (select order_id,order_number,technology_number,SUM(scheduling_quantity) as schedulingQuantity from production_scheduling where processes=#{processes} group by order_id,order_number,technology_number) as ps on ps.order_id = ogd.order_id and ps.order_number = ogd.order_number and ps.technology_number=ogd.technology_number
+ (select order_id, order_number, technology_number, SUM(scheduling_quantity) as schedulingQuantity
+ from production_scheduling
+ where processes = #{processes}
+ group by order_id, order_number, technology_number) as ps
+ on ps.order_id = ogd.order_id and ps.order_number = ogd.order_number and
+ ps.technology_number = ogd.technology_number
where (od.quantity - IFNULL((ps.schedulingQuantity), 0)) > 0
- and od.create_time between #{selectTime1} and #{selectTime2} and opd.reporting_work_num_count=0
+ and od.create_time between #{selectTime1} and #{selectTime2}
+ and opd.reporting_work_num_count = 0
and position(#{orderId} in ogd.order_id)
-- and position("鍒囧壊" in ps.processes)
- group by ogd.order_id, ogd.order_number,ogd.technology_number
+ group by ogd.order_id, ogd.order_number, ogd.technology_number
order by ogd.order_id desc
</select>
@@ -237,7 +269,46 @@
and bd.basic_type = 'product'
</select>
- <select id="selectNumberMp">
+ <select id="getPageTotal">
+ select CEILING(count(ogd.id)/#{pageSize}) as 'pageTotal',
+ count(distinct ogd.id) as 'total'
+ from sd.order_glass_detail as ogd
+ left join sd.order as o on ogd.order_id = o.order_id
+ left join sd.order_detail as od on od.order_id = ogd.order_id and od.order_number = ogd.order_number
+ left join sd.order_process_detail as opd
+ on opd.order_id = ogd.order_id and opd.order_number = ogd.order_number and
+ opd.technology_number = ogd.technology_number
+ left join
+ (select order_id, order_number, technology_number, SUM(scheduling_quantity) as schedulingQuantity
+ from production_scheduling
+ where processes = #{processes}
+ group by order_id, order_number, technology_number) as ps
+ on ps.order_id = ogd.order_id and ps.order_number = ogd.order_number and
+ ps.technology_number = ogd.technology_number
+
+ where (od.quantity - IFNULL((ps.schedulingQuantity), 0)) > 0
+ and od.create_time between #{selectTime1} and #{selectTime2}
+ and opd.reporting_work_num_count = 0
+
+ and position(#{orderId} in ogd.order_id)
+ -- and position("鍒囧壊" in ps.processes)
+ <if test="productionScheduling.orderId != null and productionScheduling.orderId != ''">
+ and ogd.order_id regexp #{productionScheduling.orderId}
+ </if>
+ <if test="productionScheduling.order.customerName != null and productionScheduling.order.customerName != ''">
+ and o.customer_name regexp #{productionScheduling.order.customerName}
+ </if>
+ <if test="productionScheduling.order.project != null and productionScheduling.order.project != ''">
+ and o.project regexp #{productionScheduling.order.project}
+ </if>
+ <if test="productionScheduling.orderNumber != null and productionScheduling.orderNumber != ''">
+ and ogd.order_number regexp #{productionScheduling.orderNumber}
+ </if>
+ <if test="productionScheduling.technologyNumber != null and productionScheduling.technologyNumber != ''">
+ and ogd.technology_number regexp #{productionScheduling.technologyNumber}
+ </if>
+ order by ogd.order_id desc
+ limit #{offset},#{pageSize};
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0