From 939ccc9c254870ed15cdd485b9d303bbb00a23f2 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期日, 28 九月 2025 14:16:27 +0800
Subject: [PATCH] 注释加上上海玻璃公司ip
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 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 7996713..4b457d3 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -84,7 +84,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
@@ -113,7 +113,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>
@@ -166,7 +166,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
@@ -177,7 +177,7 @@
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
@@ -223,7 +223,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>
@@ -262,7 +262,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
@@ -272,7 +272,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>
@@ -435,9 +435,9 @@
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(od.other_columns, '$.S01')),'')!='',
- ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),''),
- od.building_number) as s01Value
+ 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 != ''"> -- 闈炴渶鍚庝竴閬撳伐搴�
@@ -448,17 +448,17 @@
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, -- 搴撳瓨鏁伴噺
+ 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)))
+ >= a.completed_quantity,a.completed_quantity,
+ (ifnull(c.inventory_quantity,0)
+ -ifnull(c.received_quantity,0))
)
as minQuantity -- 淇敼鏈�灏忔暟
</if>
@@ -1114,4 +1114,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" and bd.basic_name = #{process}
+ </select>
+
+ <select id="mesSelectWorkBasicTeamsMp">
+ select id,login_name,user_name,address from erp_user_info.`user`
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0