From e394fbcc9abbf9246e5f611585c8dcac1db6beb8 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 26 三月 2025 14:44:33 +0800
Subject: [PATCH] 提交订单转移前后端程序以及部分翻译
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 88 ++++++++++++++++++++++++++++++++++----------
1 files changed, 68 insertions(+), 20 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 48f7c41..02f61ac 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -137,8 +137,8 @@
ogd.child_width,
ogd.child_height,
if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
- fc.quantity + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num as quantity,
- fc.quantity + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num as completedQuantity,
+ fc.quantity -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num as quantity,
+ fc.quantity -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num as completedQuantity,
odpd.reporting_work_num as completed,
odpd.broken_num as onceBroken,
if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
@@ -215,7 +215,7 @@
LEFT JOIN sd.order_glass_detail AS ogd
ON od.order_id = ogd.order_id
AND od.order_number = ogd.order_number
- <if test="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�')">
+ <if test="process == '澶硅兌'">
AND ogd.`group` = (select `group`
from sd.order_glass_detail
where order_id = ogd.order_id
@@ -348,8 +348,8 @@
ifnull(if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)< 0,
0,
(d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)
- ),0)
- from flow_card as a
+ ),0) as num
+ from pp.flow_card as a
left join sd.order_process_detail as b
on
b.order_number = a.order_number
@@ -364,9 +364,9 @@
rw.process_id,rw.order_sort,rw.technology_number,
rwk.this_process
from
- rework as rw
+ pp.rework as rw
LEFT JOIN
- reporting_work as rwk
+ pp.reporting_work as rwk
on rw.reporting_work_id =rwk.reporting_work_id
where rwk.this_process=#{thisProcess}
and rw.review_status=1
@@ -528,12 +528,10 @@
rw.notes,
rw.reviewed
# (IF(rw.reviewed_state = 0, '鏈鏍�', IF(rw.reviewed_state = 1, '瀹℃牳閫氳繃', '瀹℃牳涓嶉�氳繃'))) as reviewed_state
- 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 = ogd.order_id and rw.production_id = ogd.production_id
- left join reporting_work_detail as rwd
- on rwd.reporting_work_id = rw.reporting_work_id and rwd.order_number = ogd.order_number and
- rwd.technology_number = ogd.technology_number
+ from
+ reporting_work as rw left join reporting_work_detail as rwd on rw.reporting_work_id=rwd.reporting_work_id
+ left join sd.order_glass_detail as ogd on ogd.order_id=rw.order_id and ogd.order_number=rwd.order_number and ogd.technology_number=rwd.technology_number
+ left join sd.`order` as o on o.order_id=rw.order_id
where rw.reviewed_state != 2
and rw.reporting_work_time >= #{selectTime1}
AND rw.reporting_work_time < #{selectTime2}
@@ -572,12 +570,9 @@
<select id="getPageTotal">
select CEILING(count(rw.reporting_work_id)/#{pageSize}) as 'pageTotal',
count(distinct rw.reporting_work_id) as 'total'
- 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 = ogd.order_id and rw.production_id = ogd.production_id
- left join reporting_work_detail as rwd
- on rwd.reporting_work_id = rw.reporting_work_id and rwd.order_number = ogd.order_number and
- rwd.technology_number = ogd.technology_number
+ from reporting_work as rw left join reporting_work_detail as rwd on rw.reporting_work_id=rwd.reporting_work_id
+ left join sd.order_glass_detail as ogd on ogd.order_id=rw.order_id and ogd.order_number=rwd.order_number and ogd.technology_number=rwd.technology_number
+ left join sd.`order` as o on o.order_id=rw.order_id
where rw.reviewed_state != 2
and rw.reporting_work_time >= #{selectTime1}
AND rw.reporting_work_time < #{selectTime2} and position(#{orderId} in rw.order_id)
@@ -812,7 +807,7 @@
<update id="ReviewReportingWorkMp">
update reporting_work as rw
left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id
- set rw.reviewed_state = 1 ,rw.reviewed=#{userName}
+ set rw.reviewed_state = 1 ,rw.reviewed=#{userName},rw.examine_time=NOW()
where rw.process_id = #{substring} and rw.this_process=#{process}
and POSITION(rwd.technology_number in #{result}) and reviewed_state=0
</update>
@@ -1012,4 +1007,57 @@
<select id="selectOrderid">
select order_id from pp.flow_card where process_id=#{processIdStr} group by order_id
</select>
+
+ <select id="getFootSum">
+ SELECT
+ ifnull(SUM(this_completed_quantity),0) AS thisCompletedQuantity,
+ ifnull(SUM(ROUND(child_width * child_height * this_completed_quantity / 1000000, 2)),0) AS completedArea,
+ ifnull(SUM(this_worn_quantity),0) AS thisWornQuantity,
+ ifnull(SUM(ROUND(child_width * child_height * this_worn_quantity / 1000000, 2)),0) AS wornArea
+ FROM (
+ -- 鍏堝 reporting_work_id 杩涜鍘婚噸
+ SELECT
+ rw.reporting_work_id,
+ MAX(rw.this_completed_quantity) AS this_completed_quantity,
+ MAX(rw.this_worn_quantity) AS this_worn_quantity,
+ MAX(ogd.child_width) AS child_width,
+ MAX(ogd.child_height) AS child_height
+ FROM reporting_work as rw left join reporting_work_detail as rwd on rw.reporting_work_id=rwd.reporting_work_id
+ left join sd.order_glass_detail as ogd on ogd.order_id=rw.order_id and ogd.order_number=rwd.order_number and ogd.technology_number=rwd.technology_number
+ left join sd.`order` as o on o.order_id=rw.order_id
+ WHERE rw.reviewed_state != 2
+ and rw.reporting_work_time >= #{selectTime1}
+ AND rw.reporting_work_time < #{selectTime2}
+ and position(#{orderId} in rw.order_id)
+ AND rw.reviewed_state != -1
+ AND o.create_order > 0
+ <if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
+ and rw.reporting_work_id regexp #{reportingWork.reportingWorkId}
+ </if>
+ <if test="reportingWork.orderId != null and reportingWork.orderId != ''">
+ and o.order_id regexp #{reportingWork.orderId}
+ </if>
+ <if test="reportingWork.processId != null and reportingWork.processId != ''">
+ and rw.process_id regexp #{reportingWork.processId}
+ </if>
+ <if test="reportingWork.order.project != null and reportingWork.order.project != ''">
+ and o.project regexp #{reportingWork.order.project}
+ </if>
+ <if test="reportingWork.order.batch != null and reportingWork.order.batch != ''">
+ and o.batch regexp #{reportingWork.order.batch}
+ </if>
+ <if test="reportingWork.thisProcess != null and reportingWork.thisProcess != ''">
+ and rw.this_process regexp #{reportingWork.thisProcess}
+ </if>
+ <if test="reportingWork.deviceName != null and reportingWork.deviceName != ''">
+ and rw.device_name regexp #{reportingWork.deviceName}
+ </if>
+ <if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
+ and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
+ </if>
+ GROUP BY rw.reporting_work_id -- 鎸� reporting_work_id 杩涜鍒嗙粍锛岀‘淇濆敮涓�
+
+ ) AS subquery;
+
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0