From d39c0479c9ddd38dc36b3c2e29a4e5a3b24fd3d7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 02 七月 2024 17:06:28 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index e59aff1..367700e 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -125,7 +125,7 @@
fc.quantity AS quantity_card,
ogd.child_width,
ogd.child_height,
- od.shape,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
fc.quantity -odpd.reporting_work_num -odpd.broken_num as quantity,
fc.quantity -odpd.reporting_work_num -odpd.broken_num as completedQuantity,
odpd.reporting_work_num as completed,
@@ -163,7 +163,7 @@
fc.quantity AS quantity_card,
ogd.child_width,
ogd.child_height,
- od.shape,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num ) < 0,
0,
odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as quantity,
@@ -382,7 +382,7 @@
c.quantity as quantity_card,
d.child_width,
d.child_height,
- e.shape,
+ if(e.shape=1,'鏅舰',if(e.shape=2,'寮傚舰','')) as shape,
if(ifnull(a.completed_quantity+a.breakage_quantity,0)=0,
c.quantity-ifnull(a.completed_quantity+a.breakage_quantity,0),
ifnull(a.completed_quantity+a.breakage_quantity,0)) as 'quantity', -- 鍙姤宸ユ暟
@@ -418,7 +418,7 @@
right join flow_card as c
on c.process_id = b.process_id
- left join reporting_work_detail as a
+ right join reporting_work_detail as a
on a.reporting_work_id = b.reporting_work_id
and c.order_number=a.order_number
and c.technology_number = a.technology_number
@@ -741,4 +741,9 @@
GROUP BY rwd.order_number, ogd.glass_child, rwd.technology_number, dd.id
ORDER BY rwd.order_number
</select>
+
+ <select id="selectLayerByReportingWorkId">
+ select REPLACE(GROUP_CONCAT(DISTINCT rwd.technology_number),',','') from reporting_work_detail as rwd
+ where rwd.reporting_work_id=#{reportingWorkId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0