From 9de2f4b748f46aeab806d6f3ff83034bbbdb5d9d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 01 三月 2024 15:20:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/target/classes/mapper/pp/ReportingWork.xml | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/north-glass-erp/target/classes/mapper/pp/ReportingWork.xml b/north-glass-erp/target/classes/mapper/pp/ReportingWork.xml
index 0df04e9..d3cb966 100644
--- a/north-glass-erp/target/classes/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/target/classes/mapper/pp/ReportingWork.xml
@@ -43,17 +43,15 @@
</select>
<select id="SelectWorkBasicDeviceMp">
- select *
- from basic_data_produce as a
- where a.basic_category = #{process}
- and a.basic_type = '璁惧'
+ SELECT bdp.id,bdp.basic_type,bdp.basic_name, bd.basic_name as basic_category FROM sd.basic_data as bd left join `basic_data_produce` as bdp
+ on bd.id=bdp.basic_category
+ where bd.basic_category="process" and bdp.basic_type="device" and bd.basic_name = #{process}
</select>
<select id="SelectWorkBasicTeamsMp">
- select *
- from basic_data_produce as a
- where a.basic_category = #{process}
- and a.basic_type = '鐝粍'
+ SELECT bdp.id,bdp.basic_type,bdp.basic_name, bd.basic_name as basic_category FROM sd.basic_data as bd left join `basic_data_produce` as bdp
+ on bd.id=bdp.basic_category
+ where bd.basic_category="process" and bdp.basic_type="teamsgroups" and bd.basic_name = #{process}
</select>
<!-- 鏌ヨ娴佺▼鍗″伐鑹烘祦绋�-->
@@ -82,7 +80,7 @@
ogd.child_width,
ogd.child_height,
od.shape,
- fc.quantity - IFNULL(fc.number_patches,0)-IFNULL(rwd.completed_quantity,0)-IFNULL(rwd.breakage_quantity,0)-IFNULL((rwd.breakage_quantity-rwd.rework_quantity),0)
+ fc.quantity - IFNULL(fc.number_patches,0)-IFNULL(rwd.completed_quantity,0)-IFNULL(rwd.breakage_quantity,0)-IFNULL((rwd.wait_rework_quantity),0)
as quantity
FROM
sd.order_detail AS od
@@ -111,7 +109,7 @@
ogd.child_width,
ogd.child_height,
od.shape,
- reportingwork_num -IFNULL(rwd.completed_quantity,0)-IFNULL(rwd.breakage_quantity,0)-IFNULL((rwd.breakage_quantity-rwd.rework_quantity),0) as quantity
+ reportingwork_num -IFNULL(rwd.completed_quantity,0)-IFNULL(rwd.breakage_quantity,0)-IFNULL((rwd.wait_rework_quantity),0) as quantity
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
--
Gitblit v1.8.0