ERP_override.git

			@@ -169,6 +169,7 @@
			b.glass_child,
			d.order_type,
			concat(c.process_id, '/', c.technology_number) as process_id,
			c.process_id as 'processId',
			c.order_id,
			c.order_number,
			c.technology_number,
			@@ -185,15 +186,17 @@
			c.quantity-ifnull(c.termination_quantity,0) as glassQuantity,

			c.quantity-ifnull(c.termination_quantity,0) as quantityShow,
			(c.quantity-ifnull(c.termination_quantity,0))*a.area as grossAreaShow,
			ifnull(f.inventory, 0) as inventoryShow,
			round(ifnull(f.inventory, 0) * a.area, 2) as inventoryAreaShow,
			ifnull(dd.quantity, 0) as shippedQuantityShow,
			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,-- 入库面积

			if(c.technology_number=1,c.quantity*a.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.area, 2),0) as inventoryArea,
			if(c.technology_number=1, round((c.quantity-ifnull(c.termination_quantity,0))*a.compute_area,2),0) as grossArea,
			if(c.technology_number=1,ifnull(c.received_quantity, 0) ,0) as Storage,
			if(c.technology_number=1,ifnull(dd.quantity, 0) ,0) as shippedQuantity,
			if(c.technology_number=1,round(ifnull(dd.quantity, 0)*a.compute_area,2),0) as shippedArea,
			if(c.technology_number=1, round((ifnull(c.received_quantity, 0))*a.compute_area,2),0) as StorageArea,


			ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber,
			@@ -210,8 +213,8 @@
			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 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,
			@@ -2198,6 +2201,9 @@
			<if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
			and od.edging_type regexp #{teamOutputDTO.edgingType}
			</if>
			<if test="teamOutputDTO.deviceName != null and teamOutputDTO.deviceName != ''">
			and rw.device_name regexp #{teamOutputDTO.deviceName}
			</if>
			<choose>
			<when test="laminating == ''">
			GROUP BY
			@@ -2760,6 +2766,7 @@
			where
			e.id is not null
			and (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)>0 group by f.process_id, f.order_number,
			f.technology_number ORDER BY f.process_id, f.order_number,
			f.technology_number) as g
			<choose>
			<when test="laminating == 'stepC' and process == '预压'">
			@@ -2999,4 +3006,93 @@
			order by a.process_id

			</select>

			<select id="processCardProgressReportMp">
			select a.product_name,
			b.glass_child,
			d.order_type,
			concat(c.process_id, '/', c.technology_number) as process_id,
			c.process_id as 'processId',
			c.order_id,
			c.order_number,
			c.technology_number,
			b.child_width,
			b.child_height,
			c.quantity,
			c.quantity-ifnull(c.termination_quantity,0) as thisQuantity,/用于判断是否改变颜色/
			e.reportWorkQuantity,
			e.reportWorkQuantityShow,
			e.reportWorkQuantityCount,
			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,


			ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber,
			b.`group`

			from pp.flow_card as c
			left join
			sd.order_detail as a
			on c.order_id = a.order_id
			and c.order_number = a.order_number
			left join sd.order_glass_detail as b
			on c.order_id = b.order_id
			and b.order_number = c.order_number
			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


			) 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
			order by c.process_id, c.order_number, c.technology_number
			</select>
			</mapper>