ERP_override.git

			@@ -3177,6 +3177,7 @@
			b.child_width,
			b.child_height,
			c.quantity,

			c.quantity-ifnull(c.termination_quantity,0) as thisQuantity,/用于判断是否改变颜色/
			e.reportWorkQuantity,
			e.reportWorkQuantityShow,
			@@ -3184,19 +3185,19 @@
			e.reportWorkTime,
			e.broken_num,
			c.quantity-ifnull(c.termination_quantity,0) as glassQuantity,
			c.quantity*a.area as gross_area,
			c.quantity-ifnull(c.termination_quantity,0) as quantityShow,
			(c.quantity-ifnull(c.termination_quantity,0))*a.compute_area as grossAreaShow,
			ifnull(f.inventory, 0) as inventoryShow,
			round(ifnull(f.inventory, 0) * a.compute_area, 2) as inventoryAreaShow, -- 库存面积
			ifnull(dd.quantity, 0) as shippedQuantityShow, -- 发货数量
			(ifnull(c.received_quantity, 0))*a.compute_area as StorageAreaShow,-- 入库面积

			if(c.technology_number=1,(c.quantity-ifnull(c.termination_quantity,0))*a.compute_area,0) as grossArea,
			if(c.technology_number=1,ifnull(f.inventory, 0) ,0) as inventory,
			if(c.technology_number=1,round(ifnull(f.inventory, 0) * a.compute_area, 2),0) as inventoryArea,
			if(c.technology_number=1,ifnull(dd.quantity, 0) ,0) as shippedQuantity,
			if(c.technology_number=1,(ifnull(c.received_quantity, 0))*a.compute_area,0) as StorageArea,
			c.quantity-ifnull(c.termination_quantity,0) as quantityShow,
			round( (c.quantity-ifnull(c.termination_quantity,0))*a.compute_area,2) as grossAreaShow,
			ifnull(c.received_quantity, 0) as StorageShow,
			ifnull(dd.quantity, 0) as shippedQuantityShow, -- 发货数量
			round(ifnull(dd.quantity, 0)*a.compute_area,2) as shippedAreaShow, -- 发货面积
			round((ifnull(c.received_quantity, 0))*a.compute_area,2) as StorageAreaShow,-- 入库面积

			round((c.quantity-ifnull(c.termination_quantity,0))*a.compute_area,2)as grossArea,
			ifnull(c.received_quantity, 0) as Storage,
			ifnull(dd.quantity, 0) as shippedQuantity,
			round(ifnull(dd.quantity, 0)*a.compute_area,2) as shippedArea,
			round((ifnull(c.received_quantity, 0))*a.compute_area,2) as StorageArea,


			ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber,
			@@ -3213,106 +3214,45 @@
			and c.technology_number = b.technology_number
			left join sd.`order` as d
			on c.order_id = d.order_id
			left join mm.finished_goods_inventory as f
			on c.order_id = f.order_id and f.order_number = c.order_number
			left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
			left join (SELECT process_id,
			order_number,
			technology_number,
			sum(a.broken_num) as broken_num,
			concat('{',
			GROUP_CONCAT(concat("\"", process, "\":\"", if(technology_number!=1 and (bd.nickname='stepD' \|\| bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),
			'}'
			) as reportWorkQuantity,
			concat('{',
			GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
			'}'
			) as reportWorkQuantityShow,
			concat('{',
			GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num_count, "\"")),
			'}'
			) as reportWorkQuantityCount,
			concat('{',
			GROUP_CONCAT(concat("\"", process, "\":\"", IFNULL(date(update_time),''), "\"")),
			'}'
			) as reportWorkTime
			FROM sd.order_process_detail as a
			left join (SELECT DISTINCT basic_name,nickname from sd.basic_data as bd where bd.basic_category = 'process') as bd
			on a.process = bd.basic_name
			where a.order_id = #{orderId}
			GROUP BY process_id, a.order_number, a.technology_number
			# left join mm.finished_goods_inventory as f
			# on c.order_id = f.order_id and f.order_number = c.order_number
			left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
			left join (SELECT process_id,
			order_number,
			technology_number,
			sum(a.broken_num) as broken_num,
			concat('{',
			GROUP_CONCAT(concat("\"", process, "\":\"", if(technology_number!=1 and (bd.nickname='stepD' \|\| bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),
			'}'
			) as reportWorkQuantity,
			concat('{',
			GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
			'}'
			) as reportWorkQuantityShow,
			concat('{',
			GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num_count, "\"")),
			'}'
			) as reportWorkQuantityCount,
			concat('{',
			GROUP_CONCAT(concat("\"", process, "\":\"", IFNULL(date(update_time),''), "\"")),
			'}'
			) as reportWorkTime
			FROM sd.order_process_detail as a
			left join (SELECT DISTINCT basic_name,nickname from sd.basic_data as bd where bd.basic_category = 'process') as bd
			on a.process = bd.basic_name
			where a.order_id = #{orderId}
			GROUP BY process_id, a.order_number, a.technology_number


			) as e
			on e.process_id = c.process_id
			and e.technology_number = c.technology_number
			and e.order_number = c.order_number
			) as e
			on e.process_id = c.process_id
			and e.technology_number = c.technology_number
			and e.order_number = c.order_number
			where a.order_id = #{orderId} and d.create_order>0 and c.quantity-ifnull(c.termination_quantity,0)>0
			group by c.order_number,
			c.technology_number,
			c.process_id
			c.technology_number,
			c.process_id
			order by c.process_id, c.order_number, c.technology_number
			</select>

			<select id="yieldProcessMp">
			select
			rw.this_process as process,
			rw.completedQuantity,
			IFNULL(dd.breakageQuantity,0) as breakageQuantity,
			rw.completedArea,
			IFNULL(dd.breakageArea,0) as breakageArea,
			CONCAT(ROUND(TRUNCATE(rw.completedArea/(rw.completedArea + IFNULL(dd.breakageArea,0)),2)*100), '%') as finished
			from
			(
			select
			tb.process as this_process,
			SUM(tb.completedQuantity) as completedQuantity,
			ROUND(SUM(completedArea),2) as completedArea
			from (
			SELECT
			rw.process_id,
			rw.this_process AS process,
			rw.teams_groups_name AS teamsGroupsName,
			rwd.order_number AS orderNumber,
			MAX(bd.nickname) AS nickname,
			/* 仅当 nickname 为空时才显示 technology_number，否则为 NULL */
			MIN(CASE WHEN bd.nickname IS NULL THEN rwd.technology_number ELSE NULL END) AS technologyNumber,
			COALESCE((rwd.completed_quantity), 0) AS completedQuantity,
			ROUND(COALESCE((rwd.child_width * rwd.child_height * rwd.completed_quantity),0)/1000000, 2)
			AS completedArea
			FROM reporting_work rw
			LEFT JOIN reporting_work_detail rwd
			ON rwd.reporting_work_id = rw.reporting_work_id
			LEFT JOIN sd.basic_data bd
			ON bd.basic_name = rw.this_process

			WHERE rw.reporting_work_time >= #{selectTime1}
			AND rw.reporting_work_time < #{selectTime2}
			AND rw.reviewed_state >= 0
			GROUP BY
			rw.reporting_work_id,
			rw.process_id,
			rw.this_process,
			rw.teams_groups_name,
			rwd.order_number,
			CASE WHEN bd.nickname IS NULL THEN rwd.technology_number ELSE NULL END
			ORDER BY rw.process_id,
			rw.this_process, rw.teams_groups_name, rwd.order_number,
			CASE WHEN bd.nickname IS NULL THEN rwd.technology_number ELSE NULL END
			) as tb
			GROUP BY tb.process
			) as rw
			left join
			(
			select dd.responsible_process,sum(dd.breakage_quantity) as breakageQuantity
			,ROUND(SUM((rwd.child_width) * (rwd.child_height) * dd.breakage_quantity / 1000000), 2) as breakageArea
			from reporting_work rw left join damage_details dd on dd.reporting_work_id = rw.reporting_work_id
			LEFT JOIN reporting_work_detail rwd on rwd.reporting_work_id = dd.reporting_work_id and rwd.order_number = dd.order_number and rwd.technology_number = dd.technology_number
			where rw.reporting_work_time >= #{selectTime1}
			AND rw.reporting_work_time < #{selectTime2}
			AND rw.reviewed_state >= 0 and dd.available =0
			GROUP BY dd.responsible_process
			) as dd on rw.this_process = dd.responsible_process


			</select>