From c8db4741002fa18d0e70eb37b38a7d7cc025bdfd Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 25 八月 2025 17:04:25 +0800
Subject: [PATCH] 提交 流程卡撤回
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 1036 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 882 insertions(+), 154 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 4c262d2..4892304 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -92,6 +92,7 @@
<result column="area" property="area"/>
<result column="breakage_quantity" property="breakageQuantity"/>
<result column="project" property="project"/>
+ <result column="batch" property="batch"/>
<result column="process_id" property="processId"/>
<result column="order_number" property="orderNumber"/>
<result column="technology_number" property="technologyNumber"/>
@@ -127,6 +128,7 @@
<result column="examine_time" property="examineTime"/>
<result column="workProcessName" property="workProcessName"/>
<result column="device_name" property="deviceName"/>
+ <result column="order_type" property="orderType"/>
</resultMap>
<resultMap id="scheduleProductionScheduleMap" type="com.example.erp.dto.pp.ScheduleProductionScheduleDTO">
@@ -167,21 +169,40 @@
b.glass_child,
d.order_type,
concat(c.process_id, '/', c.technology_number) as process_id,
+ c.process_id as 'processId',
+ c.order_id,
c.order_number,
c.technology_number,
b.child_width,
b.child_height,
- c.quantity,
+ if(c.technology_number=1,c.quantity-ifnull(c.termination_quantity,0),0) as quantity,
+
+ c.quantity-ifnull(c.termination_quantity,0) as thisQuantity,/*鐢ㄤ簬鍒ゆ柇鏄惁鏀瑰彉棰滆壊*/
e.reportWorkQuantity,
+ e.reportWorkQuantityShow,
e.reportWorkQuantityCount,
e.reportWorkTime,
e.broken_num,
- c.quantity*a.area as gross_area,
- ifnull(f.inventory, 0) as inventory,
- round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
- ifnull(dd.quantity, 0) as shippedQuantity,
- ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber
- from flow_card as c
+ c.quantity-ifnull(c.termination_quantity,0) as glassQuantity,
+
+ c.quantity-ifnull(c.termination_quantity,0) as quantityShow,
+ round( (c.quantity-ifnull(c.termination_quantity,0))*a.compute_area,2) as grossAreaShow,
+ ifnull(c.received_quantity, 0) as StorageShow,
+ ifnull(dd.quantity, 0) as shippedQuantityShow, -- 鍙戣揣鏁伴噺
+ round(ifnull(dd.quantity, 0)*a.compute_area,2) as shippedAreaShow, -- 鍙戣揣闈㈢Н
+ round((ifnull(c.received_quantity, 0))*a.compute_area,2) as StorageAreaShow,-- 鍏ュ簱闈㈢Н
+
+ if(c.technology_number=1, round((c.quantity-ifnull(c.termination_quantity,0))*a.compute_area,2),0) as grossArea,
+ if(c.technology_number=1,ifnull(c.received_quantity, 0) ,0) as Storage,
+ if(c.technology_number=1,ifnull(dd.quantity, 0) ,0) as shippedQuantity,
+ if(c.technology_number=1,round(ifnull(dd.quantity, 0)*a.compute_area,2),0) as shippedArea,
+ if(c.technology_number=1, round((ifnull(c.received_quantity, 0))*a.compute_area,2),0) as StorageArea,
+
+
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber,
+ b.`group`
+
+ from pp.flow_card as c
left join
sd.order_detail as a
on c.order_id = a.order_id
@@ -192,17 +213,21 @@
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 mm.finished_goods_inventory as f
+# on c.order_id = f.order_id and f.order_number = c.order_number
left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
left join (SELECT process_id,
order_number,
technology_number,
sum(a.broken_num) as broken_num,
concat('{',
- GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
+ GROUP_CONCAT(concat("\"", process, "\":\"", if(technology_number!=1 and (bd.nickname='stepD' || bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),
'}'
) as reportWorkQuantity,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
+ '}'
+ ) as reportWorkQuantityShow,
concat('{',
GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num_count, "\"")),
'}'
@@ -212,12 +237,17 @@
'}'
) as reportWorkTime
FROM sd.order_process_detail as a
+ left join (SELECT DISTINCT basic_name,nickname from sd.basic_data as bd where bd.basic_category = 'process') as bd
+ on a.process = bd.basic_name
where a.order_id = #{orderId}
- GROUP BY process_id, a.order_number, a.technology_number) as e
+ GROUP BY process_id, a.order_number, a.technology_number
+
+
+ ) as e
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} and d.create_order>0
+ where a.order_id = #{orderId} and d.create_order>0 and c.quantity-ifnull(c.termination_quantity,0)>0
group by c.order_number,
c.technology_number,
c.process_id
@@ -523,14 +553,14 @@
ogd.glass_child,
ogd.child_width,
ogd.child_height,
- fc.quantity,
+ fc.quantity - ifnull(fc.termination_quantity,0) as quantity,
ROUND(ogd.child_width * ogd.child_height / 1000000, 2) as childArea,
- ROUND(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as actualArea,
+ ROUND(ogd.child_width * ogd.child_height * (fc.quantity- ifnull(fc.termination_quantity,0)) / 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,
- fc.quantity - odpd.reporting_work_num as incompleteNum,
- ROUND(ogd.child_width * ogd.child_height * (fc.quantity - odpd.reporting_work_num) / 1000000,
+ fc.quantity - odpd.reporting_work_num - ifnull(fc.termination_quantity,0) as incompleteNum,
+ ROUND(ogd.child_width * ogd.child_height * (fc.quantity - odpd.reporting_work_num- ifnull(fc.termination_quantity,0)) / 1000000,
2) as incompleteArea,
od.product_name
@@ -556,7 +586,8 @@
AND o.create_time < #{selectTime2}
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
- and fc.quantity - odpd.reporting_work_num>0
+ and GREATEST(fc.quantity - odpd.reporting_work_num, 0)>0
+ and fc.quantity-ifnull(fc.termination_quantity,0)>0
group by fc.process_id, fc.order_number, fc.technology_number
order by fc.process_id, fc.order_number, fc.technology_number
@@ -566,6 +597,7 @@
SELECT
o.order_id,
o.project,
+ o.batch,
rw.process_id,
dd.order_number,
dd.technology_number,
@@ -594,7 +626,7 @@
rw.reporting_work_time >= #{selectTime1}
AND rw.reporting_work_time < #{selectTime2}
- AND dd.available = 0
+ AND dd.available = 0 and rw.reviewed_state>=0
<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
and o.order_id regexp #{damageReportDTO.orderId}
</if>
@@ -790,7 +822,7 @@
a.product_name,
b.child_width,
b.child_height,
- c.quantity,
+ c.quantity - ifnull(c.termination_quantity,0) as quantity,
c.technology_number,
b.glass_child,
ifnull(e.reportWorkQuantity, 0) as reportWorkQuantity,
@@ -833,7 +865,7 @@
and e.order_number=c.order_number
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} and d.create_order>0
+ where a.order_id = #{orderId} and d.create_order>0 and c.quantity - ifnull(c.termination_quantity,0)>0
group by c.order_number,c.technology_number
ORDER BY a.order_number
</select>
@@ -877,12 +909,14 @@
left join sd.`order` as o on o.order_id = a.order_id
where o.create_time >= #{selectTime1}
AND o.create_time < #{selectTime2}
+ and position(#{orderId} in o.order_id)
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 >= #{selectTime1}
AND d.create_time < #{selectTime2}
+ and position(#{orderId} in a.order_id)
and d.create_order>0
and reportWorkQuantity is not null
GROUP BY a.order_id
@@ -995,6 +1029,7 @@
<select id="exportDamageReportMp">
SELECT o.order_id,
o.project,
+ o.batch,
rw.process_id,
dd.order_number,
dd.technology_number,
@@ -1018,7 +1053,7 @@
AND dd.technology_number = ogd.technology_number
WHERE rw.reporting_work_time >= #{dates[0]}
and rw.reporting_work_time <= #{dates[1]}
- AND dd.available = 0
+ AND dd.available = 0 and rw.reviewed_state>=0
GROUP BY dd.id
</select>
@@ -1332,55 +1367,74 @@
<select id="teamOutputMp" resultMap="teamOutputMap">
SELECT
+ *
+ FROM
+ (
+ 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,
+ MAX(ogd.child_width) AS width,
+ MAX(ogd.child_height) AS height,
od.edging_type,
- rwd.completed_quantity as completed_quantity,
- ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*rwd.completed_quantity/1000000,2) as area,
+ rwd.completed_quantity AS completed_quantity,
+ ROUND(MAX(ogd.child_width) * MAX(ogd.child_height) * rwd.completed_quantity / 1000000, 2) AS area,
od.product_name,
- JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS code,
rw.reviewed,
rw.examine_time,
rw.device_name,
--- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
+ o.order_type,
CASE
- WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
- ELSE MAX( ogd.glass_child )
+ WHEN LOCATE('step', #{laminating}) > 0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
+ ELSE MAX(ogd.glass_child)
END AS workProcessName,
- o.batch
+ o.batch
FROM
- reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
- left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number
- left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number and ogd.technology_number=fc.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` as o on o.order_id=od.order_id
- where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and
- rw.reporting_work_time >= #{selectTime1}
+ reporting_work AS rw
+ LEFT JOIN reporting_work_detail AS rwd
+ ON rwd.reporting_work_id = rw.reporting_work_id
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = rw.order_id
+ AND fc.process_id = rw.process_id
+ AND fc.order_number = rwd.order_number
+ AND fc.technology_number = rwd.technology_number
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON ogd.order_id = fc.order_id
+ AND ogd.order_number = fc.order_number
+ AND ogd.technology_number = fc.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` AS o
+ ON o.order_id = od.order_id
+ WHERE
+ o.create_order > 0
+ AND rw.reviewed_state >= 0
+ AND rwd.completed_quantity > 0
+ AND rw.reporting_work_time >= #{selectTime1}
AND rw.reporting_work_time < #{selectTime2}
- and position(#{selectProcesses} in rw.this_process)
+ AND POSITION(#{selectProcesses} IN rw.this_process)
<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
- and rw.this_process regexp #{teamOutputDTO.thisProcess}
+ AND rw.this_process REGEXP #{teamOutputDTO.thisProcess}
</if>
<if test="teamOutputDTO.teamsGroupsName != null and teamOutputDTO.teamsGroupsName != ''">
- and rw.teams_groups_name regexp #{teamOutputDTO.teamsGroupsName}
+ AND rw.teams_groups_name REGEXP #{teamOutputDTO.teamsGroupsName}
</if>
<if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
- and o.project regexp #{teamOutputDTO.project}
+ AND o.project REGEXP #{teamOutputDTO.project}
</if>
<if test="teamOutputDTO.processId != null and teamOutputDTO.processId != ''">
- and rw.process_id regexp #{teamOutputDTO.processId}
+ AND rw.process_id REGEXP #{teamOutputDTO.processId}
</if>
<if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
- and od.edging_type regexp #{teamOutputDTO.edgingType}
+ AND od.edging_type REGEXP #{teamOutputDTO.edgingType}
</if>
<if test="teamOutputDTO.deviceName != null and teamOutputDTO.deviceName != ''">
- and rw.device_name regexp #{teamOutputDTO.deviceName}
+ AND rw.device_name REGEXP #{teamOutputDTO.deviceName}
</if>
<choose>
@@ -1395,7 +1449,7 @@
</when>
<otherwise>
GROUP BY
- <if test="laminating == 'stepA' || laminating == 'stepC'" >
+ <if test="laminating == 'stepA' || laminating == 'stepC'">
ogd.`group`,
</if>
rw.reporting_work_id,
@@ -1403,16 +1457,20 @@
rw.this_process,
rw.teams_groups_name,
rwd.order_number
-
</otherwise>
</choose>
+ ) t
+ WHERE 1 = 1
+ <if test="teamOutputDTO.workProcessName != null and teamOutputDTO.workProcessName != ''">
+ AND t.workProcessName REGEXP #{teamOutputDTO.workProcessName}
+ </if>
ORDER BY
- rw.this_process,
- rw.process_id,
- rwd.order_number,
- rw.reporting_work_time,
- rw.teams_groups_name
- limit #{offset},#{pageSize};
+ t.this_process,
+ t.process_id,
+ t.order_number,
+ t.reporting_work_time,
+ t.teams_groups_name
+ LIMIT #{offset}, #{pageSize};
</select>
<select id="exportTeamOutputMp">
@@ -1433,6 +1491,8 @@
rw.reviewed,
rw.examine_time,
rw.device_name,
+ o.order_type,
+ -- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
CASE
WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
ELSE MAX( ogd.glass_child )
@@ -1444,9 +1504,9 @@
left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number and ogd.technology_number=fc.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` as o on o.order_id=od.order_id
- where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0
- and date(rw.reporting_work_time) >= #{date[0]}
- and date(rw.reporting_work_time) <= #{date[1]}
+ where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and
+ rw.reporting_work_time >= #{date[0]}
+ AND rw.reporting_work_time < #{date[1]}
and position(#{process} in rw.this_process)
<choose>
<when test="laminating == ''">
@@ -1933,16 +1993,17 @@
<select id="workInProgressOrderFootSum">
SELECT SUM(aa.quantity) AS quantity,
- sum(aa.stockNum) AS stockNum,
- SUM(aa.stockArea) AS stockArea,
- count(* ) AS 'total',
- CEILING( count(* )/#{pageSize} ) AS 'pageTotal'
+ sum(aa.stockNum) AS stockNum,
+ SUM(aa.stockArea) AS stockArea,
+ count(* ) AS 'total',
+ CEILING( count(* )/#{pageSize} ) AS 'pageTotal'
from
(
SELECT (od.quantity) AS quantity,
- (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
+ d.numCounts + d.patchNumSum - d.numCount -d.broken_num as stockNum,
+ ROUND(ogd.child_width * ogd.child_height *
+ (d.numCounts + d.patchNumSum - d.numCount -
+ d.broken_num) / 1000000, 2) as stockArea
FROM
sd.order_detail AS od
LEFT JOIN sd.order_glass_detail AS ogd
@@ -1953,36 +2014,55 @@
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',
+ left join (
+ SELECT
+ odpd.process,
+ odpd.process_id,
+ odpd.order_number,
+ odpd.technology_number,
+ odpds.reporting_work_num_count as numCounts,
+ ifnull( c.patchNumSum, 0 ) as patchNumSum,
+ odpd.reporting_work_num_count as numCount,
+ odpd.broken_num
+ FROM
+ sd.order_process_detail AS odpd
+ 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 pp.rework as rw
- LEFT JOIN
- pp.reporting_work as rwk
- on rw.reporting_work_id = rwk.reporting_work_id
- where position(#{selectProcesses} in rwk.this_process )
- 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
+ FROM
+ pp.rework AS rw
+ LEFT JOIN pp.reporting_work AS rwk ON rw.reporting_work_id = rwk.reporting_work_id
WHERE
- o.create_order>0
- and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
- odpd.broken_num != 0 and odpd.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
- and position(#{selectProcesses} in odpd.process)
+ position( #{selectProcesses} IN rwk.this_process )
+ AND rw.review_status >= 0
+ GROUP BY
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number
+ ) AS c ON c.process_id = odpd.process_id
+ AND c.order_sort = odpd.order_number
+ AND c.technology_number = odpd.technology_number
+ WHERE
+ position(#{selectProcesses} IN odpd.process ) and odpds.reporting_work_num_count is not null
+ GROUP BY
+ odpd.process_id,
+ odpd.order_number,
+ odpd.technology_number,
+ odpd.process
+
+ ) as d
+ on d.process_id=fc.process_id and d.order_number=fc.order_number and d.technology_number=fc.technology_number
+ and position(#{selectProcesses} in d.process)
+ left join sd.`order` as o on o.order_id=od.order_id
+ where o.create_order>0
+ and d.numCounts +d.patchNumSum - d.numCount - d.broken_num != 0
+ and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
+ and position(#{selectProcesses} in d.process)
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
<if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
@@ -2000,7 +2080,17 @@
<if test="workInProgressDTO.processId != null and workInProgressDTO.processId != ''">
and fc.process_id regexp #{workInProgressDTO.processId}
</if>
- group by fc.process_id, fc.order_number, fc.technology_number,odpd.process
+ <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>
+ <if test="workInProgressDTO.glassNumber != null and workInProgressDTO.glassNumber != ''">
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{workInProgressDTO.glassNumber}
+ </if>
+
+ group by fc.process_id, fc.order_number, fc.technology_number,d.process
) as aa
</select>
@@ -2034,8 +2124,8 @@
and odpd.process = #{selectProcesses}
and o.create_time >= #{selectTime1}
AND o.create_time < #{selectTime2}
- AND POSITION('' IN od.order_id)
- AND POSITION('' IN o.project)
+ and position(#{orderId} in od.order_id)
+ and position(#{inputProject} in o.project)
AND fc.quantity - odpd.reporting_work_num > 0;
</select>
@@ -2056,7 +2146,7 @@
WHERE
rw.reporting_work_time >= #{selectTime1}
AND rw.reporting_work_time < #{selectTime2}
- AND dd.available = 0
+ AND dd.available = 0 and rw.reviewed_state>=0
<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
and o.order_id regexp #{damageReportDTO.orderId}
</if>
@@ -2133,6 +2223,9 @@
<if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
and od.edging_type regexp #{teamOutputDTO.edgingType}
</if>
+ <if test="teamOutputDTO.deviceName != null and teamOutputDTO.deviceName != ''">
+ and rw.device_name regexp #{teamOutputDTO.deviceName}
+ </if>
<choose>
<when test="laminating == ''">
GROUP BY
@@ -2166,71 +2259,89 @@
</select>
<select id="workInProgressMpdataList1" resultMap="workInProgressMap">
- select if(#{selectProcesses}='',odpd.process,#{selectProcesses}) as thisProcess,
- fc.process_id,
- o.customer_name,
- o.project,
- o.order_id,
- o.batch,
- od.shape,
- if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),od.bend_radius) as bend_radius,
- 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,
- ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber
- -- ,
- -- rws.teams_groups_name
-
+ select d.process as thisProcess,
+ fc.process_id,
+ o.customer_name,
+ o.project,
+ o.order_id,
+ o.batch,
+ od.shape,
+ if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),od.bend_radius) as bend_radius,
+ ogd.order_number,
+ ogd.technology_number,
+ ogd.process,
+ od.quantity,
+ ogd.child_width,
+ ogd.child_height,
+ d.numCounts + d.patchNumSum - d.numCount -d.broken_num as stockNum,
+ ROUND(ogd.child_width * ogd.child_height *
+ (d.numCounts + d.patchNumSum - d.numCount -
+ d.broken_num) / 1000000, 2) as stockArea,
+ od.product_name,
+ od.bend_radius,
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber
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 pp.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 pp.rework as rw
- LEFT JOIN
- pp.reporting_work as rwk
- on rw.reporting_work_id = rwk.reporting_work_id
- where position(#{selectProcesses} in rwk.this_process)
- 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
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN pp.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 (
+ SELECT
+ odpd.process,
+ odpd.process_id,
+ odpd.order_number,
+ odpd.technology_number,
+ odpds.reporting_work_num_count as numCounts,
+ ifnull( c.patchNumSum, 0 ) as patchNumSum,
+ odpd.reporting_work_num_count as numCount,
+ odpd.broken_num
+ FROM
+ sd.order_process_detail AS odpd
+ 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
+ pp.rework AS rw
+ LEFT JOIN pp.reporting_work AS rwk ON rw.reporting_work_id = rwk.reporting_work_id
+ WHERE
+ position( #{selectProcesses} IN rwk.this_process )
+ AND rw.review_status >= 0
+ GROUP BY
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number
+ ) AS c ON c.process_id = odpd.process_id
+ AND c.order_sort = odpd.order_number
+ AND c.technology_number = odpd.technology_number
+ WHERE
+ position(#{selectProcesses} IN odpd.process ) and odpds.reporting_work_num_count is not null
+ GROUP BY
+ odpd.process_id,
+ odpd.order_number,
+ odpd.technology_number,
+ odpd.process
+
+ ) as d
+ on d.process_id=fc.process_id and d.order_number=fc.order_number and d.technology_number=fc.technology_number
+ left join sd.`order` as o on o.order_id=od.order_id
+ LEFT JOIN sd.basic_data AS bd ON bd.basic_name = d.process
where o.create_order>0
- and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
- odpd.broken_num != 0 and odpd.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
- and position(#{selectProcesses} in odpd.process)
+ and d.numCounts +d.patchNumSum - d.numCount - d.broken_num != 0
+ and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
+ <if test="workInProgressDTO.thisProcess != null and workInProgressDTO.thisProcess != ''">
+ and d.process regexp #{workInProgressDTO.thisProcess}
+ </if>
<if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
and o.customer_name regexp #{workInProgressDTO.customerName}
</if>
@@ -2252,11 +2363,40 @@
<if test="workInProgressDTO.technologyNumber != null and workInProgressDTO.technologyNumber != ''">
and ogd.technology_number regexp #{workInProgressDTO.technologyNumber}
</if>
+ <if test="workInProgressDTO.quantity != null and workInProgressDTO.quantity != ''">
+ and od.quantity regexp #{workInProgressDTO.quantity}
+ </if>
+ <if test="workInProgressDTO.childWidth != null and workInProgressDTO.childWidth != ''">
+ and ogd.child_width regexp #{workInProgressDTO.childWidth}
+ </if>
+ <if test="workInProgressDTO.childHeight != null and workInProgressDTO.childHeight != ''">
+ and ogd.child_height regexp #{workInProgressDTO.childHeight}
+ </if>
+ <if test="workInProgressDTO.stockNum != null and workInProgressDTO.stockNum != ''">
+ and (d.numCounts + d.patchNumSum - d.numCount -d.broken_num) regexp #{workInProgressDTO.stockNum}
+ </if>
+ <if test="workInProgressDTO.stockArea != null and workInProgressDTO.stockArea != ''">
+ and ROUND(ogd.child_width * ogd.child_height * (d.numCounts + d.patchNumSum - d.numCount -
+ d.broken_num) / 1000000, 2) regexp #{workInProgressDTO.stockArea}
+ </if>
<if test="workInProgressDTO.glassNumber != null and workInProgressDTO.glassNumber != ''">
and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{workInProgressDTO.glassNumber}
</if>
- group by fc.process_id, fc.order_number, fc.technology_number,odpd.process
- order by fc.process_id, fc.order_number, fc.technology_number
+ <choose>
+ <when test="laminating != null and laminating == 'stepC'">
+ GROUP BY fc.process_id, fc.order_number, ogd.`group`, d.process
+ </when>
+ <when test="laminating != null and laminating == 'stepD'">
+ GROUP BY fc.process_id, fc.order_number, d.process
+ </when>
+ <when test="laminating != null and laminating == 'stepB'">
+ GROUP BY fc.process_id, fc.order_number, d.process
+ </when>
+ <otherwise>
+ GROUP BY fc.process_id, fc.order_number, fc.technology_number, d.process
+ </otherwise>
+ </choose>
+ order by d.process,fc.process_id, fc.order_number, fc.technology_number
limit #{offset},#{pageSize};
</select>
@@ -2425,4 +2565,592 @@
where position(#{process} in a.next_process) and a.next_process!='鍒囧壊'
GROUP BY a.reporting_work_id
</select>
+
+ <select id="workInProgressCombinationMpdataList2">
+ select
+ a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number
+ from pp.reporting_work as a
+ left join pp.reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id
+ where position(#{selectProcesses} in a.next_process) and a.next_process!='鍒囧壊'
+ GROUP BY a.reporting_work_id
+ </select>
+
+ <select id="workInProgressCombinationMpdataList1">
+ select if(#{selectProcesses}='',d.process,#{selectProcesses}) as thisProcess,
+ o.project,
+ SUM(d.numCounts + d.patchNumSum - d.numCount -d.broken_num) as stockNum,
+ SUM(ROUND(ogd.child_width * ogd.child_height *
+ (d.numCounts + d.patchNumSum - d.numCount -
+ d.broken_num) / 1000000, 2)) as stockArea
+ 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 pp.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 (
+ SELECT
+ odpd.process,
+ odpd.process_id,
+ odpd.order_number,
+ odpd.technology_number,
+ odpds.reporting_work_num_count as numCounts,
+ ifnull( c.patchNumSum, 0 ) as patchNumSum,
+ odpd.reporting_work_num_count as numCount,
+ odpd.broken_num
+ FROM
+ sd.order_process_detail AS odpd
+ 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
+ pp.rework AS rw
+ LEFT JOIN pp.reporting_work AS rwk ON rw.reporting_work_id = rwk.reporting_work_id
+ WHERE
+ position( #{selectProcesses} IN rwk.this_process )
+ AND rw.review_status >= 0
+ GROUP BY
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number
+ ) AS c ON c.process_id = odpd.process_id
+ AND c.order_sort = odpd.order_number
+ AND c.technology_number = odpd.technology_number
+ WHERE
+ position(#{selectProcesses} IN odpd.process ) and odpds.reporting_work_num_count is not null
+ GROUP BY
+ odpd.process_id,
+ odpd.order_number,
+ odpd.technology_number,
+ odpd.process
+
+ ) as d
+ on d.process_id=fc.process_id and d.order_number=fc.order_number and d.technology_number=fc.technology_number
+ and position(#{selectProcesses} in d.process)
+ left join sd.`order` as o on o.order_id=od.order_id
+ where o.create_order>0
+ and d.numCounts +d.patchNumSum - d.numCount - d.broken_num != 0
+ and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
+ and position(#{selectProcesses} in d.process)
+
+ <if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
+ and o.project regexp #{workInProgressDTO.project}
+ </if>
+
+ group by d.process
+ order by d.process
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="workInProgressCombinationOrderFootSum">
+ SELECT SUM(aa.quantity) AS quantity,
+ sum(aa.stockNum) AS stockNum,
+ SUM(aa.stockArea) AS stockArea,
+ count(* ) AS 'total',
+ CEILING( count(* )/#{pageSize} ) AS 'pageTotal'
+ from
+ (
+ SELECT (od.quantity) AS quantity,
+ d.numCounts + d.patchNumSum - d.numCount -d.broken_num as stockNum,
+ ROUND(ogd.child_width * ogd.child_height *
+ (d.numCounts + d.patchNumSum - d.numCount -
+ d.broken_num) / 1000000, 2) as stockArea
+ 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 pp.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 (
+ SELECT
+ odpd.process,
+ odpd.process_id,
+ odpd.order_number,
+ odpd.technology_number,
+ odpds.reporting_work_num_count as numCounts,
+ ifnull( c.patchNumSum, 0 ) as patchNumSum,
+ odpd.reporting_work_num_count as numCount,
+ odpd.broken_num
+ FROM
+ sd.order_process_detail AS odpd
+ 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
+ pp.rework AS rw
+ LEFT JOIN pp.reporting_work AS rwk ON rw.reporting_work_id = rwk.reporting_work_id
+ WHERE
+ position( #{selectProcesses} IN rwk.this_process )
+ AND rw.review_status >= 0
+ GROUP BY
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number
+ ) AS c ON c.process_id = odpd.process_id
+ AND c.order_sort = odpd.order_number
+ AND c.technology_number = odpd.technology_number
+ WHERE
+ position(#{selectProcesses} IN odpd.process ) and odpds.reporting_work_num_count is not null
+ GROUP BY
+ odpd.process_id,
+ odpd.order_number,
+ odpd.technology_number,
+ odpd.process
+
+ ) as d
+ on d.process_id=fc.process_id and d.order_number=fc.order_number and d.technology_number=fc.technology_number
+ and position(#{selectProcesses} in d.process)
+ left join sd.`order` as o on o.order_id=od.order_id
+ where o.create_order>0
+ and d.numCounts +d.patchNumSum - d.numCount - d.broken_num != 0
+ and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
+ and position(#{selectProcesses} in d.process)
+
+ <if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
+ and o.project regexp #{workInProgressDTO.project}
+ </if>
+ group by d.process
+ ) as aa
+ </select>
+
+ <select id="selectProcess">
+ SELECT basic_name
+ FROM sd.basic_data as bd
+ where bd.basic_category = 'process'
+ and bd.basic_type = 'product'
+ and basic_name!='鍒囧壊'
+ </select>
+
+ <select id="getWorkInProgressCombination">
+ select
+ #{process} as thisProcess,
+ if(#{optionVal} = 1,'',h.project) as project,
+ SUM(h.quantity) as stockNum,
+ SUM(h.glassArea) as stockArea,
+ if(#{optionVal} = 1,'',h.childName) as glassName
+
+ from (
+
+ SELECT g.*
+ ,GROUP_CONCAT(g.glass_child SEPARATOR '+') as childName
+ from( SELECT f.*,
+ e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num as quantity,
+ (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)*f.area as glassArea
+ from (SELECT a.order_id,
+ if(a.batch!="",CONCAT(a.project,'(',a.batch,')'),a.project) as project,
+ C.product_id,
+ b.order_number,
+ b.process_id,
+ b.technology_number,
+ b.reporting_work_num_count,
+ d.`group` ,
+ b.broken_num,
+ b.id,
+ c.area,
+ d.glass_child,
+ ifnull(cb.patchNumSum,0) as patchNumSum
+
+ FROM sd.`order` as a
+ LEFT JOIN sd.order_process_detail as b
+ on b.process = #{process} and a.order_id =b.order_id
+ LEFT JOIN sd.order_detail as c
+ on a.order_id = c.order_id and b.order_number =c.order_number
+ left join sd.order_glass_detail as d
+ on d.order_id =a.order_id and d.order_number = b.order_number and d.technology_number = b.technology_number
+ LEFT JOIN (
+ SELECT
+ IFNULL(sum( rw.rework_num ),0) AS 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ FROM
+ pp.rework AS rw
+ LEFT JOIN pp.reporting_work AS rwk ON rw.reporting_work_id = rwk.reporting_work_id
+ WHERE
+ position( #{process} IN rwk.this_process )
+ AND rw.review_status >= 0
+ GROUP BY
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number
+ ) AS cb ON cb.process_id = b.process_id
+ AND cb.order_sort = b.order_number
+ AND cb.technology_number = b.technology_number
+ where a.processing_card>0
+ and a.warehousing!=2
+ and (c.quantity-b.reporting_work_num)>0
+ GROUP BY b.process_id, b.order_number,
+ b.technology_number) as f
+ LEFT JOIN sd.order_process_detail as e
+ on e.id=(f.id-1) and e.process_id = f.process_id and e.order_number = f.order_number and e.technology_number =f.technology_number
+ where
+ e.id is not null
+ and (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)>0 group by f.process_id, f.order_number,
+ f.technology_number ORDER BY f.process_id, f.order_number,
+ f.technology_number) as g
+ <choose>
+ <when test="laminating == 'stepC' and process == '棰勫帇'">
+ GROUP BY g.process_id, g.order_number, g.technology_number
+ </when>
+ <when test="laminating == 'stepC'">
+ GROUP BY g.process_id, g.order_number, g.`group`
+ </when>
+ <when test="laminating == 'stepD'">
+ GROUP BY g.process_id, g.order_number
+ </when>
+ <otherwise>
+ GROUP BY g.process_id, g.order_number, g.technology_number
+ </otherwise>
+ </choose>
+
+
+ ) as h
+ <choose>
+ <when test="optionVal == 1">
+ GROUP BY thisProcess
+ </when>
+ <otherwise>
+ GROUP BY h.project,h.childName
+ </otherwise>
+ </choose>
+
+ </select>
+
+ <select id="getWorkInProgressCombinationFootSum">
+ select
+ SUM(h.quantity) as stockNum,
+ SUM(h.glassArea) as stockArea
+ from (
+ SELECT g.*
+ ,GROUP_CONCAT(g.glass_child SEPARATOR '+') as childName
+ from( SELECT f.*,
+ e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num as quantity,
+ (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)*f.area as glassArea
+ from (SELECT a.order_id,
+ a.project,
+ C.product_id,
+ b.order_number,
+ b.process_id,
+ b.technology_number,
+ b.reporting_work_num_count,
+ d.`group` ,
+ b.broken_num,
+ b.id,
+ c.area,
+ d.glass_child,
+ ifnull(cb.patchNumSum,0) as patchNumSum
+
+ FROM sd.`order` as a
+ LEFT JOIN sd.order_process_detail as b
+ on b.process = #{process} and a.order_id =b.order_id
+ LEFT JOIN sd.order_detail as c
+ on a.order_id = c.order_id and b.order_number =c.order_number
+ left join sd.order_glass_detail as d
+ on d.order_id =a.order_id and d.order_number = b.order_number and d.technology_number = b.technology_number
+ LEFT JOIN (
+ SELECT
+ IFNULL(sum( rw.rework_num ),0) AS 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ FROM
+ pp.rework AS rw
+ LEFT JOIN pp.reporting_work AS rwk ON rw.reporting_work_id = rwk.reporting_work_id
+ WHERE
+ position( #{process} IN rwk.this_process )
+ AND rw.review_status >= 0
+ GROUP BY
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number
+ ) AS cb ON cb.process_id = b.process_id
+ AND cb.order_sort = b.order_number
+ AND cb.technology_number = b.technology_number
+ where a.processing_card>0
+ and a.warehousing!=2
+ and (c.quantity-b.reporting_work_num)>0
+ GROUP BY b.process_id, b.order_number,
+ b.technology_number) as f
+ LEFT JOIN sd.order_process_detail as e
+ on e.id=(f.id-1) and e.process_id = f.process_id and e.order_number = f.order_number and e.technology_number =f.technology_number
+ where
+ e.id is not null
+ and e.reporting_work_num_count-f.reporting_work_num_count>0 group by f.process_id, f.order_number,
+ f.technology_number) as g
+ <choose>
+ <when test="laminating == 'stepC' and process == '棰勫帇'">
+ GROUP BY g.process_id, g.order_number, g.technology_number
+ </when>
+ <when test="laminating == 'stepC'">
+ GROUP BY g.process_id, g.order_number, g.`group`
+ </when>
+ <when test="laminating == 'stepD'">
+ GROUP BY g.process_id, g.order_number
+ </when>
+ <otherwise>
+ GROUP BY g.process_id, g.order_number, g.technology_number
+ </otherwise>
+ </choose>
+
+
+ ) as h
+
+ </select>
+
+ <select id="exportWorkInProgressCombination">
+ select
+ #{process} as thisProcess,
+ if(#{inputVal} = 1,'',h.project) as project,
+ SUM(h.quantity) as stockNum,
+ SUM(h.glassArea) as stockArea,
+ if(#{inputVal} = 1,'',h.childName) as glassName
+
+ from (
+
+ SELECT g.*
+ ,GROUP_CONCAT(g.glass_child SEPARATOR '+') as childName
+ from( SELECT f.*,
+ e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num as quantity,
+ (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)*f.area as glassArea
+ from (SELECT a.order_id,
+ a.project,
+ C.product_id,
+ b.order_number,
+ b.process_id,
+ b.technology_number,
+ b.reporting_work_num_count,
+ d.`group` ,
+ b.broken_num,
+ b.id,
+ c.area,
+ d.glass_child,
+ ifnull(cb.patchNumSum,0) as patchNumSum
+
+ FROM sd.`order` as a
+ LEFT JOIN sd.order_process_detail as b
+ on b.process = #{process} and a.order_id =b.order_id
+ LEFT JOIN sd.order_detail as c
+ on a.order_id = c.order_id and b.order_number =c.order_number
+ left join sd.order_glass_detail as d
+ on d.order_id =a.order_id and d.order_number = b.order_number and d.technology_number = b.technology_number
+ LEFT JOIN (
+ SELECT
+ IFNULL(sum( rw.rework_num ),0) AS 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ FROM
+ pp.rework AS rw
+ LEFT JOIN pp.reporting_work AS rwk ON rw.reporting_work_id = rwk.reporting_work_id
+ WHERE
+ position( #{process} IN rwk.this_process )
+ AND rw.review_status >= 0
+ GROUP BY
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number
+ ) AS cb ON cb.process_id = b.process_id
+ AND cb.order_sort = b.order_number
+ AND cb.technology_number = b.technology_number
+ where a.processing_card>0
+ and a.warehousing!=2
+ and (c.quantity-b.reporting_work_num_count)>0
+ GROUP BY b.process_id, b.order_number,
+ b.technology_number) as f
+ LEFT JOIN sd.order_process_detail as e
+ on e.id=(f.id-1) and e.process_id = f.process_id and e.order_number = f.order_number and e.technology_number =f.technology_number
+ where
+ e.id is not null
+ and (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)>0 ) as g
+ <choose>
+ <when test="laminating == 'stepC' and process == '棰勫帇'">
+ GROUP BY g.process_id, g.order_number, g.technology_number
+ </when>
+ <when test="laminating == 'stepC'">
+ GROUP BY g.process_id, g.order_number, g.`group`
+ </when>
+ <when test="laminating == 'stepD'">
+ GROUP BY g.process_id, g.order_number
+ </when>
+ <otherwise>
+ GROUP BY g.process_id, g.order_number, g.technology_number
+ </otherwise>
+ </choose>
+
+
+ ) as h
+ <choose>
+ <when test="inputVal == 1">
+ GROUP BY thisProcess
+ </when>
+ <otherwise>
+ GROUP BY h.project,h.childName
+ </otherwise>
+ </choose>
+ </select>
+
+
+ <select id="processCardProgressCollectMp">
+ select * from (select
+ a.order_id,
+ a.order_number,
+ c.glass_group as 'group',
+ a.technology_number,
+ b.product_name,
+ c.detail as glass_child,
+ d.order_type,
+ concat(a.process_id,'/',a.technology_number) as processID,
+ a.process_id,
+ if(a.technology_number=1,sum(a.quantity-ifnull(a.termination_quantity,0)),0) as quantity,
+ sum(a.quantity)-ifnull(a.termination_quantity,0) as thisQuantity,/*鐢ㄤ簬鍒ゆ柇鏄惁鏀瑰彉棰滆壊*/
+ if(a.technology_number=1, round(sum((a.quantity-ifnull(a.termination_quantity,0)))*b.compute_area,2),0) as gross_area,
+ if(a.technology_number=1, sum(a.received_quantity),0) as inventory,
+ if(a.technology_number=1, round(sum(a.received_quantity*b.area),2),0) as inventoryArea,
+
+ -- show
+ sum(a.quantity-ifnull(a.termination_quantity,0)) as quantityShow ,
+ round(sum((a.quantity-ifnull(a.termination_quantity,0)))*b.compute_area,2) as gross_areaShow,
+ sum(a.received_quantity) as inventoryShow,
+ round(sum(a.received_quantity*b.area),2) as inventoryAreaShow
+
+
+
+
+ from pp.flow_card as a
+ left join sd.order_detail as b
+ on a.order_id = b.order_id and a.order_number = b.order_number
+ left join sd.product_detail as c
+ on c.prod_id = b.product_id and c.glass_sort = a.technology_number
+ LEFT JOIN sd.`order` as d
+ on a.order_id = d.order_id
+ where a.order_id = #{orderId} group by processID
+ ) as a
+ left join (SELECT process_id,
+ technology_number,
+ sum(broken_num) as broken_num,
+ concat('{',GROUP_CONCAT(reporting_work_nums),'}') as reportWorkQuantity,
+ concat('{',GROUP_CONCAT(reporting_work_counts),'}') as reportWorkQuantityCount
+ from (select
+ opd.process_id,
+ opd.technology_number,
+ concat("\"", process, "\":\"", SUM(reporting_work_num), "\"") as reporting_work_nums,
+ concat("\"", process, "\":\"", SUM(reporting_work_num_count), "\"") as reporting_work_counts,
+ sum(broken_num) as broken_num
+ from sd.order_process_detail as opd
+ where opd.order_id = #{orderId}
+ group by opd.process_id,opd.technology_number,opd.process) as bb
+ GROUP BY bb.process_id,bb.technology_number) as b
+ on a.process_id = b.process_id and a.technology_number = b.technology_number
+ order by a.process_id
+
+ </select>
+
+ <select id="processCardProgressReportMp">
+ select a.product_name,
+ b.glass_child,
+ d.order_type,
+ concat(c.process_id, '/', c.technology_number) as process_id,
+ c.process_id as 'processId',
+ c.order_id,
+ c.order_number,
+ c.technology_number,
+ b.child_width,
+ b.child_height,
+ c.quantity,
+ c.quantity-ifnull(c.termination_quantity,0) as thisQuantity,/*鐢ㄤ簬鍒ゆ柇鏄惁鏀瑰彉棰滆壊*/
+ e.reportWorkQuantity,
+ e.reportWorkQuantityShow,
+ e.reportWorkQuantityCount,
+ e.reportWorkTime,
+ e.broken_num,
+ c.quantity-ifnull(c.termination_quantity,0) as glassQuantity,
+ c.quantity*a.area as gross_area,
+ c.quantity-ifnull(c.termination_quantity,0) as quantityShow,
+ (c.quantity-ifnull(c.termination_quantity,0))*a.compute_area as grossAreaShow,
+ ifnull(f.inventory, 0) as inventoryShow,
+ round(ifnull(f.inventory, 0) * a.compute_area, 2) as inventoryAreaShow, -- 搴撳瓨闈㈢Н
+ ifnull(dd.quantity, 0) as shippedQuantityShow, -- 鍙戣揣鏁伴噺
+ (ifnull(c.received_quantity, 0))*a.compute_area as StorageAreaShow,-- 鍏ュ簱闈㈢Н
+
+ if(c.technology_number=1,(c.quantity-ifnull(c.termination_quantity,0))*a.compute_area,0) as grossArea,
+ if(c.technology_number=1,ifnull(f.inventory, 0) ,0) as inventory,
+ if(c.technology_number=1,round(ifnull(f.inventory, 0) * a.compute_area, 2),0) as inventoryArea,
+ if(c.technology_number=1,ifnull(dd.quantity, 0) ,0) as shippedQuantity,
+ if(c.technology_number=1,(ifnull(c.received_quantity, 0))*a.compute_area,0) as StorageArea,
+
+
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber,
+ b.`group`
+
+ from pp.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 sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
+ left join (SELECT process_id,
+ order_number,
+ technology_number,
+ sum(a.broken_num) as broken_num,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", if(technology_number!=1 and (bd.nickname='stepD' || bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),
+ '}'
+ ) as reportWorkQuantity,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
+ '}'
+ ) as reportWorkQuantityShow,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num_count, "\"")),
+ '}'
+ ) as reportWorkQuantityCount,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", IFNULL(date(update_time),''), "\"")),
+ '}'
+ ) as reportWorkTime
+ FROM sd.order_process_detail as a
+ left join (SELECT DISTINCT basic_name,nickname from sd.basic_data as bd where bd.basic_category = 'process') as bd
+ on a.process = bd.basic_name
+ where a.order_id = #{orderId}
+ GROUP BY process_id, a.order_number, a.technology_number
+
+
+ ) as e
+ 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} and d.create_order>0 and c.quantity-ifnull(c.termination_quantity,0)>0
+ group by c.order_number,
+ c.technology_number,
+ c.process_id
+ order by c.process_id, c.order_number, c.technology_number
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0