From 9ccc8bd3a53160a40cf60f14e5867f6ce9f6c58f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 16:49:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 566 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 450 insertions(+), 116 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 b6d53d3..636a063 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -16,7 +16,6 @@
<result property="thisWornQuantity" column="this_worn_quantity"/>
<result property="deviceName" column="device_name"/>
<result property="teamsGroupsName" column="teams_groups_name"/>
- <result property="reviewedState" column="reviewed_state"/>
<result property="reportingWorkId" column="reporting_work_id"/>
<result property="processId" column="process_id"/>
<result property="completedArea" column="completedArea"/>
@@ -24,6 +23,7 @@
<result property="qualityInspector" column="quality_inspector"/>
<result property="qualityInsTime" column="quality_ins_time"/>
<result property="notes" column="notes"/>
+ <result property="reviewed" column="reviewed"/>
<association property="order" javaType="com.example.erp.entity.sd.Order">
<result property="customerId" column="customer_id"/>
@@ -37,6 +37,7 @@
<association property="flowCard" javaType="com.example.erp.entity.pp.FlowCard">
<result property="orderId" column="order_id"/>
<result property="productionId" column="production_id"/>
+ <result property="processId" column="processIdFirst"/>
</association>
<association property="reportingWorkDetail" javaType="com.example.erp.entity.pp.ReportingWorkDetail">
<result property="completedQuantity" column="completed_quantity"/>
@@ -69,6 +70,7 @@
<select id="AddSelectLastWorkMp" resultMap="reportingWorkMap">
select o.order_id,
fc.production_id,
+ fc.process_id as 'processIdFirst',
o.customer_id,
o.customer_name,
o.project,
@@ -84,13 +86,14 @@
from reporting_work as a
left join reporting_work_detail as b on a.reporting_work_id = b.reporting_work_id
where this_process=#{previousProcess} and reviewed_state=0 and process_id=#{processIdStr}
- and POSITION(b.technology_number in #{technologyStr})
+ and FIND_IN_SET(b.technology_number , #{technologyStr})
) as rw
on rw.process_id = fc.process_id
left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id and rwd.technology_number=fc.technology_number
where fc.process_id = #{processIdStr}
and POSITION(fc.technology_number in #{technologyStr})
and if(#{reportType}=1,o.order_type!='鏍峰搧璁㈠崟',o.order_id!='')
+ and o.create_order>0
GROUP BY fc.process_id
</select>
@@ -101,9 +104,7 @@
</select>
<select id="SelectWorkBasicTeamsMp">
- 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 id,login_name,user_name,address from erp_user_info.`user` WHERE address=#{process}
</select>
<!-- 鏌ヨ娴佺▼鍗″伐鑹烘祦绋�-->
@@ -111,9 +112,10 @@
select ifnull((select ogd.process
from sd.order_glass_detail as ogd
left join sd.`order` as o on o.order_id=ogd.order_id
- where ogd.production_id = LEFT(#{processIdStr}, 11)
+ left join flow_card as fc on fc.order_id=o.order_id and fc.order_number=ogd.order_number and fc.technology_number=ogd.technology_number
+ where fc.process_id = #{processIdStr}
and o.create_order>0
- and POSITION(ogd.technology_number in #{technologyStr})
+ and FIND_IN_SET(fc.technology_number , #{technologyStr})
limit 1),'') as process
</select>
@@ -135,12 +137,21 @@
ogd.child_width,
ogd.child_height,
if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
- fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(patch.patch_num,0) as quantity,
- fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(patch.patch_num,0) as completedQuantity,
+ IF(odpd.reporting_work_num>=fc.quantity-fc.termination_quantity,
+ (fc.quantity -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num),
+ IF((fc.quantity - ifnull(fc.termination_quantity,0) -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num )<0,0,
+ (fc.quantity - ifnull(fc.termination_quantity,0) -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num)))
+ as quantity,
+ IF(odpd.reporting_work_num>=fc.quantity-fc.termination_quantity,
+ (fc.quantity -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num),
+ IF((fc.quantity - ifnull(fc.termination_quantity,0) -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num )<0,0,
+ (fc.quantity - ifnull(fc.termination_quantity,0) -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, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
- od.other_columns
+ if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')!='',
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),''),
+ od.building_number) as s01Value
FROM
sd.order_detail AS od
LEFT JOIN sd.order_glass_detail AS ogd
@@ -164,7 +175,7 @@
where
reporting_work.this_process = #{process}
and a.process_id=#{processIdStr}
- and POSITION(a.technology_number in #{technologyStr})
+ and FIND_IN_SET(a.technology_number , #{technologyStr})
and a.review_status = 1
group by a.process_id,a.order_sort,a.technology_number
) as patch
@@ -175,9 +186,10 @@
WHERE
fc.process_id = #{processIdStr}
- AND POSITION(fc.technology_number in #{technologyStr})
+ AND FIND_IN_SET(fc.technology_number , #{technologyStr})
AND odpd.process = #{process}
and if(#{reportType}=1,o.order_type!='鏍峰搧璁㈠崟',o.order_id!='')
+ and o.create_order>0 and fc.quantity - ifnull(fc.termination_quantity,0)>0
group by fc.order_number,
ogd.technology_number
order by fc.order_number
@@ -186,56 +198,69 @@
<!-- 闈炵涓�閬撳伐搴忔姤宸ユ槑缁嗘煡璇�-->
<select id="SelectReworlDetailMp">
SELECT
- fc.order_number,
- ogd.glass_child,
- ogd.technology_number,
- ogd.glass_address,
- fc.quantity AS quantity_card,
- ogd.child_width,
- ogd.child_height,
+ fc.order_number,
+ ogd.glass_child,
+ ogd.technology_number,
+ ogd.glass_address,
+ fc.quantity AS quantity_card,
+ ogd.child_width,
+ ogd.child_height,
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,
- 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 completedQuantity,
- odpd.reporting_work_num as completed,
- odpd.broken_num as onceBroken,
- ogd.`group`,
- if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
- od.other_columns,
- ogd.id as 'glassId'
+ IF(
+ odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num<=fc.quantity-fc.termination_quantity,
+ IF(odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num=fc.termination_quantity,0,
+ odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num),
+ IF(odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num-fc.termination_quantity<0
+ ,0,
+ odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num-fc.termination_quantity)
+ )
+ AS quantity,
+ IF(
+ odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num<=fc.quantity-fc.termination_quantity,
+ IF(odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num=fc.termination_quantity,0,
+ odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num),
+ IF(odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num-fc.termination_quantity<0
+ ,0,
+ odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num-fc.termination_quantity)
+ ) AS completedQuantity,
+ odpd.reporting_work_num as completed,
+ odpd.broken_num as onceBroken,
+ ogd.`group`,
+ if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
+ od.other_columns,
+ ogd.id as 'glassId',IFNULL(rws.reviewed_state,0) as reviewed_state,
+ if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')!='',
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),''),
+ od.building_number) as s01Value
FROM
- sd.order_detail AS od
+ 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
- <if test="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�' and previousProcess=='澶硅兌')">
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ <if test="laminating == 'stepA' || laminating == 'stepC'" >
AND ogd.`group` = (select `group`
- from sd.order_glass_detail
- where order_id = ogd.order_id
- and order_number = ogd.order_number
- and POSITION(technology_number in #{technologyStr})
- limit 1)
+ from sd.order_glass_detail
+ where order_id = ogd.order_id
+ and order_number = ogd.order_number
+ and FIND_IN_SET(technology_number , #{technologyStr})
+ limit 1)
</if>
-
LEFT JOIN flow_card AS fc
- ON fc.order_id = ogd.order_id
- and fc.production_id=ogd.production_id
- AND fc.order_number = ogd.order_number
- AND fc.technology_number = ogd.technology_number
+ ON fc.order_id = ogd.order_id
+ and fc.production_id=ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
left join sd.order_process_detail as odpd
- ON odpd.order_id = fc.order_id
- AND odpd.order_number = fc.order_number
- AND odpd.technology_number = fc.technology_number
- and odpd.process_id = fc.process_id
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
left join sd.order_process_detail as odpds
- ON odpds.id = odpd.id-1
+ ON odpds.id = odpd.id-1
left join
- (SELECT
+ (SELECT
sum(rw.rework_num) as 'patchNumSum',
rw.process_id,rw.order_sort,rw.technology_number,
rwk.this_process
@@ -245,19 +270,30 @@
reporting_work as rwk
on rw.reporting_work_id =rwk.reporting_work_id
where rwk.this_process=#{process}
- and rw.review_status=1
+ and rw.review_status>=0
and rw.process_id = #{processIdStr}
GROUP BY rw.process_id,rw.order_sort,rw.technology_number) as c
- on c.process_id = fc.process_id
- and c.order_sort = fc.order_number
- and c.technology_number = fc.technology_number
-
- WHERE
- fc.process_id = #{processIdStr}
- <if test="process != '涓┖' and process != '澶硅兌' and process != '鍖呰' and process != '鎵撹兌鍜岀矘妗�' ">
- AND POSITION(fc.technology_number in #{technologyStr})
+ on c.process_id = fc.process_id
+ and c.order_sort = fc.order_number
+ and c.technology_number = fc.technology_number
+ left join (select reviewed_state as reviewed_state ,
+ process_id,a.reporting_work_id,b.technology_number,b.order_number
+ from reporting_work as a
+ left join reporting_work_detail as b on a.reporting_work_id = b.reporting_work_id
+ where this_process=#{previousProcess} and process_id= #{processIdStr} and a.reviewed_state>=0
+ <if test="laminating == ''">
+ AND FIND_IN_SET(b.technology_number , #{technologyStr})
</if>
+ GROUP BY b.order_number,b.technology_number
+ ) as rws
+ on rws.process_id = fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number
+ WHERE
+ fc.process_id = #{processIdStr}
+
AND odpd.process = #{process}
+ <if test="laminating == ''">
+ AND FIND_IN_SET(fc.technology_number , #{technologyStr})
+ </if>
order by fc.order_number
</select>
@@ -287,15 +323,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
@@ -304,8 +338,6 @@
) as t
) as rw
on rw.process=bd.basic_name
- WHERE
- bdp.basic_type = 'teamsgroups'
GROUP BY rw.process,rw.teams
</select>
@@ -315,10 +347,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>
@@ -342,11 +373,11 @@
</select>
<select id="selectGlassProcessNum" resultType="java.lang.Integer">
select
- if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)< 0,
+ 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)
- )
- 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
@@ -361,9 +392,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
@@ -380,7 +411,7 @@
</select>
<select id="selectFlowCardNum" resultType="java.lang.Integer">
select
- a.quantity-b.reporting_work_num-b.broken_num+ifnull(c.patchNumSum,0)
+ a.quantity +ifnull(c.patchNumSum,0)-b.reporting_work_num-b.broken_num
from flow_card as a
left join sd.order_process_detail as b
on
@@ -389,14 +420,14 @@
and b.order_id = SUBSTR(#{processId} from 1 for 10)
and b.process = #{thisProcess}
and b.process_id = a.process_id
- left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
+ left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id,patch_processes
from patch_log
- group by order_sort,technology_number) as c
+ group by process_id,order_sort,technology_number,patch_processes) as c
on
c.process_id = a.process_id
and c.order_sort = a.order_number
and c.technology_number = a.technology_number
-
+ and c.patch_processes= #{thisProcess}
where
a.process_id=SUBSTR(#{processId} from 1 for 14)
and a.order_number = #{orderNumber}
@@ -405,7 +436,7 @@
<!--鏌ヨ淇敼鎶ュ伐鏄庣粏鏁版嵁-->
<select id="selectByReportingWorkId" >
- select
+ select * from(select
a.reporting_work_id,
d.order_number,
d.glass_child,
@@ -416,32 +447,38 @@
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.completed_quantity,0) as 'completedQuantityComputed', -- 瀹屽伐鏁�
ifnull(a.breakage_quantity,0) as 'breakageQuantity', -- 鐮存崯鏁�
ifnull(f.completed_quantity,0) as thisQuantitySum ,-- 鏈伐搴忓畬宸ュ拰
if(c.quantity-f.completed_quantity = 0 ,true,false) as saveFlag,
e.other_columns,
+ if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(e.other_columns, '$.S01')),'')!='',
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(e.other_columns, '$.S01')),''),
+ e.building_number) as s01Value,
+ IF(count(pl.id)>0,'宸茶ˉ鐗�','') as patchStatusOther,
+
<if test="nextProcess != null and nextProcess != ''"> -- 闈炴渶鍚庝竴閬撳伐搴�
ifnull(g.completed_quantity,0) as nextQuantitySum, -- 鍚庡伐搴忓凡瀹屾垚
if((f.completed_quantity
-ifnull(g.completed_quantity,0))
- >=
+ >
a.completed_quantity,
- 0,
- (a.completed_quantity-f.completed_quantity
- +ifnull(g.completed_quantity,0))
+ (a.completed_quantity+ a.breakage_quantity),
+ (f.completed_quantity
+ -ifnull(g.completed_quantity,0) + a.breakage_quantity)
) as minQuantity -- 淇敼鏈�灏忔暟
</if>
<if test="nextProcess == null or nextProcess == ''"> -- 鏈�鍚庝竴閬撳伐搴�
-# c.received_quantity, -- 宸插叆搴撴暟閲�
-# c.inventory_quantity, -- 搴撳瓨鏁伴噺
- if(ifnull(inventory_quantity,0)
- -ifnull(c.received_quantity,0)
- >= a.completed_quantity,0,
- (a.completed_quantity-(ifnull(c.inventory_quantity,0)
- -ifnull(c.received_quantity,0)))
+ c.received_quantity, -- 宸插叆搴撴暟閲�
+ c.inventory_quantity, -- 搴撳瓨鏁伴噺
+ if(ifnull(inventory_quantity,0)
+ -ifnull(c.received_quantity,0)
+ > a.completed_quantity,a.completed_quantity+ a.breakage_quantity,
+ (ifnull(c.inventory_quantity,0)
+ -ifnull(c.received_quantity,0)+ a.breakage_quantity)
)
as minQuantity -- 淇敼鏈�灏忔暟
</if>
@@ -462,6 +499,8 @@
and d.technology_number = c.technology_number
left join sd.order_detail as e
on e.order_id = d.order_id and e.order_number = d.order_number
+ left join patch_log as pl on pl.reporting_work_id=b.reporting_work_id
+ and pl.order_sort=a.order_number and pl.technology_number=a.technology_number
left join (select sum(completed_quantity) as completed_quantity ,
rw.process_id,
@@ -471,6 +510,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 and rw.order_id=#{orderId}
group by rw.process_id,
rw.this_process,
rwd.order_number,
@@ -489,7 +529,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>=0
+ where rw.reviewed_state>=0 and rw.order_id=#{orderId}
group by rw.process_id,
rw.this_process,
rwd.order_number,
@@ -502,32 +542,37 @@
</if>
where b.reporting_work_id = #{reportingWorkId}
GROUP BY c.order_number,c.technology_number
+ order BY c.order_number,c.technology_number) as result
</select>
<select id="selectReportingWorkMp" resultMap="reportingWorkMap">
- 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,
rw.this_completed_quantity,
- round(ogd.area * rw.this_completed_quantity,2) as completedArea,
rw.this_worn_quantity,
- round(ogd.area * rw.this_worn_quantity,2) as wornArea,
rw.device_name,
rw.teams_groups_name,
rw.reviewed_state,
- rw.notes
+ rw.notes,
+ rw.reviewed,
+ 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 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
+ pp.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 pp.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 between #{selectTime1} and #{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
@@ -538,7 +583,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}
@@ -553,24 +599,22 @@
and rw.device_name regexp #{reportingWork.deviceName}
</if>
<if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
- and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
+ and rw.teams_groups_name like concat('%', #{reportingWork.teamsGroupsName}, '%')
</if>
GROUP BY rw.reporting_work_id
ORDER BY rw.reporting_work_id desc
- limit #{offset},#{pageSize};
+ limit #{offset},#{pageSize}
</select>
<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 between #{selectTime1} and #{selectTime2} and position(#{orderId} in rw.order_id)
+ 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 != ''">
@@ -699,7 +743,7 @@
left join damage_details as dd on dd.reporting_work_id=rw.reporting_work_id
where rw.reviewed_state != 2
- and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
+ and DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
and position(#{processId} in rw.process_id)
and position(#{state} in dd.quality_ins_status)
and rw.reviewed_state!=-1
@@ -729,7 +773,7 @@
left join damage_details as dd on dd.reporting_work_id=rw.reporting_work_id
where rw.reviewed_state != 2
- and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
+ and DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
and position(#{processId} in rw.process_id)
and position(#{state} in dd.quality_ins_status)
and rw.reviewed_state!=-1
@@ -802,7 +846,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
+ 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>
@@ -810,4 +854,294 @@
<select id="getPatchConditionMp">
select count(*) from damage_details where reporting_work_id=#{reportingWorkId} and patch_status>0
</select>
+
+ <select id="getFirstStep">
+ SELECT
+
+ fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(patch.patch_num,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
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id=ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
+ left join (
+ select ifnull(sum(a.patch_num),0) as patch_num,a.process_id,a.technology_number,a.order_sort
+ from patch_log as a
+ right join reporting_work
+ on a.reporting_work_id=reporting_work.reporting_work_id
+ where
+ reporting_work.this_process = #{interceptProcess}
+ and a.process_id=#{processId}
+ and a.order_sort=#{orderSort}
+ and POSITION(a.technology_number in #{technologyNumber})
+ and a.review_status = 1
+ group by a.process_id,a.order_sort,a.technology_number
+ ) as patch
+ on patch.process_id = fc.process_id
+ and patch.order_sort = fc.order_number
+ and patch.technology_number = fc.technology_number
+ left join sd.`order` as o on o.order_id=od.order_id
+
+ WHERE
+ fc.process_id = #{processId}
+ and fc.order_number=#{orderSort}
+ AND POSITION(fc.technology_number in #{technologyNumber})
+ AND odpd.process = #{interceptProcess}
+ group by fc.order_number,
+ ogd.technology_number
+ order by fc.order_number
+ </select>
+
+ <update id="updateReplenishWorkProcess">
+ update sd.order_process_detail
+ set
+ broken_num=broken_num - #{patchNum}
+ where process_id = #{processId}
+ and order_number = #{orderSort}
+ and technology_number = #{technologyNumber}
+ and process = #{patchProcesses}
+ </update>
+
+ <update id="updateRWPatchNum">
+ update reporting_work
+ set this_worn_quantity=this_worn_quantity-#{patchNum}
+ where reporting_work_id=#{reportingWorkId}
+ </update>
+
+ <update id="updateRWDPatchNum">
+ update reporting_work_detail
+ set breakage_quantity=breakage_quantity-#{patchNum}
+ where reporting_work_id=#{reportingWorkId} and order_number = #{orderSort}
+ and technology_number = #{technologyNumber}
+ </update>
+
+ <select id="selectUserProcess">
+ select address from erp_user_info.user where login_name=#{userId}
+ </select>
+
+ <select id="getSelectProcessJiajiao">
+ SELECT * FROM (
+ SELECT * FROM sd.basic_data
+ WHERE basic_type='product' AND basic_category='process' AND basic_name='澶硅兌'
+
+ UNION
+
+ SELECT * FROM sd.basic_data
+ WHERE basic_type='product' AND basic_category='process' AND basic_name='鍧囪川'
+ ) AS combined_results;
+ </select>
+
+ <select id="getSelectProcessDuoqu">
+ SELECT * FROM (
+ SELECT * FROM sd.basic_data
+ WHERE basic_type='product' AND basic_category='process' AND basic_name='鎶�鏈儴澶氭洸'
+
+ UNION
+
+ SELECT * FROM sd.basic_data
+ WHERE basic_type='product' AND basic_category='process' AND basic_name='閽㈠寲'
+
+ UNION
+
+ SELECT * FROM sd.basic_data
+ WHERE basic_type='product' AND basic_category='process' AND basic_name='鐑集'
+ ) AS combined_results;
+ </select>
+
+ <select id="SelectReworlDetailMpReview">
+ SELECT
+ fc.order_number,
+ ogd.glass_child,
+ ogd.technology_number,
+ ogd.glass_address,
+ fc.quantity AS quantity_card,
+ ogd.child_width,
+ ogd.child_height,
+ 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,
+ 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 completedQuantity,
+ odpd.reporting_work_num as completed,
+ odpd.broken_num as onceBroken,
+ ogd.`group`,
+ if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
+ od.other_columns,
+ ogd.id as 'glassId'
+ ,rws.reviewed_state
+ 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
+ <if test="laminating == 'stepA' || laminating == 'stepC'" >
+ AND ogd.`group` = (select `group`
+ from sd.order_glass_detail
+ where order_id = ogd.order_id
+ and order_number = ogd.order_number
+ and POSITION(technology_number in #{technologyStr})
+ limit 1)
+ </if>
+
+
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id=ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
+ left join sd.order_process_detail as odpds
+ ON odpds.id = odpd.id-1
+ left join
+ (SELECT
+ sum(rw.rework_num) as 'patchNumSum',
+ rw.process_id,rw.order_sort,rw.technology_number,
+ rwk.this_process
+ from
+ rework as rw
+ LEFT JOIN
+ reporting_work as rwk
+ on rw.reporting_work_id =rwk.reporting_work_id
+ where rwk.this_process=#{process}
+ and rw.review_status=0
+ and rw.process_id = #{processIdStr}
+ GROUP BY rw.process_id,rw.order_sort,rw.technology_number) as c
+ on c.process_id = fc.process_id
+ and c.order_sort = fc.order_number
+ and c.technology_number = fc.technology_number
+ left join (select reviewed_state as reviewed_state ,
+ process_id,a.reporting_work_id,b.technology_number,b.order_number
+ from reporting_work as a
+ left join reporting_work_detail as b on a.reporting_work_id = b.reporting_work_id
+ where this_process=#{previousProcess} and reviewed_state=0 and process_id= #{processIdStr}
+
+ GROUP BY a.reporting_work_id,b.order_number,b.technology_number
+ ) as rws
+ on rws.process_id = fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number
+ WHERE
+ fc.process_id = #{processIdStr}
+ <if test="laminating == ''">
+ AND POSITION(fc.technology_number in #{technologyStr})
+ </if>
+ AND odpd.process = #{process}
+ and rws.reviewed_state=0
+ order by fc.order_number
+ </select>
+
+ <select id="getProcessLaminating">
+ select IFNULL(nickname,'') from sd.basic_data where basic_category='process' and basic_name=#{process}
+ </select>
+
+ <select id="selectOrderid">
+ select order_id from pp.flow_card where process_id=#{processIdStr} group by order_id
+ </select>
+
+ <select id="getFootSum">
+ SELECT
+ 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 pp.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 pp.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 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
+ <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 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}
+ </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 like concat('%', #{reportingWork.teamsGroupsName}, '%')
+ </if>
+ </select>
+
+ <select id="selectReviewedState">
+ select reviewed_state from pp.reporting_work where reporting_work_id=#{reportingWorkId};
+ </select>
+
+ <select id="qualityReviewSearchMp" resultMap="reportingWorkMap">
+ select rw.reporting_work_id,
+ rw.reporting_work_time,
+ rw.process_id,
+ o.project,
+ o.customer_name,
+ rw.this_process,
+ ifnull(rw.this_completed_quantity,0) as this_completed_quantity,
+ rw.this_worn_quantity,
+ rw.teams_groups_name,
+ rw.device_name,
+ rw.previous_process,
+ rw.next_process,
+ rw.quality_inspector,
+ rw.quality_ins_time,
+ dd.quality_ins_status
+ 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
+
+ right join damage_details as dd on dd.reporting_work_id=rw.reporting_work_id
+ where rw.reviewed_state != 2
+ and dd.quality_ins_status = 1
+ and rw.reviewed_state!=-1
+ GROUP BY rw.reporting_work_id
+ ORDER BY rw.reporting_work_id desc
+ </select>
+
+ <select id="mesSelectWorkBasicDeviceMp">
+ 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"
+ </select>
+
+ <select id="mesSelectWorkBasicTeamsMp">
+ select id,login_name,user_name,address from erp_user_info.`user` where address is not null
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0