From 2ad08ea181d8ec1e2b4b90bd1ddd40a2ba595b59 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 07 三月 2024 08:08:25 +0800
Subject: [PATCH] 提交更新
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 65 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 10 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 0df04e9..5b2914f 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/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
@@ -137,4 +135,51 @@
</select>
+ <select id="historyProcessMp">
+ select ifnull(GROUP_CONCAT(distinct rw.this_process),"") from reporting_work as rw where rw.process_id=#{processIdStr}
+ </select>
+
+ <select id="historyDeviceMp">
+ 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 POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))
+ </select>
+
+ <select id="historyTeamsMp">
+ 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 POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))
+ </select>
+
+ <select id="SelectHistoryProcessMp">
+ SELECT
+ distinct
+ 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 POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0