Merge remote-tracking branch 'origin/main'

报表sql/BatchNoResistivity_[excel].sql

@@ -0,0 +1,42 @@
+select
+	order_no 批次号,
+	resistivity 电阻档位,
+	min 电阻低值,
+	case
+		when min >= 1.9 then '高阻'
+		else '低阻'
+	end 高低阻
+from
+	(
+	select
+		order_no ,
+		resistivity,
+		case
+			when resistivity like '>%' then SUBSTRING(resistivity, 5, 7)
+			when resistivity like '%~%' then SUBSTRING_INDEX(resistivity, '~', 1)
+			when resistivity like '%-%' then SUBSTRING_INDEX(resistivity, '-', 1)
+			when resistivity like '<%' then SUBSTRING(resistivity, 5, 7)
+			when resistivity like '>%' then SUBSTRING(resistivity, 2, 7)
+			when resistivity like '<%' then SUBSTRING(resistivity, 2, 7)
+			when resistivity = '未分档'
+			or resistivity is null then '未分档'
+		end min
+	from
+		mes_sync.mes_recycle_material_storage mrms
+union
+	select
+		order_no ,
+		resistivity,
+		case
+			when resistivity like '&gt;%' then SUBSTRING(resistivity, 5, 7)
+			when resistivity like '%~%' then SUBSTRING_INDEX(resistivity, '~', 1)
+			when resistivity like '%-%' then SUBSTRING_INDEX(resistivity, '-', 1)
+			when resistivity like '&lt;%' then SUBSTRING(resistivity, 5, 7)
+			when resistivity like '>%' then SUBSTRING(resistivity, 2, 7)
+			when resistivity like '<%' then SUBSTRING(resistivity, 2, 7)
+			when resistivity = '未分档'
+			or resistivity is null then '未分档'
+		end
+	from
+		mes_sync.mes_disposable_qc_task
+)a

报表sql/Yield_[excel].sql

@@ -0,0 +1,24 @@
+select
+	mfgdate 计产日期,
+	crystalbarno 晶编,
+	eqpid 炉台号,
+	subprod 产品规格,
+	area 车间,
+	area1 片区,
+	qclength QC长度,
+	qcweight 有效重量,
+	qctime QC检验时间,
+	adjustcrucible 坩埚厂商,
+	adjustcruciblecode 坩埚编码,
+	crusize 热场尺寸,
+	timeinterval 运行时间,
+	erpmoname ERP工单号,
+	moprodname 工单物料编码,
+	moproddesc  工单物料描述
+from
+	reportdata.siteonlinecrucibleyield s
+	where 1=1
+    and qctime  >= concat(date_format(now()-8.5/24,'%Y-%m-') ,'01 08:30:00')
+	##and qctime  >= concat(date_format(date_sub(now(),interval 1 month)-8.5/24,'%Y-%m-') ,'01 08:30:00')  /*上月第一天   */
+	and qctime  < concat(date_format(now()-8.5/24,'%Y-%m-%d') ,' 08:30:00')
+	order by qctime