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 | 140 +++++++++++++++++++++++++++++++---------------
1 files changed, 93 insertions(+), 47 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 d8518a2..636a063 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -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,7 +86,7 @@
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
@@ -102,7 +104,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>
<!-- 鏌ヨ娴佺▼鍗″伐鑹烘祦绋�-->
@@ -113,7 +115,7 @@
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(fc.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 -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,
+ 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,10 +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 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
@@ -195,18 +206,32 @@
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,
+ 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
+ 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
@@ -218,7 +243,7 @@
from sd.order_glass_detail
where order_id = ogd.order_id
and order_number = ogd.order_number
- and POSITION(technology_number in #{technologyStr})
+ and FIND_IN_SET(technology_number , #{technologyStr})
limit 1)
</if>
@@ -257,7 +282,7 @@
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 POSITION(b.technology_number in #{technologyStr})
+ AND FIND_IN_SET(b.technology_number , #{technologyStr})
</if>
GROUP BY b.order_number,b.technology_number
) as rws
@@ -267,7 +292,7 @@
AND odpd.process = #{process}
<if test="laminating == ''">
- AND POSITION(fc.technology_number in #{technologyStr})
+ AND FIND_IN_SET(fc.technology_number , #{technologyStr})
</if>
order by fc.order_number
</select>
@@ -298,8 +323,8 @@
<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
@@ -322,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>
@@ -412,7 +436,7 @@
<!--鏌ヨ淇敼鎶ュ伐鏄庣粏鏁版嵁-->
<select id="selectByReportingWorkId" >
- select
+ select * from(select
a.reporting_work_id,
d.order_number,
d.glass_child,
@@ -423,13 +447,17 @@
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 != ''"> -- 闈炴渶鍚庝竴閬撳伐搴�
@@ -438,19 +466,19 @@
-ifnull(g.completed_quantity,0))
>
a.completed_quantity,
- a.completed_quantity,
+ (a.completed_quantity+ a.breakage_quantity),
(f.completed_quantity
- -ifnull(g.completed_quantity,0))
+ -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>
@@ -482,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,
@@ -500,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,
@@ -513,6 +542,7 @@
</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,
@@ -533,16 +563,16 @@
rwd.wornArea
# (IF(rw.reviewed_state = 0, '鏈鏍�', IF(rw.reviewed_state = 1, '瀹℃牳閫氳繃', '瀹℃牳涓嶉�氳繃'))) as reviewed_state
from
- reporting_work as rw
+ 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 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
+ 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 >= #{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
@@ -553,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}
@@ -568,7 +599,7 @@
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
@@ -919,6 +950,11 @@
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>
@@ -1024,11 +1060,11 @@
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
+ 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 reporting_work_detail as rwds GROUP BY rwds.reporting_work_id,order_number ) as cc GROUP BY cc.reporting_work_id)
+ 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
@@ -1036,8 +1072,8 @@
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
@@ -1048,7 +1084,7 @@
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}
@@ -1063,7 +1099,7 @@
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>
</select>
@@ -1098,4 +1134,14 @@
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