From 9cf6783836fcee8afd5519b7bde82e10eadec4df Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 08 八月 2025 13:05:16 +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 | 107 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 83 insertions(+), 24 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 a4051ac..97815ad 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -174,21 +174,23 @@
c.technology_number,
b.child_width,
b.child_height,
- if(c.technology_number=1,c.quantity,0) as quantity,
-# c.quantity,
- c.quantity as thisQuantity,/*鐢ㄤ簬鍒ゆ柇鏄惁鏀瑰彉棰滆壊*/
+ 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 as glassQuantity,
+ c.quantity-ifnull(c.termination_quantity,0) as glassQuantity,
-# 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,
+ c.quantity-ifnull(c.termination_quantity,0) as quantityShow,
+ (c.quantity-ifnull(c.termination_quantity,0))*a.area as grossAreaShow,
+ ifnull(f.inventory, 0) as inventoryShow,
+ round(ifnull(f.inventory, 0) * a.area, 2) as inventoryAreaShow,
+ ifnull(dd.quantity, 0) as shippedQuantityShow,
- if(c.technology_number=1,c.quantity*a.area,0) as gross_area,
+ if(c.technology_number=1,(c.quantity-ifnull(c.termination_quantity,0))*a.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.area, 2),0) as inventoryArea,
if(c.technology_number=1,ifnull(dd.quantity, 0) ,0) as shippedQuantity,
@@ -220,6 +222,10 @@
'}'
) as reportWorkQuantity,
concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
+ '}'
+ ) as reportWorkQuantityShow,
+ concat('{',
GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num_count, "\"")),
'}'
) as reportWorkQuantityCount,
@@ -238,7 +244,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
+ 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
@@ -544,14 +550,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
@@ -577,7 +583,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
@@ -812,7 +819,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,
@@ -855,7 +862,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>
@@ -1459,6 +1466,7 @@
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 '+')
@@ -2223,7 +2231,7 @@
</select>
<select id="workInProgressMpdataList1" resultMap="workInProgressMap">
- select if(#{selectProcesses}='',d.process,#{selectProcesses}) as thisProcess,
+ select d.process as thisProcess,
fc.process_id,
o.customer_name,
o.project,
@@ -2296,14 +2304,16 @@
) 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
+ LEFT JOIN sd.basic_data AS bd ON bd.basic_name = d.process
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.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>
@@ -2328,8 +2338,21 @@
<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
- 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>
@@ -2729,7 +2752,7 @@
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
+ 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
@@ -2819,7 +2842,7 @@
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
+ 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
@@ -2940,4 +2963,40 @@
</otherwise>
</choose>
</select>
+
+
+ <select id="processCardProgressCollectMp">
+ select * from (select b.product_name,
+ c.detail as 'glassName',
+ concat(a.process_id,'/',a.technology_number) as processID,
+ a.process_id,
+ a.quantity,
+ a.received_quantity,
+ round(sum(a.received_quantity*b.area),2) as received_area,
+
+ a.technology_number
+ 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
+ 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 reporting_work_num
+ from (select
+ opd.process_id,
+ opd.technology_number,
+ concat("\"", process, "\":\"", SUM(reporting_work_num), "\"") as reporting_work_nums,
+ 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>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0