From 8b2c74fb6842e8af60f70e7df6eef8837d74be07 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 05 九月 2024 11:44:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 1423 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 921 insertions(+), 502 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index a4d1b8b..06f6252 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -50,19 +50,20 @@
</resultMap>
- <resultMap id="damageDetailsTableMap" type="com.example.erp.entity.pp.DamageDetails">
+ <resultMap id="damageDetailsTableMap" type="com.example.erp.dto.pp.CrossProcessBreakingDTO">
<result column="responsible_process" property="responsibleProcess"/>
<result column="responsible_team" property="responsibleTeam"/>
<result column="breakage_type" property="breakageType"/>
<result column="breakage_reason" property="breakageReason"/>
<result column="breakage_quantity" property="breakageQuantity"/>
<result column="area" property="area"/>
- <result column="reporting_work_id" property="reportingWork.reportingWorkId"/>
- <result column="reporting_work_time" property="reportingWork.reportingWorkTime"/>
- <result column="this_process" property="reportingWork.thisProcess"/>
- <result column="project" property="order.project"/>
- <result column="order_id" property="order.orderId"/>
- <result column="glass_child" property="orderGlassDetail.glassChild"/>
+ <result column="reporting_work_time" property="reportingWorkTime"/>
+ <result column="this_process" property="thisProcess"/>
+ <result column="project" property="project"/>
+ <result column="order_id" property="orderId"/>
+ <result column="glass_child" property="glassChild"/>
+ <result column="process_id" property="processId"/>
+ <result column="code" property="code"/>
</resultMap>
@@ -101,6 +102,7 @@
<result column="breakage_reason" property="breakageReason"/>
<result column="personnel" property="personnel"/>
<result column="glass_child" property="glassChild"/>
+ <result column="glassNumber" property="glassNumber"/>
</resultMap>
<resultMap id="teamOutputMap" type="com.example.erp.dto.pp.TeamOutputDTO">
@@ -118,10 +120,40 @@
<result column="completed_quantity" property="completedQuantity"/>
<result column="area" property="area"/>
<result column="product_name" property="productName"/>
+ <result column="code" property="code"/>
</resultMap>
+ <resultMap id="scheduleProductionScheduleMap" type="com.example.erp.dto.pp.ScheduleProductionScheduleDTO">
+ <result column="order_id" property="orderId"/>
+ <result column="project" property="project"/>
+ <result column="processes" property="processes"/>
+ <result column="scheduling_quantity" property="schedulingQuantity"/>
+ <result column="notes" property="notes"/>
+ <result column="scheduled_start_time" property="scheduledStartTime"/>
+ <result column="plan_end_time" property="planEndTime"/>
+ </resultMap>
-<!-- 娴佺▼鍗¤繘搴�-->
+ <resultMap id="workInProgressMap" type="com.example.erp.dto.pp.WorkInProgressDTO">
+ <result column="thisProcess" property="thisProcess"/>
+ <result column="order_id" property="orderId"/>
+ <result column="process_id" property="processId"/>
+ <result column="customer_name" property="customerName"/>
+ <result column="project" property="project"/>
+ <result column="batch" property="batch"/>
+ <result column="order_number" property="orderNumber"/>
+ <result column="technology_number" property="technologyNumber"/>
+ <result column="shape" property="shape"/>
+ <result column="process" property="process"/>
+ <result column="quantity" property="quantity"/>
+ <result column="child_width" property="childWidth"/>
+ <result column="child_height" property="childHeight"/>
+ <result column="stockNum" property="stockNum"/>
+ <result column="stockArea" property="stockArea"/>
+ <result column="product_name" property="productName"/>
+ <result column="bend_radius" property="bendRadius"/>
+ </resultMap>
+
+ <!-- 娴佺▼鍗¤繘搴�-->
<select id="processCardProgressMp">
select a.product_name,
b.glass_child,
@@ -135,7 +167,8 @@
e.broken_num,
ifnull(f.inventory, 0) as inventory,
round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
- ifnull(dd.quantity, 0) as shippedQuantity
+ ifnull(dd.quantity, 0) as shippedQuantity,
+ JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')) AS glassNumber
from flow_card as c
left join
sd.order_detail as a
@@ -165,7 +198,7 @@
FROM sd.order_process_detail as a
where a.order_id = #{orderId}
GROUP BY process_id, a.order_number, a.technology_number) as e
- on e.process_id = c.process_id
+ on e.process_id = c.process_id
and e.technology_number = c.technology_number
and e.order_number = c.order_number
where a.order_id = #{orderId}
@@ -176,185 +209,232 @@
</select>
<select id="getProcessBreaking" resultMap="damageDetailsTableMap">
- select rw.reporting_work_id,rw.reporting_work_time,dd.responsible_process,dd.responsible_team,
- dd.breakage_type,dd.breakage_reason,ROUND((dd.breakage_quantity)) as breakage_quantity,
- round(ogd.child_width*ogd.child_height*(dd.breakage_quantity)/1000000,2) as area,rw.this_process,
- o.project,o.order_id,ogd.glass_child,rw.this_process
+ select rw.reporting_work_id,
+ rw.reporting_work_time,
+ dd.responsible_process,
+ dd.responsible_team,
+ dd.breakage_type,
+ dd.breakage_reason,
+ ROUND((dd.breakage_quantity)) as breakage_quantity,
+ round(ogd.child_width * ogd.child_height * (dd.breakage_quantity) / 1000000, 2) as area,
+ rw.this_process,
+ o.project,
+ o.order_id,
+ ogd.glass_child,
+ rw.this_process,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
+ CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id
from
- damage_details as dd
- left join reporting_work as rw
- on rw.reporting_work_id=dd.reporting_work_id
- left join sd.order as o
- on rw.order_id=o.order_id
- left join sd.order_glass_detail as ogd
- on ogd.order_id=o.order_id and ogd.order_number=dd.order_number
- and ogd.technology_number and dd.technology_number
- where date(rw.reporting_work_time)>=#{startDate} and date(rw.reporting_work_time) <= #{endDate}
- and rw.this_worn_quantity>0 and dd.available=0
- and reviewed_state!=2
- and rw.this_process!=dd.responsible_process
+ sd.`order` as o left join sd.order_detail as od on o.order_id=od.order_id
+ left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
+ left join reporting_work as rw on rw.order_id=o.order_id
+ left join damage_details as dd on dd.reporting_work_id=rw.reporting_work_id and dd.order_number=ogd.order_number
+ and dd.technology_number=ogd.technology_number
+ where date(rw.reporting_work_time) >= #{startDate}
+ and date(rw.reporting_work_time) <= #{endDate}
+ and rw.this_worn_quantity > 0
+ and dd.available = 0
+ and reviewed_state != 2
+ and rw.this_process != dd.responsible_process
+ <if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
+ and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) regexp #{crossProcessBreakingDTO.code}
+ </if>
+ <if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
+ and rw.process_id regexp #{crossProcessBreakingDTO.processId}
+ </if>
+ <if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
+ and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}
+ </if>
+ <if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
+ and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}
+ </if>
+ <if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
+ and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}
+ </if>
GROUP BY dd.id
order by dd.id desc
limit #{offset},#{pageSize}
</select>
<select id="getProcessBreakingTotal">
- select
- CEILING(count(dd.id)/#{pageSize}) as 'pageTotal',
- count(distinct dd.id) as 'total'
- from
- damage_details as dd
- left join reporting_work as rw
- on rw.reporting_work_id=dd.reporting_work_id
- left join sd.order as o
- on rw.order_id=o.order_id
- left join sd.order_glass_detail as ogd
- on ogd.order_id=o.order_id and ogd.order_number=dd.order_number
- and ogd.technology_number and dd.technology_number
- where date(rw.reporting_work_time)>=#{startDate} and date(rw.reporting_work_time) <= #{endDate}
- and rw.this_worn_quantity>0 and dd.available=0
- and reviewed_state!=2
- and rw.this_process!=dd.responsible_process
+ select CEILING(count(dd.id) / #{pageSize}) as 'pageTotal',
+ count(distinct dd.id) as 'total'
+ from damage_details as dd
+ left join reporting_work as rw
+ on rw.reporting_work_id = dd.reporting_work_id
+ left join sd.order as o
+ on rw.order_id = o.order_id
+ left join sd.order_glass_detail as ogd
+ on ogd.order_id = o.order_id and ogd.order_number = dd.order_number
+ and ogd.technology_number and dd.technology_number
+ where date(rw.reporting_work_time) >= #{startDate}
+ and date(rw.reporting_work_time) <= #{endDate}
+ and rw.this_worn_quantity > 0
+ and dd.available = 0
+ and reviewed_state != 2
+ and rw.this_process != dd.responsible_process
order by dd.id desc
</select>
- <select id="workInProgressMp">
+ <select id="workInProgressMp" resultMap="workInProgressMap">
select #{selectProcesses} as thisProcess,
- fc.process_id,
- o.customer_name,
- o.project,
- o.order_id,
- o.batch,
- od.shape,
- ogd.order_number,
- ogd.technology_number,
- ogd.process,
- od.quantity,
- ogd.child_width,
- ogd.child_height,
- odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
- odpd.broken_num as stockNum,
- ROUND(ogd.child_width * ogd.child_height *
- (odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
- odpd.broken_num) / 1000000, 2) as stockArea,
- od.product_name,
- od.bend_radius
+ fc.process_id,
+ o.customer_name,
+ o.project,
+ o.order_id,
+ o.batch,
+ if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', '')) as shape,
+ ogd.order_number,
+ ogd.technology_number,
+ ogd.process,
+ od.quantity,
+ ogd.child_width,
+ ogd.child_height,
+ odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num as stockNum,
+ ROUND(ogd.child_width * ogd.child_height *
+ (odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num) / 1000000, 2) as stockArea,
+ od.product_name,
+ od.bend_radius
from sd.order_detail AS od
- LEFT JOIN sd.order_glass_detail AS ogd
- ON od.order_id = ogd.order_id
- AND od.order_number = ogd.order_number
- LEFT JOIN flow_card AS fc
- ON fc.order_id = ogd.order_id
- and fc.production_id = ogd.production_id
- AND fc.order_number = ogd.order_number
- AND fc.technology_number = ogd.technology_number
- left join sd.order_process_detail as odpd
- ON odpd.order_id = fc.order_id
- AND odpd.order_number = fc.order_number
- AND odpd.technology_number = fc.technology_number
- and odpd.process_id = fc.process_id
- left join sd.order_process_detail as odpds
- ON odpds.id = odpd.id - 1
- left join
- (SELECT sum(rw.rework_num) as 'patchNumSum',
- rw.process_id,
- rw.order_sort,
- rw.technology_number,
- rwk.this_process
- from rework as rw
- LEFT JOIN
- reporting_work as rwk
- on rw.reporting_work_id = rwk.reporting_work_id
- where rwk.this_process = #{selectProcesses}
- and rw.review_status = 1
- GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
- on c.process_id = fc.process_id
- and c.order_sort = fc.order_number
- and c.technology_number = fc.technology_number
- left join sd.`order` as o
- on o.order_id = od.order_id
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id = ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
+ left join sd.order_process_detail as odpds
+ ON odpds.id = odpd.id - 1
+ left join
+ (SELECT sum(rw.rework_num) as 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ from rework as rw
+ LEFT JOIN
+ reporting_work as rwk
+ on rw.reporting_work_id = rwk.reporting_work_id
+ where rwk.this_process = #{selectProcesses}
+ and rw.review_status >= 0
+ GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
+ on c.process_id = fc.process_id
+ and c.order_sort = fc.order_number
+ and c.technology_number = fc.technology_number
+ left join sd.`order` as o
+ on o.order_id = od.order_id
where LENGTH(fc.process_id) = 14
- and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
- odpd.broken_num != 0
- and odpd.process = #{selectProcesses} and o.create_time between #{selectTime1} and #{selectTime2}
- and position(#{orderId} in od.order_id) and position(#{inputProject} in o.project)
-
+ and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num != 0
+ and odpd.process = #{selectProcesses}
+ and position(#{orderId} in od.order_id)
+ and position(#{inputProject} in o.project)
+ <if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
+ and o.customer_name regexp #{workInProgressDTO.customerName}
+ </if>
+ <if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
+ and o.project regexp #{workInProgressDTO.project}
+ </if>
+ <if test="workInProgressDTO.orderId != null and workInProgressDTO.orderId != ''">
+ and o.order_id regexp #{workInProgressDTO.orderId}
+ </if>
+ <if test="workInProgressDTO.batch != null and workInProgressDTO.batch != ''">
+ and o.batch regexp #{workInProgressDTO.batch}
+ </if>
+ <if test="workInProgressDTO.processId != null and workInProgressDTO.processId != ''">
+ and fc.process_id regexp #{workInProgressDTO.processId}
+ </if>
+ <if test="workInProgressDTO.orderNumber != null and workInProgressDTO.orderNumber != ''">
+ and ogd.order_number regexp #{workInProgressDTO.orderNumber}
+ </if>
+ <if test="workInProgressDTO.technologyNumber != null and workInProgressDTO.technologyNumber != ''">
+ and ogd.technology_number regexp #{workInProgressDTO.technologyNumber}
+ </if>
group by fc.process_id, fc.order_number, fc.technology_number
order by fc.process_id, fc.order_number, fc.technology_number
+ limit #{offset},#{pageSize};
</select>
- <!--
- <if test="Report.processId != null and Report.processId != ''">
- and fc.process_id regexp #{Report.processId}
- </if>
- <if test="Report.customerName != null and Report.customerName != ''">
- and o.customer_name regexp #{Report.customerName}
- </if>
- <if test="Report.project != null and Report.project != ''">
- and o.project regexp #{Report.project}
- </if>
- <if test="Report.batch != null and Report.batch != ''">
- and o.batch regexp #{Report.batch}
- </if>
- <if test="Report.shape != null and Report.shape != ''">
- and od.shape regexp #{Report.shape}
- </if>
- -->
+ <select id="workInProgressTotal">
+ select CEILING(count(fc.id)/#{pageSize}) as 'pageTotal',
+ count(distinct fc.id) as 'total'
-<!-- <select id="getWorkInProgressTotal">-->
-<!-- select CEILING(count(fc.id) / #{pageSize}) as 'pageTotal',-->
-<!-- count(distinct fc.id) as 'total'-->
-
-<!-- from sd.order_detail AS od-->
-<!-- LEFT JOIN sd.order_glass_detail AS ogd-->
-<!-- ON od.order_id = ogd.order_id-->
-<!-- AND od.order_number = ogd.order_number-->
-<!-- LEFT JOIN flow_card AS fc-->
-<!-- ON fc.order_id = ogd.order_id-->
-<!-- and fc.production_id = ogd.production_id-->
-<!-- AND fc.order_number = ogd.order_number-->
-<!-- AND fc.technology_number = ogd.technology_number-->
-<!-- left join sd.order_process_detail as odpd-->
-<!-- ON odpd.order_id = fc.order_id-->
-<!-- AND odpd.order_number = fc.order_number-->
-<!-- AND odpd.technology_number = fc.technology_number-->
-<!-- and odpd.process_id = fc.process_id-->
-<!-- left join sd.order_process_detail as odpds-->
-<!-- ON odpds.id = odpd.id - 1-->
-<!-- left join-->
-<!-- (SELECT sum(rw.rework_num) as 'patchNumSum',-->
-<!-- rw.process_id,-->
-<!-- rw.order_sort,-->
-<!-- rw.technology_number,-->
-<!-- rwk.this_process-->
-<!-- from rework as rw-->
-<!-- LEFT JOIN-->
-<!-- reporting_work as rwk-->
-<!-- on rw.reporting_work_id = rwk.reporting_work_id-->
-<!-- where rwk.this_process = #{selectProcesses}-->
-<!-- and rw.review_status = 1-->
-<!-- GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c-->
-<!-- on c.process_id = fc.process_id-->
-<!-- and c.order_sort = fc.order_number-->
-<!-- and c.technology_number = fc.technology_number-->
-<!-- left join sd.`order` as o-->
-<!-- on o.order_id = od.order_id-->
-<!-- where LENGTH(fc.process_id) = 14-->
-<!-- and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - -->
-<!-- odpd.broken_num != 0-->
-<!-- and odpd.process = #{selectProcesses}-->
-<!-- and o.create_time between #{selectTime1} and #{selectTime2}-->
-<!-- and position(#{orderId} in od.order_id)-->
-<!-- and position(#{inputProject} in o.project)-->
-<!-- group by fc.process_id, fc.order_number, fc.technology_number-->
-<!-- order by fc.process_id, fc.order_number, fc.technology_number-->
-<!-- limit #{offset},#{pageSize};-->
-<!-- </select>-->
+ from sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id = ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
+ left join sd.order_process_detail as odpds
+ ON odpds.id = odpd.id - 1
+ left join
+ (SELECT sum(rw.rework_num) as 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ from rework as rw
+ LEFT JOIN
+ reporting_work as rwk
+ on rw.reporting_work_id = rwk.reporting_work_id
+ where rwk.this_process = #{selectProcesses}
+ and rw.review_status >= 0
+ GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
+ on c.process_id = fc.process_id
+ and c.order_sort = fc.order_number
+ and c.technology_number = fc.technology_number
+ left join sd.`order` as o
+ on o.order_id = od.order_id
+ where LENGTH(fc.process_id) = 14
+ and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num != 0
+ and odpd.process = #{selectProcesses}
+ and position(#{orderId} in od.order_id)
+ and position(#{inputProject} in o.project)
+ <if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
+ and o.customer_name regexp #{workInProgressDTO.customerName}
+ </if>
+ <if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
+ and o.project regexp #{workInProgressDTO.project}
+ </if>
+ <if test="workInProgressDTO.orderId != null and workInProgressDTO.orderId != ''">
+ and o.order_id regexp #{workInProgressDTO.orderId}
+ </if>
+ <if test="workInProgressDTO.batch != null and workInProgressDTO.batch != ''">
+ and o.batch regexp #{workInProgressDTO.batch}
+ </if>
+ <if test="workInProgressDTO.processId != null and workInProgressDTO.processId != ''">
+ and fc.process_id regexp #{workInProgressDTO.processId}
+ </if>
+ <if test="workInProgressDTO.orderNumber != null and workInProgressDTO.orderNumber != ''">
+ and ogd.order_number regexp #{workInProgressDTO.orderNumber}
+ </if>
+ <if test="workInProgressDTO.technologyNumber != null and workInProgressDTO.technologyNumber != ''">
+ and ogd.technology_number regexp #{workInProgressDTO.technologyNumber}
+ </if>
+ limit #{offset},#{pageSize};
+ </select>
<select id="processToBeCompletedMp">
- select DATE(o.create_time) as create_time,
- DATE(o.delivery_date) as delivery_date,
+ select DATE(o.create_time) as create_time,
+ DATE(o.delivery_date) as delivery_date,
o.order_id,
fc.process_id,
o.customer_name,
@@ -366,14 +446,14 @@
ogd.child_width,
ogd.child_height,
od.quantity,
- ROUND(ogd.child_width * ogd.child_height / 1000000, 2) as childArea,
- ROUND(ogd.child_width * ogd.child_height * od.quantity / 1000000, 2) as actualArea,
- odpd.reporting_work_num as completeNum,
+ ROUND(ogd.child_width * ogd.child_height / 1000000, 2) as childArea,
+ ROUND(ogd.child_width * ogd.child_height * od.quantity / 1000000, 2) as actualArea,
+ odpd.reporting_work_num as completeNum,
ROUND(ogd.child_width * ogd.child_height * odpd.reporting_work_num / 1000000,
- 2) as completeArea,
- od.quantity - odpd.reporting_work_num as incompleteNum,
+ 2) as completeArea,
+ od.quantity - odpd.reporting_work_num as incompleteNum,
ROUND(ogd.child_width * ogd.child_height * (od.quantity - odpd.reporting_work_num) / 1000000,
- 2) as incompleteArea,
+ 2) as incompleteArea,
od.product_name
from sd.order_detail AS od
@@ -405,32 +485,34 @@
<select id="selectDamageReportMp" resultMap="damageReportMap">
SELECT
- o.order_id,
- o.project,
- rw.process_id,
- dd.order_number,
- dd.technology_number,
- date(rw.reporting_work_time) as reporting_work_time,
- dd.responsible_process,
- dd.responsible_team,
- dd.responsible_equipment,
- dd.breakage_type,
- dd.breakage_reason,
- dd.breakage_quantity,
- round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 ) as area,
- IFNULL(dd.responsible_personnel,'') as personnel,
- ogd.glass_child
+ o.order_id,
+ o.project,
+ rw.process_id,
+ dd.order_number,
+ dd.technology_number,
+ date(rw.reporting_work_time) as reporting_work_time,
+ dd.responsible_process,
+ dd.responsible_team,
+ dd.responsible_equipment,
+ dd.breakage_type,
+ dd.breakage_reason,
+ dd.breakage_quantity,
+ round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 ) as area,
+ IFNULL(dd.responsible_personnel,'') as personnel,
+ ogd.glass_child,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS glassNumber
FROM
- sd.ORDER AS o
- LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
- LEFT JOIN reporting_work AS rw ON rw.order_id = o.order_id
- LEFT JOIN damage_details AS dd ON dd.reporting_work_id = rw.reporting_work_id
- AND dd.order_number = ogd.order_number
- AND dd.technology_number = ogd.technology_number
+ sd.ORDER AS o
+ LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
+ LEFT JOIN reporting_work AS rw ON rw.order_id = o.order_id
+ LEFT JOIN damage_details AS dd ON dd.reporting_work_id = rw.reporting_work_id
+ AND dd.order_number = ogd.order_number
+ AND dd.technology_number = ogd.technology_number
+ left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
WHERE
- rw.reporting_work_time between #{selectTime1} and #{selectTime2}
- AND dd.available = 0
- AND LENGTH( rw.process_id )= 14
+ rw.reporting_work_time between #{selectTime1} and #{selectTime2}
+ AND dd.available = 0
+ AND LENGTH( rw.process_id )= 14
<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
and o.order_id regexp #{damageReportDTO.orderId}
</if>
@@ -462,7 +544,7 @@
and dd.breakage_reason regexp #{damageReportDTO.breakageReason}
</if>
GROUP BY
- dd.id
+ dd.id
limit #{offset},#{pageSize};
</select>
@@ -516,30 +598,26 @@
</select>
<select id="splittingDetailsOutsideMp">
- SELECT
- fc.process_id processId,
- fc.order_number orderNumber,
- fc.technology_number as technologyNumber,
- o.project,
- o.batch,
- ogd.child_width as childWidth,
- ogd.child_height as childHeight,
- fc.quantity,
- round( ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2 ) as area,
- od.shape,
- od.remarks
- FROM
- sd.ORDER AS o
- LEFT JOIN sd.order_detail AS od ON od.order_id = od.order_id
- LEFT JOIN sd.order_glass_detail AS ogd ON o.order_id = ogd.order_id
- AND ogd.order_number = od.order_number
- LEFT JOIN flow_card AS fc ON fc.order_id = ogd.order_id
- AND fc.order_number
- AND fc.technology_number = ogd.technology_number
- WHERE
- fc.order_id = #{orderId}
- GROUP BY
- fc.id
+ SELECT fc.process_id processId,
+ fc.order_number orderNumber,
+ fc.technology_number as technologyNumber,
+ o.project,
+ o.batch,
+ ogd.child_width as childWidth,
+ ogd.child_height as childHeight,
+ fc.quantity,
+ round(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area,
+ if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', '')) as shape,
+ od.remarks
+ FROM sd.ORDER AS o
+ LEFT JOIN sd.order_detail AS od ON od.order_id = od.order_id
+ LEFT JOIN sd.order_glass_detail AS ogd ON o.order_id = ogd.order_id
+ AND ogd.order_number = od.order_number
+ LEFT JOIN flow_card AS fc ON fc.order_id = ogd.order_id
+ AND fc.order_number
+ AND fc.technology_number = ogd.technology_number
+ WHERE fc.order_id = #{orderId}
+ GROUP BY fc.id
</select>
<select id="qualityReportMp">
@@ -550,10 +628,10 @@
fc.technology_number,
od.product_name,
od.quantity,
- ifnull(MAX(opd.reporting_work_num_count),0) as quantityMax,
+ ifnull(MAX(opd.reporting_work_num_count), 0) as quantityMax,
IFNULL(SUM(distinct dd.breakage_quantity), 0) as breakage_quantity,
IFNULL(sum(distinct pl.patch_num), 0) as patch_num,
- ifnull(fc.received_quantity,0) as received_quantity,
+ ifnull(fc.received_quantity, 0) as received_quantity,
CONCAT(ROUND(ROUND(od.quantity / MAX(opd.reporting_work_num_count), 2) * 100), '%') as finished
FROM sd.`order` AS o
LEFT JOIN sd.order_detail AS od ON od.order_id = o.order_id
@@ -612,55 +690,52 @@
</select>
<select id="productionScheduleMp">
- select
- a.order_number,
- a.shape,
- a.product_name,
- b.child_width,
- b.child_height,
- c.quantity,
- c.technology_number,
- b.glass_child,
- ifnull(e.reportWorkQuantity,0) as reportWorkQuantity,
- ifnull(e.reportWorkQuantityCount,0) as reportWorkQuantityCount,
- ifnull(f.inventory,0) as inventoryNum,
- round(ifnull(f.inventory,0)*a.area,2) as inventoryArea,
- ifnull(dd.quantity,0) as shippedQuantity,
- ifnull(dd.area,0) as area
+ select a.order_number,
+ if(a.shape = 1, '鏅舰', if(a.shape = 2, '寮傚舰', '')) as shape,
+ a.product_name,
+ b.child_width,
+ b.child_height,
+ c.quantity,
+ c.technology_number,
+ b.glass_child,
+ ifnull(e.reportWorkQuantity, 0) as reportWorkQuantity,
+ ifnull(e.reportWorkQuantityCount, 0) as reportWorkQuantityCount,
+ ifnull(f.inventory, 0) as inventoryNum,
+ round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
+ ifnull(dd.quantity, 0) as shippedQuantity,
+ ifnull(dd.area, 0) as area,
+ JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')) AS glassNumber
- from
- flow_card as c
- left join
- sd.order_detail as a
- on c.order_id = a.order_id
- and c.order_number = a.order_number
- left join sd.order_glass_detail as b
- on c.order_id = b.order_id
- and b.order_number = c.order_number
- and c.technology_number = b.technology_number
- left join sd.`order` as d
- on c.order_id = d.order_id
- left join mm.finished_goods_inventory as f
- on c.order_id = f.order_id and f.order_number = c.order_number
- left join (
- SELECT process_id,
- technology_number,
- sum(a.broken_num) as broken_num,
- concat('{',
- GROUP_CONCAT(concat("\"",process,"\":\"",reporting_work_num,"\"")),
- '}'
- ) as reportWorkQuantity,
- concat('{',
- GROUP_CONCAT(concat("\"",process,"\":\"",reporting_work_num,"\"")),
- '}'
- ) as reportWorkQuantityCount
- FROM sd.order_process_detail as a
- where a.order_id=#{orderId}
- GROUP BY process_id,a.technology_number
- ) as e
- on e.process_id = c.process_id
- and e.technology_number = c.technology_number
- left join sd.delivery_detail as dd on dd.order_id=a.order_id and dd.order_number=a.order_number
+ from flow_card as c
+ left join
+ sd.order_detail as a
+ on c.order_id = a.order_id
+ and c.order_number = a.order_number
+ left join sd.order_glass_detail as b
+ on c.order_id = b.order_id
+ and b.order_number = c.order_number
+ and c.technology_number = b.technology_number
+ left join sd.`order` as d
+ on c.order_id = d.order_id
+ left join mm.finished_goods_inventory as f
+ on c.order_id = f.order_id and f.order_number = c.order_number
+ left join (SELECT process_id,
+ technology_number,
+ sum(a.broken_num) as broken_num,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
+ '}'
+ ) as reportWorkQuantity,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
+ '}'
+ ) as reportWorkQuantityCount
+ FROM sd.order_process_detail as a
+ where a.order_id = #{orderId}
+ GROUP BY process_id, a.technology_number) as e
+ on e.process_id = c.process_id
+ and e.technology_number = c.technology_number
+ left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
where a.order_id = #{orderId}
ORDER BY a.order_number
</select>
@@ -669,11 +744,11 @@
select d.customer_name as customerName,
d.project,
d.batch,
- c.order_id as orderId,
+ c.order_id as orderId,
d.quantity,
d.area,
- dd.quantity as shippedQuantity,
- dd.area as shippedArea,
+ dd.quantity as shippedQuantity,
+ dd.area as shippedArea,
e.reportWorkQuantity,
e.reportWorkQuantityCount
@@ -693,100 +768,82 @@
technology_number,
sum(a.broken_num) as broken_num,
concat('{',
- GROUP_CONCAT(concat("\"", process, "\":\"", ifnull(reporting_work_num,0), "\"")),
+ GROUP_CONCAT(concat("\"", process, "\":\"", ifnull(reporting_work_num, 0), "\"")),
'}'
) as reportWorkQuantity,
concat('{',
- GROUP_CONCAT(concat("\"", process, "\":\"", ifnull(reporting_work_num,0), "\"")),
+ GROUP_CONCAT(concat("\"", process, "\":\"", ifnull(reporting_work_num, 0), "\"")),
'}'
) as reportWorkQuantityCount
FROM sd.order_process_detail as a
left join sd.`order` as o on o.order_id = a.order_id
where o.create_time BETWEEN #{selectTime1} and #{selectTime2}
- GROUP BY process_id,a.technology_number
- ) as e
+ GROUP BY process_id, a.technology_number) as e
on e.process_id = c.process_id
and e.technology_number = c.technology_number
left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
- where d.create_time BETWEEN #{selectTime1} and #{selectTime2} and reportWorkQuantity is not null
+ where d.create_time BETWEEN #{selectTime1} and #{selectTime2}
+ and reportWorkQuantity is not null
GROUP BY a.order_id
ORDER BY a.order_id
</select>
<select id="orderPlanDecompositionMp">
- SELECT
- o.order_id,
- o.customer_name,
- o.project,
- o.batch,
- o.quantity,
- o.area,
- date(fc.create_time) as create_time,
- date(orw.startTime) as startTime,
- ifnull(oopd.completionsNum,0) as completionsNum,
- sum( DISTINCT fc.received_quantity ) AS received_quantity,
- o.quantity-sum( DISTINCT fc.received_quantity ) AS receivedNo,
- IF(fc.quantity=fc.received_quantity,'宸叉竻鍗�','') as accomplish,
- DATEDIFF(
- MAX( rw.reporting_work_time ),
- min( rw.reporting_work_time ))+1 AS daysDifference
- FROM
- sd.`order` AS o
- LEFT JOIN flow_card AS fc ON fc.order_id = o.order_id
- LEFT JOIN (
- SELECT
- a.order_id,
- MIN( b.reporting_work_time ) AS startTime
- FROM
- sd.`order` AS a
- LEFT JOIN reporting_work AS b ON a.order_id = b.order_id
- WHERE
- b.this_process = '鍒囧壊'
- AND a.create_time BETWEEN #{selectTime1} and #{selectTime2}
- GROUP BY
- a.order_id
- ) AS orw ON orw.order_id = o.order_id
- LEFT JOIN (
- SELECT
- a.order_id,
- SUM( b.reporting_work_num ) AS completionsNum
- FROM
- sd.`order` AS a
- LEFT JOIN sd.order_process_detail AS b ON a.order_id = b.order_id
- WHERE
- b.process = '鍖呰'
- AND a.create_time BETWEEN #{selectTime1} and #{selectTime2}
- GROUP BY
- a.order_id
- ) AS oopd ON oopd.order_id = o.order_id
- LEFT JOIN reporting_work AS rw ON rw.order_id = fc.order_id
- AND rw.process_id = fc.process_id
- WHERE
- o.create_time BETWEEN #{selectTime1} and #{selectTime2}
+ SELECT o.order_id,
+ o.customer_name,
+ o.project,
+ o.batch,
+ o.quantity,
+ o.area,
+ date(fc.create_time) as create_time,
+ date(orw.startTime) as startTime,
+ ifnull(oopd.completionsNum, 0) as completionsNum,
+ sum(DISTINCT fc.received_quantity) AS received_quantity,
+ o.quantity - sum(DISTINCT fc.received_quantity) AS receivedNo,
+ IF(fc.quantity = fc.received_quantity, '宸叉竻鍗�', '') as accomplish,
+ DATEDIFF(
+ MAX(rw.reporting_work_time),
+ min(rw.reporting_work_time)) + 1 AS daysDifference
+ FROM sd.`order` AS o
+ LEFT JOIN flow_card AS fc ON fc.order_id = o.order_id
+ LEFT JOIN (SELECT a.order_id,
+ MIN(b.reporting_work_time) AS startTime
+ FROM sd.`order` AS a
+ LEFT JOIN reporting_work AS b ON a.order_id = b.order_id
+ WHERE b.this_process = '鍒囧壊'
+ AND a.create_time BETWEEN #{selectTime1} and #{selectTime2}
+ GROUP BY a.order_id) AS orw ON orw.order_id = o.order_id
+ LEFT JOIN (SELECT a.order_id,
+ SUM(b.reporting_work_num) AS completionsNum
+ FROM sd.`order` AS a
+ LEFT JOIN sd.order_process_detail AS b ON a.order_id = b.order_id
+ WHERE b.process = '鍖呰'
+ AND a.create_time BETWEEN #{selectTime1} and #{selectTime2}
+ GROUP BY a.order_id) AS oopd ON oopd.order_id = o.order_id
+ LEFT JOIN reporting_work AS rw ON rw.order_id = fc.order_id
+ AND rw.process_id = fc.process_id
+ WHERE o.create_time BETWEEN #{selectTime1} and #{selectTime2}
AND fc.create_time IS NOT NULL
- GROUP BY
- o.order_id
+ GROUP BY o.order_id
</select>
<select id="rawMaterialRequisitionMp">
- SELECT
- fc.project_no,
- modl.material_name,
- modl.producer,
- ou.width,
- ou.height,
- modl.date_of_manufacture,
- SUM(distinct modl.outbound_quantity) as quantity,
- ROUND(SUM(modl.outbound_quantity)*SUM(modl.single_piece_area),2) as area,
- date(mo.material_requisition_date) as date
- FROM
- mm.material_outbound_detail AS modl
- left join mm.material_outbound as mo on mo.material_outbound_id=modl.material_outbound_id
- LEFT JOIN optimize_use AS ou ON modl.use_id = ou.id and ou.raw_stock_code=modl.inventory_id
- LEFT JOIN flow_card AS fc ON ou.project_no = fc.project_no
- where modl.use_id IS NOT NULL and mo.material_requisition_date BETWEEN #{selectTime1} and #{selectTime2}
- GROUP BY
- ou.width,ou.height,material_code
+ SELECT fc.project_no,
+ modl.material_name,
+ modl.producer,
+ ou.width,
+ ou.height,
+ modl.date_of_manufacture,
+ SUM(distinct modl.outbound_quantity) as quantity,
+ ROUND(SUM(modl.outbound_quantity) * SUM(modl.single_piece_area), 2) as area,
+ date(mo.material_requisition_date) as date
+ FROM mm.material_outbound_detail AS modl
+ left join mm.material_outbound as mo on mo.material_outbound_id = modl.material_outbound_id
+ LEFT JOIN optimize_use AS ou ON modl.use_id = ou.id and ou.raw_stock_code = modl.inventory_id
+ LEFT JOIN flow_card AS fc ON ou.project_no = fc.project_no
+ where modl.use_id IS NOT NULL
+ and mo.material_requisition_date BETWEEN #{selectTime1} and #{selectTime2}
+ GROUP BY ou.width, ou.height, material_code
</select>
<select id="exportCrossProcessBreakingMp">
@@ -850,62 +907,46 @@
</select>
<select id="exportOrderPlanDecompositionMp">
- SELECT
- o.order_id,
- o.customer_name,
- o.project,
- o.batch,
- o.quantity,
- o.area,
- date(fc.create_time) as create_time,
- date(orw.startTime) as startTime,
- oopd.completionsNum,
- sum( DISTINCT fc.received_quantity ) AS received_quantity,
- sum( DISTINCT fc.quantity - fc.received_quantity ) AS receivedNo,
- IF(fc.quantity=fc.received_quantity,'宸叉竻鍗�','') as accomplish,
- DATEDIFF(
- MAX( rw.reporting_work_time ),
- min( rw.reporting_work_time ))+1 AS daysDifference
- FROM
- sd.`order` AS o
- LEFT JOIN flow_card AS fc ON fc.order_id = o.order_id
- LEFT JOIN (
- SELECT
- a.order_id,
- MIN( b.reporting_work_time ) AS startTime
- FROM
- sd.`order` AS a
- LEFT JOIN reporting_work AS b ON a.order_id = b.order_id
- WHERE
- b.this_process = '鍒囧壊'
- AND date(a.create_time) >= #{dates[0]}
- and date(a.create_time) <= #{dates[1]}
+ SELECT o.order_id,
+ o.customer_name,
+ o.project,
+ o.batch,
+ o.quantity,
+ o.area,
+ date(fc.create_time) as create_time,
+ date(orw.startTime) as startTime,
+ oopd.completionsNum,
+ sum(DISTINCT fc.received_quantity) AS received_quantity,
+ sum(DISTINCT fc.quantity - fc.received_quantity) AS receivedNo,
+ IF(fc.quantity = fc.received_quantity, '宸叉竻鍗�', '') as accomplish,
+ DATEDIFF(
+ MAX(rw.reporting_work_time),
+ min(rw.reporting_work_time)) + 1 AS daysDifference
+ FROM sd.`order` AS o
+ LEFT JOIN flow_card AS fc ON fc.order_id = o.order_id
+ LEFT JOIN (SELECT a.order_id,
+ MIN(b.reporting_work_time) AS startTime
+ FROM sd.`order` AS a
+ LEFT JOIN reporting_work AS b ON a.order_id = b.order_id
+ WHERE b.this_process = '鍒囧壊'
+ AND date(a.create_time) >= #{dates[0]}
+ and date(a.create_time) <= #{dates[1]}
- GROUP BY
- a.order_id
- ) AS orw ON orw.order_id = o.order_id
- LEFT JOIN (
- SELECT
- a.order_id,
- SUM( b.reporting_work_num ) AS completionsNum
- FROM
- sd.`order` AS a
- LEFT JOIN sd.order_process_detail AS b ON a.order_id = b.order_id
- WHERE
- b.process = '鍖呰'
- AND date(a.create_time) >= #{dates[0]}
- and date(a.create_time) <= #{dates[1]}
- GROUP BY
- a.order_id
- ) AS oopd ON oopd.order_id = o.order_id
- LEFT JOIN reporting_work AS rw ON rw.order_id = fc.order_id
- AND rw.process_id = fc.process_id
- WHERE
- date(o.create_time) >= #{dates[0]}
- and date(o.create_time) <= #{dates[1]}
+ GROUP BY a.order_id) AS orw ON orw.order_id = o.order_id
+ LEFT JOIN (SELECT a.order_id,
+ SUM(b.reporting_work_num) AS completionsNum
+ FROM sd.`order` AS a
+ LEFT JOIN sd.order_process_detail AS b ON a.order_id = b.order_id
+ WHERE b.process = '鍖呰'
+ AND date(a.create_time) >= #{dates[0]}
+ and date(a.create_time) <= #{dates[1]}
+ GROUP BY a.order_id) AS oopd ON oopd.order_id = o.order_id
+ LEFT JOIN reporting_work AS rw ON rw.order_id = fc.order_id
+ AND rw.process_id = fc.process_id
+ WHERE date(o.create_time) >= #{dates[0]}
+ and date(o.create_time) <= #{dates[1]}
AND fc.create_time IS NOT NULL
- GROUP BY
- o.order_id
+ GROUP BY o.order_id
</select>
<select id="exportProcessToBeCompletedMp">
@@ -952,8 +993,8 @@
and odpd.process = #{process}
and date(o.create_time) >= #{date[0]}
and date(o.create_time) <= #{date[1]}
- and position(ifnull(#{inputVal},'') in od.order_id)
- and position(ifnull(#{project},'') in o.project)
+ and position(ifnull(#{inputVal}, '') in od.order_id)
+ and position(ifnull(#{project}, '') in o.project)
and od.quantity > odpd.reporting_work_num
group by fc.process_id, fc.order_number, fc.technology_number
@@ -961,13 +1002,13 @@
</select>
<select id="exportWorkInProgressMp">
- select #{process} as thisProcess,
+ select #{process} as thisProcess,
fc.process_id,
o.customer_name,
o.project,
o.order_id,
o.batch,
- od.shape,
+ if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', '')) as shape,
ogd.order_number,
ogd.technology_number,
ogd.process,
@@ -975,10 +1016,10 @@
ogd.child_width,
ogd.child_height,
odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
- odpd.broken_num as stockNum,
+ odpd.broken_num as stockNum,
ROUND(ogd.child_width * ogd.child_height *
(odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
- odpd.broken_num) / 1000000, 2) as stockArea,
+ odpd.broken_num) / 1000000, 2) as stockArea,
od.product_name,
od.bend_radius
@@ -1009,7 +1050,7 @@
reporting_work as rwk
on rw.reporting_work_id = rwk.reporting_work_id
where rwk.this_process = #{process}
- and rw.review_status = 1
+ and rw.review_status >= 0
GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
on c.process_id = fc.process_id
and c.order_sort = fc.order_number
@@ -1019,10 +1060,11 @@
where LENGTH(fc.process_id) = 14
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
- and odpd.process = #{process} and date(o.create_time) >= #{date[0]}
+ and odpd.process = #{process}
+ and date(o.create_time) >= #{date[0]}
and date(o.create_time) <= #{date[1]}
- and position(ifnull(#{inputVal},'') in od.order_id)
- and position(ifnull(#{project},'') in o.project)
+ and position(ifnull(#{inputVal}, '') in od.order_id)
+ and position(ifnull(#{project}, '') in o.project)
group by fc.process_id, fc.order_number, fc.technology_number
order by fc.process_id, fc.order_number, fc.technology_number
@@ -1032,11 +1074,11 @@
select d.customer_name as customerName,
d.project,
d.batch,
- c.order_id as orderId,
+ c.order_id as orderId,
d.quantity,
d.area,
- dd.quantity as shippedQuantity,
- dd.area as shippedArea,
+ dd.quantity as shippedQuantity,
+ dd.area as shippedArea,
e.reportWorkQuantity,
e.reportWorkQuantityCount
@@ -1056,24 +1098,25 @@
technology_number,
sum(a.broken_num) as broken_num,
concat('{',
- GROUP_CONCAT(concat("\"", process, "\":\"", ifnull(reporting_work_num,0), "\"")),
+ GROUP_CONCAT(concat("\"", process, "\":\"", ifnull(reporting_work_num, 0), "\"")),
'}'
) as reportWorkQuantity,
concat('{',
- GROUP_CONCAT(concat("\"", process, "\":\"", ifnull(reporting_work_num,0), "\"")),
+ GROUP_CONCAT(concat("\"", process, "\":\"", ifnull(reporting_work_num, 0), "\"")),
'}'
) as reportWorkQuantityCount
FROM sd.order_process_detail as a
left join sd.`order` as o on o.order_id = a.order_id
where date(o.create_time) >= #{date[0]}
and date(o.create_time) <= #{date[1]}
- GROUP BY process_id,a.technology_number
- ) as e
+ GROUP BY process_id, a.technology_number) as e
on e.process_id = c.process_id
and e.technology_number = c.technology_number
left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
- where d.create_time and date(o.create_time) >= #{dates[0]}
- and date(o.create_time) <= #{dates[1]} and reportWorkQuantity is not null
+ where d.create_time
+ and date(o.create_time) >= #{dates[0]}
+ and date(o.create_time) <= #{dates[1]}
+ and reportWorkQuantity is not null
GROUP BY a.order_id
ORDER BY a.order_id
</select>
@@ -1093,9 +1136,8 @@
LEFT JOIN optimize_use AS ou ON modl.use_id = ou.id and ou.raw_stock_code = modl.inventory_id
LEFT JOIN flow_card AS fc ON ou.project_no = fc.project_no
where modl.use_id IS NOT NULL
- and
- date(mo.material_requisition_date) >= #{dates[0]}
- and date(mo.material_requisition_date) <= #{dates[1]}
+ and date(mo.material_requisition_date) >= #{dates[0]}
+ and date(mo.material_requisition_date) <= #{dates[1]}
GROUP BY ou.width, ou.height, material_code
</select>
@@ -1132,9 +1174,8 @@
AND opd.order_number = fc.order_number
AND opd.technology_number = fc.technology_number
- WHERE
- date(o.create_time) >= #{dates[0]}
- and date(o.create_time) <= #{dates[1]}
+ WHERE date(o.create_time) >= #{dates[0]}
+ and date(o.create_time) <= #{dates[1]}
GROUP BY o.order_id,
fc.order_number,
fc.technology_number
@@ -1172,43 +1213,29 @@
<select id="teamOutputMp" resultMap="teamOutputMap">
SELECT
- rw.reporting_work_time,
- rw.this_process,
- rw.teams_groups_name,
- o.project,
- rw.process_id,
- rwd.order_number,
- MAX( ogd.child_width ) as width,
- MAX( ogd.child_height ) as height,
- od.shape,
- sum( pd.thickness ) as thickness,
- od.edging_type,
- rwd.completed_quantity,
- ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*rwd.completed_quantity/1000000,2) as area,
- od.product_name
+ rw.reporting_work_time,
+ rw.this_process,
+ rw.teams_groups_name,
+ o.project,
+ rw.process_id,
+ fc.order_number,
+ MAX( ogd.child_width ) as width,
+ MAX( ogd.child_height ) as height,
+ od.edging_type,
+ opd.reporting_work_num as completed_quantity,
+ ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*opd.reporting_work_num/1000000,2) as area,
+ od.product_name,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code
FROM
- reporting_work AS rw
- LEFT JOIN reporting_work_detail AS rwd ON rw.reporting_work_id = rwd.reporting_work_id
- LEFT JOIN sd.`order` AS o ON o.order_id = rw.order_id
- LEFT JOIN sd.order_detail AS od ON od.order_id = o.order_id
- AND od.order_number = rwd.order_number
- LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
- AND ogd.order_number = rwd.order_number
- AND ogd.technology_number = rwd.technology_number
- AND ogd.order_number = od.order_number
- LEFT JOIN (
- SELECT
- prod_id,
- glass_sort,
- REPLACE ( JSON_UNQUOTE( JSON_EXTRACT( separation, '$.thickness' )), 'mm', '' ) AS thickness
- FROM
- sd.product_detail
- WHERE
- detail_type = "glass"
- ) AS pd ON pd.prod_id = od.product_id
- AND pd.glass_sort = rwd.technology_number
- where rw.reviewed_state=1 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
- and rw.this_process=#{selectProcesses}
+ sd.`order` as o left join sd.order_detail as od on od.order_id=o.order_id
+ left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
+ left join flow_card as fc on fc.order_id=ogd.order_id and fc.order_number=ogd.order_number and fc.technology_number=ogd.technology_number
+ left join reporting_work as rw on rw.order_id=od.order_id and rw.process_id=fc.process_id
+ left join sd.order_process_detail as opd on opd.order_id = o.order_id AND opd.process_id = rw.process_id
+ AND opd.order_number = fc.order_number AND opd.technology_number = fc.technology_number and opd.process=rw.this_process
+ left join sd.product_detail as pd on pd.prod_id = od.product_id and pd.glass_sort = fc.technology_number and detail_type = "glass"
+ where opd.reporting_work_num > 0 and rw.reviewed_state=1 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
+ and position(#{selectProcesses} in rw.this_process)
<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
and rw.this_process regexp #{teamOutputDTO.thisProcess}
</if>
@@ -1220,55 +1247,95 @@
</if>
<if test="teamOutputDTO.processId != null and teamOutputDTO.processId != ''">
and rw.process_id regexp #{teamOutputDTO.processId}
- </if>
- <if test="teamOutputDTO.thickness != null and teamOutputDTO.thickness != ''">
- and thickness regexp #{teamOutputDTO.thickness}
</if>
<if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
and od.edging_type regexp #{teamOutputDTO.edgingType}
</if>
GROUP BY
- rwd.order_number,
- rw.this_process,
- rw.teams_groups_name,
- rw.process_id,
- rw.reporting_work_id
+ rw.this_process,
+ rw.teams_groups_name,
+ rw.process_id,
+ fc.order_number
ORDER BY
- rw.this_process,
- rw.reporting_work_time,
- rw.teams_groups_name,
- rw.process_id
+ rw.this_process,
+ rw.process_id,
+ fc.order_number,
+ rw.reporting_work_time,
+ rw.teams_groups_name
limit #{offset},#{pageSize};
+ </select>
+
+ <select id="exportTeamOutputMp">
+ SELECT
+ rw.reporting_work_time,
+ rw.this_process,
+ rw.teams_groups_name,
+ o.project,
+ rw.process_id,
+ fc.order_number,
+ MAX( ogd.child_width ) as width,
+ MAX( ogd.child_height ) as height,
+ od.edging_type,
+ opd.reporting_work_num as completed_quantity,
+ ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*opd.reporting_work_num/1000000,2) as area,
+ od.product_name,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code
+ FROM
+ sd.`order` as o left join sd.order_detail as od on od.order_id=o.order_id
+ left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
+ left join flow_card as fc on fc.order_id=ogd.order_id and fc.order_number=ogd.order_number and fc.technology_number=ogd.technology_number
+ left join reporting_work as rw on rw.order_id=od.order_id and rw.process_id=fc.process_id
+ left join sd.order_process_detail as opd on opd.order_id = o.order_id AND opd.process_id = rw.process_id
+ AND opd.order_number = fc.order_number AND opd.technology_number = fc.technology_number and opd.process=rw.this_process
+ left join sd.product_detail as pd on pd.prod_id = od.product_id and pd.glass_sort = fc.technology_number and detail_type = "glass"
+ where opd.reporting_work_num > 0 and rw.reviewed_state=1
+ and date(rw.reporting_work_time) >= #{date[0]}
+ and date(rw.reporting_work_time) <= #{date[1]}
+ and position(#{process} in rw.this_process)
+ GROUP BY
+ rw.this_process,
+ rw.teams_groups_name,
+ rw.process_id,
+ fc.order_number
+ ORDER BY
+ rw.this_process,
+ rw.process_id,
+ fc.order_number,
+ rw.reporting_work_time,
+ rw.teams_groups_name
</select>
<select id="teamOutputPageTotal">
SELECT
- CEILING(count(rw.reporting_work_id)/#{pageSize}) as 'pageTotal',
- count(distinct rw.reporting_work_id) as 'total'
+ CEILING(count(*)/#{pageSize}) as 'pageTotal',
+ count(*) as 'total'
FROM
- reporting_work AS rw
- LEFT JOIN reporting_work_detail AS rwd ON rw.reporting_work_id = rwd.reporting_work_id
- LEFT JOIN sd.`order` AS o ON o.order_id = rw.order_id
- LEFT JOIN sd.order_detail AS od ON od.order_id = o.order_id
- AND od.order_number = rwd.order_number
- LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
- AND ogd.order_number = rwd.order_number
- AND ogd.technology_number = rwd.technology_number
- AND ogd.order_number = od.order_number
- LEFT JOIN (
+ (
SELECT
- prod_id,
- glass_sort,
- REPLACE ( JSON_UNQUOTE( JSON_EXTRACT( separation, '$.thickness' )), 'mm', '' ) AS thickness
+ rw.reporting_work_time,
+ rw.this_process,
+ rw.teams_groups_name,
+ o.project,
+ rw.process_id,
+ fc.order_number,
+ MAX( ogd.child_width ) as width,
+ MAX( ogd.child_height ) as height,
+ od.edging_type,
+ opd.reporting_work_num as completed_quantity,
+ ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*opd.reporting_work_num/1000000,2) as area,
+ od.product_name,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code
FROM
- sd.product_detail
- WHERE
- detail_type = "glass"
- ) AS pd ON pd.prod_id = od.product_id
- AND pd.glass_sort = rwd.technology_number
- where rw.reviewed_state=1 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
- and rw.this_process=#{selectProcesses}
+ sd.`order` as o left join sd.order_detail as od on od.order_id=o.order_id
+ left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
+ left join flow_card as fc on fc.order_id=ogd.order_id and fc.order_number=ogd.order_number and fc.technology_number=ogd.technology_number
+ left join reporting_work as rw on rw.order_id=od.order_id and rw.process_id=fc.process_id
+ left join sd.order_process_detail as opd on opd.order_id = o.order_id AND opd.process_id = rw.process_id
+ AND opd.order_number = fc.order_number AND opd.technology_number = fc.technology_number and opd.process=rw.this_process
+ left join sd.product_detail as pd on pd.prod_id = od.product_id and pd.glass_sort = fc.technology_number and detail_type = "glass"
+ where opd.reporting_work_num > 0 and rw.reviewed_state=1 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
+ and position(#{selectProcesses} in rw.this_process)
<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
and rw.this_process regexp #{teamOutputDTO.thisProcess}
</if>
@@ -1281,13 +1348,365 @@
<if test="teamOutputDTO.processId != null and teamOutputDTO.processId != ''">
and rw.process_id regexp #{teamOutputDTO.processId}
</if>
- <if test="teamOutputDTO.thickness != null and teamOutputDTO.thickness != ''">
- and thickness regexp #{teamOutputDTO.thickness}
- </if>
<if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
and od.edging_type regexp #{teamOutputDTO.edgingType}
</if>
+ GROUP BY
+ rw.this_process,
+ rw.teams_groups_name,
+ rw.process_id,
+ fc.order_number
+ ORDER BY
+ rw.this_process,
+ rw.process_id,
+ fc.order_number,
+ rw.reporting_work_time,
+ rw.teams_groups_name
+ ) as page_toal
+ limit #{offset},#{pageSize}
+ </select>
+ <select id="workInProgressOrderMp" resultMap="workInProgressMap">
+ select #{selectProcesses} as thisProcess,
+ o.customer_name,
+ o.project,
+ o.order_id,
+ o.batch,
+ if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', '')) as shape,
+ sum(od.quantity) as quantity,
+ sum(odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num) as stockNum,
+ sum(ROUND(ogd.child_width * ogd.child_height *
+ (odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num) / 1000000, 2)) as stockArea,
+ od.product_name
+
+ from sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id = ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
+ left join sd.order_process_detail as odpds
+ ON odpds.id = odpd.id - 1
+ left join
+ (SELECT sum(rw.rework_num) as 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ from rework as rw
+ LEFT JOIN
+ reporting_work as rwk
+ on rw.reporting_work_id = rwk.reporting_work_id
+ where rwk.this_process = #{selectProcesses}
+ and rw.review_status >= 0
+ GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
+ on c.process_id = fc.process_id
+ and c.order_sort = fc.order_number
+ and c.technology_number = fc.technology_number
+ left join sd.`order` as o
+ on o.order_id = od.order_id
+ where LENGTH(fc.process_id) = 14
+ and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num != 0
+ and odpd.process = #{selectProcesses}
+ and position(#{orderId} in od.order_id)
+ and position(#{inputProject} in o.project)
+ <if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
+ and o.customer_name regexp #{workInProgressDTO.customerName}
+ </if>
+ <if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
+ and o.project regexp #{workInProgressDTO.project}
+ </if>
+ <if test="workInProgressDTO.orderId != null and workInProgressDTO.orderId != ''">
+ and o.order_id regexp #{workInProgressDTO.orderId}
+ </if>
+ <if test="workInProgressDTO.batch != null and workInProgressDTO.batch != ''">
+ and o.batch regexp #{workInProgressDTO.batch}
+ </if>
+ group by o.order_id
+ order by o.order_id
limit #{offset},#{pageSize};
</select>
+
+ <select id="workInProgressOrderTotal">
+ select CEILING(count(o.order_id)/#{pageSize}) as 'pageTotal',
+ count(distinct o.order_id) as 'total'
+
+ from sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id = ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
+ left join sd.order_process_detail as odpds
+ ON odpds.id = odpd.id - 1
+ left join
+ (SELECT sum(rw.rework_num) as 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ from rework as rw
+ LEFT JOIN
+ reporting_work as rwk
+ on rw.reporting_work_id = rwk.reporting_work_id
+ where rwk.this_process = #{selectProcesses}
+ and rw.review_status >= 0
+ GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
+ on c.process_id = fc.process_id
+ and c.order_sort = fc.order_number
+ and c.technology_number = fc.technology_number
+ left join sd.`order` as o
+ on o.order_id = od.order_id
+ where LENGTH(fc.process_id) = 14
+ and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num != 0
+ and odpd.process = #{selectProcesses}
+ and position(#{orderId} in od.order_id)
+ and position(#{inputProject} in o.project)
+ <if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
+ and o.customer_name regexp #{workInProgressDTO.customerName}
+ </if>
+ <if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
+ and o.project regexp #{workInProgressDTO.project}
+ </if>
+ <if test="workInProgressDTO.orderId != null and workInProgressDTO.orderId != ''">
+ and o.order_id regexp #{workInProgressDTO.orderId}
+ </if>
+ <if test="workInProgressDTO.batch != null and workInProgressDTO.batch != ''">
+ and o.batch regexp #{workInProgressDTO.batch}
+ </if>
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="workInProgressProcessMp" resultMap="workInProgressMap">
+ select #{selectProcesses} as thisProcess,
+ o.customer_name,
+ o.project,
+ o.order_id,
+ fc.process_id,
+ o.batch,
+ if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', '')) as shape,
+ sum(od.quantity) as quantity,
+ sum(odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num) as stockNum,
+ sum(ROUND(ogd.child_width * ogd.child_height *
+ (odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num) / 1000000, 2)) as stockArea,
+ od.product_name
+
+ from sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id = ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
+ left join sd.order_process_detail as odpds
+ ON odpds.id = odpd.id - 1
+ left join
+ (SELECT sum(rw.rework_num) as 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ from rework as rw
+ LEFT JOIN
+ reporting_work as rwk
+ on rw.reporting_work_id = rwk.reporting_work_id
+ where rwk.this_process = #{selectProcesses}
+ and rw.review_status >= 0
+ GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
+ on c.process_id = fc.process_id
+ and c.order_sort = fc.order_number
+ and c.technology_number = fc.technology_number
+ left join sd.`order` as o
+ on o.order_id = od.order_id
+ where LENGTH(fc.process_id) = 14
+ and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num != 0
+ and odpd.process = #{selectProcesses}
+ and position(#{orderId} in od.order_id)
+ and position(#{inputProject} in o.project)
+ <if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
+ and o.customer_name regexp #{workInProgressDTO.customerName}
+ </if>
+ <if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
+ and o.project regexp #{workInProgressDTO.project}
+ </if>
+ <if test="workInProgressDTO.orderId != null and workInProgressDTO.orderId != ''">
+ and o.order_id regexp #{workInProgressDTO.orderId}
+ </if>
+ <if test="workInProgressDTO.batch != null and workInProgressDTO.batch != ''">
+ and o.batch regexp #{workInProgressDTO.batch}
+ </if>
+ <if test="workInProgressDTO.processId != null and workInProgressDTO.processId != ''">
+ and fc.process_id regexp #{workInProgressDTO.processId}
+ </if>
+ group by o.order_id, fc.process_id
+ order by o.order_id, fc.process_id
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="workInProgressProcessTotal">
+ select CEILING(count(fc.process_id)/#{pageSize}) as 'pageTotal',
+ count(distinct fc.process_id) as 'total'
+
+ from sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id = ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
+ left join sd.order_process_detail as odpds
+ ON odpds.id = odpd.id - 1
+ left join
+ (SELECT sum(rw.rework_num) as 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ from rework as rw
+ LEFT JOIN
+ reporting_work as rwk
+ on rw.reporting_work_id = rwk.reporting_work_id
+ where rwk.this_process = #{selectProcesses}
+ and rw.review_status >= 0
+ GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
+ on c.process_id = fc.process_id
+ and c.order_sort = fc.order_number
+ and c.technology_number = fc.technology_number
+ left join sd.`order` as o
+ on o.order_id = od.order_id
+ where LENGTH(fc.process_id) = 14
+ and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num != 0
+ and odpd.process = #{selectProcesses}
+ and position(#{orderId} in od.order_id)
+ and position(#{inputProject} in o.project)
+ <if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
+ and o.customer_name regexp #{workInProgressDTO.customerName}
+ </if>
+ <if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
+ and o.project regexp #{workInProgressDTO.project}
+ </if>
+ <if test="workInProgressDTO.orderId != null and workInProgressDTO.orderId != ''">
+ and o.order_id regexp #{workInProgressDTO.orderId}
+ </if>
+ <if test="workInProgressDTO.batch != null and workInProgressDTO.batch != ''">
+ and o.batch regexp #{workInProgressDTO.batch}
+ </if>
+ <if test="workInProgressDTO.processId != null and workInProgressDTO.processId != ''">
+ and fc.process_id regexp #{workInProgressDTO.processId}
+ </if>
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="scheduleProductionScheduleMp" resultMap="scheduleProductionScheduleMap">
+ select ps.order_id,
+ o.project,
+ ps.processes,
+ sum(ps.scheduling_quantity) as scheduling_quantity,
+ notes,
+ date(ps.scheduled_start_time) as scheduled_start_time,
+ date(ps.plan_end_time) as plan_end_time
+ from (select order_id, order_number, processes, scheduling_quantity, scheduled_start_time, plan_end_time, notes
+ from production_scheduling
+ where processes = #{processes}
+ GROUP BY order_id, order_number) as ps
+ left join sd.`order` as o on o.order_id = ps.order_id
+ where ps.processes = #{processes}
+ and ps.scheduled_start_time between #{selectTime1} and #{selectTime2}
+ <if test="scheduleProductionScheduleDTO.orderId != null and scheduleProductionScheduleDTO.orderId != ''">
+ and ps.order_id regexp #{scheduleProductionScheduleDTO.orderId}
+ </if>
+ <if test="scheduleProductionScheduleDTO.project != null and scheduleProductionScheduleDTO.project != ''">
+ and o.project regexp #{scheduleProductionScheduleDTO.project}
+ </if>
+ <if test="scheduleProductionScheduleDTO.processes != null and scheduleProductionScheduleDTO.processes != ''">
+ and ps.processes regexp #{scheduleProductionScheduleDTO.processes}
+ </if>
+ <if test="scheduleProductionScheduleDTO.notes != null and scheduleProductionScheduleDTO.notes != ''">
+ and ps.notes regexp #{scheduleProductionScheduleDTO.notes}
+ </if>
+ GROUP BY ps.order_id, ps.processes
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="getScheduleProductionScheduleTotal">
+ select CEILING(count(ps.order_id)/#{pageSize}) as 'pageTotal',
+ count(distinct ps.order_id) as 'total'
+ from (select order_id, order_number, processes, scheduling_quantity, scheduled_start_time, plan_end_time, notes
+ from production_scheduling
+ where processes = #{processes}
+ GROUP BY order_id, order_number) as ps
+ left join sd.`order` as o on o.order_id = ps.order_id
+ where ps.processes = #{processes}
+ and ps.scheduled_start_time between #{selectTime1} and #{selectTime2}
+ <if test="scheduleProductionScheduleDTO.orderId != null and scheduleProductionScheduleDTO.orderId != ''">
+ and ps.order_id regexp #{scheduleProductionScheduleDTO.orderId}
+ </if>
+ <if test="scheduleProductionScheduleDTO.project != null and scheduleProductionScheduleDTO.project != ''">
+ and o.project regexp #{scheduleProductionScheduleDTO.project}
+ </if>
+ <if test="scheduleProductionScheduleDTO.processes != null and scheduleProductionScheduleDTO.processes != ''">
+ and ps.processes regexp #{scheduleProductionScheduleDTO.processes}
+ </if>
+ <if test="scheduleProductionScheduleDTO.notes != null and scheduleProductionScheduleDTO.notes != ''">
+ and ps.notes regexp #{scheduleProductionScheduleDTO.notes}
+ </if>
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="exportScheduleReportMp">
+ select ps.order_id,
+ o.project,
+ ps.processes,
+ sum(ps.scheduling_quantity) as scheduling_quantity,
+ notes,
+ date(ps.scheduled_start_time) as scheduled_start_time,
+ date(ps.plan_end_time) as plan_end_time
+ from (select order_id, order_number, processes, scheduling_quantity, scheduled_start_time, plan_end_time, notes
+ from production_scheduling
+ where processes = #{process}
+ GROUP BY order_id, order_number) as ps
+ left join sd.`order` as o on o.order_id = ps.order_id
+ where ps.processes = #{process}
+ and date(scheduled_start_time) >= #{date[0]}
+ and date(scheduled_start_time) <= #{date[1]}
+ GROUP BY ps.order_id, ps.processes
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0