From 90331dacc96f5a5b598fa72e73f10cda42fc89b0 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 05 八月 2025 11:04:57 +0800
Subject: [PATCH] 提交token使用localStorage获取
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 69 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 34 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 10a06e5..45be964 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -102,7 +102,7 @@
</select>
<select id="SelectWorkBasicTeamsMp">
- select * from erp_user_info.`user` WHERE address=#{process}
+ select id,login_name,user_name,address from erp_user_info.`user` WHERE address=#{process}
</select>
<!-- 鏌ヨ娴佺▼鍗″伐鑹烘祦绋�-->
@@ -298,15 +298,13 @@
<select id="historyTeamsMp">
SELECT
- bdp.id,
- bdp.basic_type,
+ bd.id,
+ bd.basic_type,
rw.teams as basic_name,
bd.basic_name,bd.id AS basic_category,
rw.process
FROM
sd.basic_data AS bd
- LEFT JOIN `basic_data_produce` AS bdp
- ON bd.id = bdp.basic_category
right join (
select distinct process,teams from
( select distinct rw.this_process as process,rw.teams_groups_name as teams
@@ -315,8 +313,6 @@
) as t
) as rw
on rw.process=bd.basic_name
- WHERE
- bdp.basic_type = 'teamsgroups'
GROUP BY rw.process,rw.teams
</select>
@@ -326,10 +322,9 @@
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>
@@ -416,7 +411,7 @@
<!--鏌ヨ淇敼鎶ュ伐鏄庣粏鏁版嵁-->
<select id="selectByReportingWorkId" >
- select
+ select * from(select
a.reporting_work_id,
d.order_number,
d.glass_child,
@@ -427,7 +422,7 @@
d.child_height,
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),
+ 0,
ifnull(a.completed_quantity+a.breakage_quantity,0)) as 'quantity', -- 鍙姤宸ユ暟
ifnull(a.completed_quantity,0) as 'completedQuantity', -- 瀹屽伐鏁�
ifnull(a.breakage_quantity,0) as 'breakageQuantity', -- 鐮存崯鏁�
@@ -442,7 +437,7 @@
-ifnull(g.completed_quantity,0))
>
a.completed_quantity,
- 0,
+ a.completed_quantity,
(f.completed_quantity
-ifnull(g.completed_quantity,0))
) as minQuantity -- 淇敼鏈�灏忔暟
@@ -486,6 +481,7 @@
from reporting_work as rw
left join reporting_work_detail as rwd
on rw.reporting_work_id = rwd.reporting_work_id
+ where rw.reviewed_state>-1
group by rw.process_id,
rw.this_process,
rwd.order_number,
@@ -516,16 +512,13 @@
and g.technology_number = a.technology_number
</if>
where b.reporting_work_id = #{reportingWorkId}
- GROUP BY c.order_number,c.technology_number
+ GROUP BY c.order_number,c.technology_number) as result
</select>
<select id="selectReportingWorkMp" resultMap="reportingWorkMap">
- SELECT a.*,
- round(ogd.child_width*ogd.child_height * a.this_completed_quantity/1000000,2) as completedArea,
- round(ogd.child_width*ogd.child_height * a.this_worn_quantity/1000000,2) as wornArea
- from (select rw.reporting_work_id,
+ select rw.reporting_work_id,
(rw.reporting_work_time) as reporting_work_time,
o.order_id,
- CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct rwd.technology_number SEPARATOR '')) as process_id,
+ CONCAT(rw.process_id,'/',rwd.goup) as process_id,
o.project,
o.batch,
rw.this_process,
@@ -536,16 +529,20 @@
rw.reviewed_state,
rw.notes,
rw.reviewed,
- rwd.order_number,
- rwd.technology_number
+ round(rwd.completedArea/LENGTH(rwd.goup),2) as completedArea,
+ rwd.wornArea
# (IF(rw.reviewed_state = 0, '鏈鏍�', IF(rw.reviewed_state = 1, '瀹℃牳閫氳繃', '瀹℃牳涓嶉�氳繃'))) as reviewed_state
from
- reporting_work as rw left join reporting_work_detail as rwd on rw.reporting_work_id=rwd.reporting_work_id
+ reporting_work as rw
+ left join (
+ SELECT cc.reporting_work_id,cc.goup,round(sum(cc.completedArea),2) as completedArea ,round(sum(cc.wornArea),2) as wornArea from (SELECT rwds.reporting_work_id, GROUP_CONCAT(distinct rwds.technology_number SEPARATOR '') as goup,
+ sum(rwds.child_width*rwds.child_height*completed_quantity/1000000)as completedArea,
+ sum(rwds.child_width*rwds.child_height*rwds.breakage_quantity/1000000) as wornArea from reporting_work_detail as rwds GROUP BY rwds.reporting_work_id,order_number ) as cc GROUP BY cc.reporting_work_id)as rwd on rw.reporting_work_id=rwd.reporting_work_id
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 date(rw.reporting_work_time) >= date(#{selectTime1})
+ AND date(rw.reporting_work_time) <= date(#{selectTime2})
and position(#{orderId} in rw.order_id)
and rw.reviewed_state!=-1
and o.create_order>0
@@ -556,7 +553,8 @@
and o.order_id regexp #{reportingWork.orderId}
</if>
<if test="reportingWork.processId != null and reportingWork.processId != ''">
- and rw.process_id regexp #{reportingWork.processId}
+
+ and CONCAT(rw.process_id,'/',rwd.goup) LIKE CONCAT('%', #{reportingWork.processId}, '%')
</if>
<if test="reportingWork.order.project != null and reportingWork.order.project != ''">
and o.project regexp #{reportingWork.order.project}
@@ -575,9 +573,7 @@
</if>
GROUP BY rw.reporting_work_id
ORDER BY rw.reporting_work_id desc
- limit #{offset},#{pageSize} ) as a
- left join sd.order_glass_detail as ogd on ogd.order_id=a.order_id and ogd.order_number=a.order_number and ogd.technology_number=a.technology_number
- GROUP BY a.reporting_work_id
+ limit #{offset},#{pageSize}
</select>
<select id="getPageTotal">
@@ -1023,21 +1019,26 @@
<select id="getFootSum">
SELECT
- SUM(rwd.completed_quantity) AS thisCompletedQuantity,
- ROUND(SUM(rwd.child_width * rwd.child_height * rwd.completed_quantity / 1000000), 2) AS completedArea,
- SUM(rwd.breakage_quantity) AS thisWornQuantity,
- ROUND(SUM(rwd.child_width * rwd.child_height * rwd.breakage_quantity / 1000000), 2) AS wornArea,
+ SUM(rw.this_completed_quantity) AS thisCompletedQuantity,
+ ROUND(SUM(rwd.completedArea/length(goup)), 2) AS completedArea,
+ SUM(rw.this_worn_quantity) AS thisWornQuantity,
+ ROUND(SUM(rwd.wornArea), 2) AS wornArea,
CEILING(count(rw.reporting_work_id)/#{pageSize}) as 'pageTotal',
count(distinct rw.reporting_work_id) as 'total'
FROM reporting_work AS rw
- LEFT JOIN reporting_work_detail AS rwd ON rw.reporting_work_id = rwd.reporting_work_id
+ LEFT JOIN
+ (SELECT cc.reporting_work_id,cc.goup,round(sum(cc.completedArea),2) as completedArea ,round(sum(cc.wornArea),2) as wornArea from (SELECT rwds.reporting_work_id, GROUP_CONCAT(distinct rwds.technology_number SEPARATOR '') as goup,
+ sum(rwds.child_width*rwds.child_height*completed_quantity/1000000)as completedArea,
+ sum(rwds.child_width*rwds.child_height*rwds.breakage_quantity/1000000) as wornArea from reporting_work_detail as rwds GROUP BY rwds.reporting_work_id,order_number ) as cc GROUP BY cc.reporting_work_id)
+ 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 date(rw.reporting_work_time) >= date(#{selectTime1})
+ AND date(rw.reporting_work_time) <= date(#{selectTime2})
AND position(#{orderId} in rw.order_id)
AND rw.reviewed_state != -1
AND o.create_order > 0
--
Gitblit v1.8.0