ERP_override.git

			@@ -128,6 +128,7 @@
			<result column="examine_time" property="examineTime"/>
			<result column="workProcessName" property="workProcessName"/>
			<result column="device_name" property="deviceName"/>
			<result column="order_type" property="orderType"/>
			</resultMap>

			<resultMap id="scheduleProductionScheduleMap" type="com.example.erp.dto.pp.ScheduleProductionScheduleDTO">
			@@ -168,21 +169,35 @@
			b.glass_child,
			d.order_type,
			concat(c.process_id, '/', c.technology_number) as process_id,
			c.order_id,
			c.order_number,
			c.technology_number,
			b.child_width,
			b.child_height,
			c.quantity,
			if(c.technology_number=1,c.quantity,0) as quantity,
			# c.quantity,
			c.quantity as thisQuantity,/用于判断是否改变颜色/
			e.reportWorkQuantity,
			e.reportWorkQuantityCount,
			e.reportWorkTime,
			e.broken_num,
			c.quantity*a.area as gross_area,
			ifnull(f.inventory, 0) as inventory,
			round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
			ifnull(dd.quantity, 0) as shippedQuantity,
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber
			from flow_card as c
			c.quantity as glassQuantity,

			# c.quantity*a.area as gross_area,
			# ifnull(f.inventory, 0) as inventory,
			# round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
			# ifnull(dd.quantity, 0) as shippedQuantity,

			if(c.technology_number=1,c.quantity*a.area,0) as gross_area,
			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,ifnull(dd.quantity, 0) ,0) as shippedQuantity,


			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
			@@ -201,7 +216,7 @@
			technology_number,
			sum(a.broken_num) as broken_num,
			concat('{',
			GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
			GROUP_CONCAT(concat("\"", process, "\":\"", if(technology_number!=1 and (bd.nickname='stepD' \|\| bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),
			'}'
			) as reportWorkQuantity,
			concat('{',
			@@ -213,8 +228,13 @@
			'}'
			) 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
			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
			@@ -879,12 +899,14 @@
			left join sd.`order` as o on o.order_id = a.order_id
			where o.create_time >= #{selectTime1}
			AND o.create_time < #{selectTime2}
			and position(#{orderId} in o.order_id)
			GROUP BY process_id, a.technology_number) as e
			on e.process_id = c.process_id
			and e.technology_number = c.technology_number
			left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
			where d.create_time >= #{selectTime1}
			AND d.create_time < #{selectTime2}
			and position(#{orderId} in a.order_id)
			and d.create_order>0
			and reportWorkQuantity is not null
			GROUP BY a.order_id
			@@ -1351,6 +1373,7 @@
			rw.reviewed,
			rw.examine_time,
			rw.device_name,
			o.order_type,
			-- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
			CASE
			WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
			@@ -2024,6 +2047,15 @@
			<if test="workInProgressDTO.processId != null and workInProgressDTO.processId != ''">
			and fc.process_id regexp #{workInProgressDTO.processId}
			</if>
			<if test="workInProgressDTO.orderNumber != null and workInProgressDTO.orderNumber != ''">
			and ogd.order_number regexp #{workInProgressDTO.orderNumber}
			</if>
			<if test="workInProgressDTO.technologyNumber != null and workInProgressDTO.technologyNumber != ''">
			and ogd.technology_number regexp #{workInProgressDTO.technologyNumber}
			</if>
			<if test="workInProgressDTO.glassNumber != null and workInProgressDTO.glassNumber != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{workInProgressDTO.glassNumber}
			</if>

			group by fc.process_id, fc.order_number, fc.technology_number,d.process
			) as aa
			@@ -2059,8 +2091,8 @@
			and odpd.process = #{selectProcesses}
			and o.create_time >= #{selectTime1}
			AND o.create_time < #{selectTime2}
			AND POSITION('' IN od.order_id)
			AND POSITION('' IN o.project)
			and position(#{orderId} in od.order_id)
			and position(#{inputProject} in o.project)
			AND fc.quantity - odpd.reporting_work_num > 0;

			</select>
			@@ -2655,7 +2687,7 @@
			e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num as quantity,
			(e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)*f.area as glassArea
			from (SELECT a.order_id,
			a.project,
			if(a.batch!="",CONCAT(a.project,'(',a.batch,')'),a.project) as project,
			C.product_id,
			b.order_number,
			b.process_id,