From 714ed2fda4d83bdc2da48ccfe7e42f220acbee99 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 21 十一月 2025 16:49:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 204 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 141 insertions(+), 63 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 923b539..c1f24ab 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -203,7 +203,8 @@
ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber,
- b.`group`
+ b.`group`,
+ c.termination_status
from pp.flow_card as c
left join
@@ -250,7 +251,7 @@
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
+ where a.order_id = #{orderId} and d.create_order>0
group by c.order_number,
c.technology_number,
c.process_id
@@ -274,15 +275,16 @@
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,
- rw.creator
+ rw.creator,
+ rw.reporting_work_id
from
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 pp.reporting_work as rw on rw.order_id=o.order_id
left join pp.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}
+ where (rw.reporting_work_time) >= #{startDate}
+ and (rw.reporting_work_time) <= #{endDate}
and rw.this_worn_quantity > 0
and dd.available = 0
and reviewed_state >-1
@@ -324,6 +326,9 @@
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
</if>
+ <if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
+ and rw.reporting_work_id regexp #{crossProcessBreakingDTO.reportingWorkId}
+ </if>
GROUP BY dd.id
order by dd.id desc
limit #{offset},#{pageSize}
@@ -346,15 +351,16 @@
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,
- rw.creator
+ rw.creator,
+ rw.reporting_work_id
from
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 pp.reporting_work as rw on rw.order_id=o.order_id
left join pp.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}
+ where (rw.reporting_work_time) >= #{startDate}
+ and (rw.reporting_work_time) <= #{endDate}
and rw.this_worn_quantity > 0
and dd.available = 0
and reviewed_state >-1
@@ -396,6 +402,9 @@
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
</if>
+ <if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
+ and rw.reporting_work_id regexp #{crossProcessBreakingDTO.reportingWorkId}
+ </if>
GROUP BY dd.id
order by dd.id desc
limit #{offset},#{pageSize}
@@ -413,11 +422,11 @@
on ogd.order_id = o.order_id and ogd.order_number = dd.order_number
and ogd.technology_number and dd.technology_number
left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
- where date(rw.reporting_work_time) >= #{startDate}
- and date(rw.reporting_work_time) <= #{endDate}
+ where (rw.reporting_work_time) >= #{startDate}
+ and (rw.reporting_work_time) <= #{endDate}
and rw.this_worn_quantity > 0
and dd.available = 0
- and reviewed_state != 2
+ and rw.reviewed_state>=0
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}
@@ -452,6 +461,9 @@
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
</if>
+ <if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
+ and rw.reporting_work_id regexp #{crossProcessBreakingDTO.reportingWorkId}
+ </if>
order by dd.id desc
</select>
@@ -467,8 +479,8 @@
on ogd.order_id = o.order_id and ogd.order_number = dd.order_number
and ogd.technology_number and dd.technology_number
left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
- where date(rw.reporting_work_time) >= #{startDate}
- and date(rw.reporting_work_time) <= #{endDate}
+ where (rw.reporting_work_time) >= #{startDate}
+ and (rw.reporting_work_time) <= #{endDate}
and rw.this_worn_quantity > 0
and dd.available = 0
and reviewed_state != 2
@@ -762,7 +774,8 @@
ogd.child_height,
ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber,
rw.this_process,
- rw.creator
+ rw.creator,
+ rw.reporting_work_id
FROM
sd.ORDER AS o
LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
@@ -773,7 +786,7 @@
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 >= #{selectTime1}
- AND rw.reporting_work_time < #{selectTime2}
+ AND rw.reporting_work_time <= #{selectTime2}
AND dd.available = 0 and rw.reviewed_state>=0
<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
@@ -818,6 +831,9 @@
<if test="damageReportDTO.creator != null and damageReportDTO.creator != ''">
and rw.creator regexp #{damageReportDTO.creator}
</if>
+ <if test="damageReportDTO.reportingWorkId != null and damageReportDTO.reportingWorkId != ''">
+ and rw.reporting_work_id regexp #{damageReportDTO.reportingWorkId}
+ </if>
GROUP BY
dd.id
limit #{offset},#{pageSize};
@@ -836,8 +852,8 @@
AND dd.technology_number = ogd.technology_number
WHERE
rw.reporting_work_time >= #{selectTime1}
- AND rw.reporting_work_time < #{selectTime2}
- AND dd.available = 0
+ AND rw.reporting_work_time <= #{selectTime2}
+ 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>
@@ -1017,23 +1033,44 @@
</select>
<select id="productionScheduleMp">
- select a.order_number,
- if(a.shape='' || ISNULL(a.shape),'鏅舰',if(a.shape = 1, '鏅舰', if(a.shape = 2, '寮傚舰', ''))) as shape,
- a.product_name,
+ 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 - ifnull(c.termination_quantity,0) as 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,
- ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber
+ c.quantity,
- from flow_card as c
+ 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-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 inventoryNum,
+ 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 inventoryArea,-- 鍏ュ簱闈㈢Н
+
+ round((c.quantity-ifnull(c.termination_quantity,0))*a.compute_area,2)as grossArea,
+ ifnull(c.received_quantity, 0) as Storage,
+ ifnull(dd.quantity, 0) as shippedQuantity,
+ round(ifnull(dd.quantity, 0)*a.compute_area,2) as shippedArea,
+ round((ifnull(c.received_quantity, 0))*a.compute_area,2) 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
@@ -1044,30 +1081,45 @@
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,
- order_number,
- 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_count, "\"")),
- '}'
- ) as reportWorkQuantityCount
- 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
- 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 and c.quantity - ifnull(c.termination_quantity,0)>0
- group by c.order_number,c.technology_number
- ORDER BY a.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, "\":\"", 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>
<select id="taskCompletionStatusMp">
@@ -1211,7 +1263,8 @@
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,
- rw.creator
+ rw.creator,
+ rw.reporting_work_id
from damage_details as dd
left join reporting_work as rw
on rw.reporting_work_id = dd.reporting_work_id
@@ -1247,7 +1300,8 @@
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,
- rw.creator
+ rw.creator,
+ rw.reporting_work_id
from damage_details as dd
left join reporting_work as rw
on rw.reporting_work_id = dd.reporting_work_id
@@ -1288,7 +1342,8 @@
ogd.child_height,
ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber,
rw.this_process,
- rw.creator
+ rw.creator,
+ rw.reporting_work_id
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
@@ -1461,7 +1516,9 @@
and position(#{process} in odpd.process)
and position(ifnull(#{inputVal}, '') in od.order_id)
and position(ifnull(#{project}, '') in o.project)
-
+ <if test="terminationVals != '1' and terminationVals != 1">
+ and fc.termination_status !=1
+ </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
</select>
@@ -1676,7 +1733,7 @@
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 like concat('%', #{teamOutputDTO.teamsGroupsName}, '%')
</if>
<if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
AND o.project REGEXP #{teamOutputDTO.project}
@@ -1829,7 +1886,7 @@
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 like concat('%', #{teamOutputDTO.teamsGroupsName}, '%')
</if>
<if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
and o.project regexp #{teamOutputDTO.project}
@@ -2324,6 +2381,9 @@
and position(#{selectProcesses} in d.process)
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
+ <if test="terminationVals != '1' and terminationVals != 1">
+ and fc.termination_status !=1
+ </if>
<if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
and o.customer_name regexp #{workInProgressDTO.customerName}
</if>
@@ -2404,7 +2464,7 @@
AND od.order_number = ogd.order_number
WHERE
rw.reporting_work_time >= #{selectTime1}
- AND rw.reporting_work_time < #{selectTime2}
+ AND rw.reporting_work_time <= #{selectTime2}
AND dd.available = 0 and rw.reviewed_state>=0
<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
and o.order_id regexp #{damageReportDTO.orderId}
@@ -2510,7 +2570,7 @@
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 like concat('%', #{teamOutputDTO.teamsGroupsName}, '%')
</if>
<if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
AND o.project REGEXP #{teamOutputDTO.project}
@@ -2647,6 +2707,9 @@
and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
+ <if test="terminationVals != '1' and terminationVals != 1">
+ and fc.termination_status !=1
+ </if>
<if test="workInProgressDTO.thisProcess != null and workInProgressDTO.thisProcess != ''">
and d.process regexp #{workInProgressDTO.thisProcess}
</if>
@@ -3102,8 +3165,13 @@
) AS cb ON cb.process_id = b.process_id
AND cb.order_sort = b.order_number
AND cb.technology_number = b.technology_number
+ left join pp.flow_card as fc on fc.order_id= d.order_id and fc.order_number = d.order_number
+ and fc.technology_number = d.technology_number
where a.processing_card>0
and a.warehousing!=2
+ <if test=" terminationVal != '1' and terminationVal != 1">
+ and termination_status !=1
+ </if>
GROUP BY b.process_id, b.order_number,
b.technology_number) as f
LEFT JOIN sd.order_process_detail as e
@@ -3192,8 +3260,13 @@
) AS cb ON cb.process_id = b.process_id
AND cb.order_sort = b.order_number
AND cb.technology_number = b.technology_number
+ left join pp.flow_card as fc on fc.order_id= d.order_id and fc.order_number = d.order_number
+ and fc.technology_number = d.technology_number
where a.processing_card>0
and a.warehousing!=2
+ <if test="terminationVal != '1' and terminationVal != 1">
+ and termination_status !=1
+ </if>
GROUP BY b.process_id, b.order_number,
b.technology_number) as f
LEFT JOIN sd.order_process_detail as e
@@ -3278,8 +3351,13 @@
) AS cb ON cb.process_id = b.process_id
AND cb.order_sort = b.order_number
AND cb.technology_number = b.technology_number
+ left join pp.flow_card as fc on fc.order_id= d.order_id and fc.order_number = d.order_number
+ and fc.technology_number = d.technology_number
where a.processing_card>0
and a.warehousing!=2
+ <if test="terminationVal != '1' and terminationVal != 1">
+ and termination_status !=1
+ </if>
and (c.quantity-b.reporting_work_num_count)>0
GROUP BY b.process_id, b.order_number,
b.technology_number) as f
--
Gitblit v1.8.0