ERP_override.git

			@@ -308,7 +308,7 @@
			<select id="reportingWorkCount">
			select COUNT(rw.process_id)
			from reporting_work as rw
			where rw.process_id = #{processId}
			where rw.process_id = #{processId} and reviewed_state>=0
			</select>
			<!-- 插入Flow_card表-->
			<insert id="addFlowCardMp">
			@@ -353,14 +353,14 @@
			<select id="selectFlowCount">
			select COUNT(*)
			from sd.order_glass_detail as ogd
			where ogd.order_id = left(#{productionId}, 10)
			where ogd.order_id = #{orderId}
			and ogd.splitting_status = 0
			</select>
			<!-- 修改订单表分架状态-->
			<update id="updateProcessingCard">
			update sd.`order` as o
			set o.processing_card=#{state}
			where o.order_id = left(#{productionId}, 10)
			where o.order_id = #{productionId}
			</update>

			<!-- 查询已排版数据-->
			@@ -650,7 +650,7 @@
			ogd.glass_child,
			GROUP_CONCAT(glass_child SEPARATOR ' ') AS concatenated_glass_child
			from sd.order_glass_detail as ogd
			where ogd.order_id = left(#{processId}, 10)
			where ogd.order_id = #{orderId}
			and position(ogd.technology_number in #{technologyNumber})
			GROUP BY order_id, order_number) as ogdc
			on ogdc.order_id = ogd.order_id and ogdc.order_number = ogd.order_number and
			@@ -1159,7 +1159,7 @@
			ogd.glass_child,
			GROUP_CONCAT(glass_child SEPARATOR ' ') AS concatenated_glass_child
			from sd.order_glass_detail as ogd
			where ogd.order_id = left(#{processId}, 10)
			where ogd.order_id = #{orderId}
			and position(ogd.technology_number in #{technologyNumber})
			GROUP BY order_id, order_number) as ogdc
			on ogdc.order_id = ogd.order_id and ogdc.order_number = ogd.order_number and
			@@ -1270,7 +1270,7 @@
			ogd.glass_child,
			GROUP_CONCAT(glass_child SEPARATOR ' ') AS concatenated_glass_child
			from sd.order_glass_detail as ogd
			where ogd.order_id = left(#{processId}, 10)
			where ogd.order_id = #{orderId}
			and ogd.order_number = #{orderNumber}
			and position(ogd.technology_number in #{technologyNumber})
			GROUP BY order_id, order_number) as ogdc
			@@ -1356,7 +1356,7 @@
			ogd.glass_child,
			GROUP_CONCAT(glass_child SEPARATOR ' ') AS concatenated_glass_child
			from sd.order_glass_detail as ogd
			where ogd.order_id = left(#{processId}, 10)
			where ogd.order_id = #{orderId}
			and ogd.order_number = #{orderNumber}
			and position(ogd.technology_number in #{technologyNumber})
			GROUP BY order_id, order_number) as ogdc
			@@ -1440,7 +1440,7 @@
			ogd.glass_child,
			GROUP_CONCAT(glass_child SEPARATOR ' ') AS concatenated_glass_child
			from sd.order_glass_detail as ogd
			where ogd.order_id = left(#{processId}, 10)
			where ogd.order_id = #{orderId}
			and ogd.order_number = #{orderNumber}
			and position(ogd.technology_number in #{technologyNumber})
			GROUP BY order_id, order_number) as ogdc
			@@ -1522,7 +1522,7 @@
			ogd.glass_child,
			GROUP_CONCAT(glass_child SEPARATOR ' ') AS concatenated_glass_child
			from sd.order_glass_detail as ogd
			where ogd.order_id = left(#{processId}, 10)
			where ogd.order_id = #{orderId}
			and ogd.order_number = #{orderNumber}
			and position(ogd.technology_number in #{technologyNumber})
			GROUP BY order_id, order_number) as ogdc
			@@ -1588,6 +1588,7 @@
			round(ogd.child_width) as width,
			round(ogd.child_height) as height,
			fc.quantity,
			CONCAT(round(ogd.child_width) , ' X ', round(ogd.child_height) ,' = ',fc.quantity ) as size,
			od.order_number as orderNumber,
			fc.technology_number as technologyNumber,
			od.building_number as buildingNumber,
			@@ -2006,7 +2007,7 @@
			ogd.glass_child,
			GROUP_CONCAT(glass_child SEPARATOR ' ') AS concatenated_glass_child
			from sd.order_glass_detail as ogd
			where ogd.order_id = left(#{processId}, 10)
			where ogd.order_id = #{orderId}
			and position(ogd.technology_number in #{technologyNumber})
			GROUP BY order_id, order_number) as ogdc
			on ogdc.order_id = ogd.order_id and ogdc.order_number = ogd.order_number and
			@@ -2100,6 +2101,11 @@
			width,
			height,
			#{printQuantity} as quantity,
			CONCAT(
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
			' = ',#{printQuantity} ) as size,
			od.order_number as orderNumber,
			fc.technology_number as technologyNumber,
			od.building_number as buildingNumber,
			@@ -2218,16 +2224,19 @@

			<select id="selectSortTableMp">
			select fcs.sort,
			process_id,
			fcs.process_id,
			fcs.order_number,
			fcs.technology_number,
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,
			fcs.process
			from flow_card_sort as fcs
			left join sd.order_detail as od
			on od.order_id = left(fcs.process_id, 10) and od.order_number = fcs.order_number
			where LEFT(fcs.process_id, 10) = #{orderId}
			GROUP BY process_id,
			from
			flow_card as fc
			left join flow_card_sort as fcs on fcs.process_id=fc.process_id
			and fcs.order_number=fc.order_number and fcs.technology_number=fc.technology_number
			left join sd.order_detail as od
			on od.order_id = fc.order_id and od.order_number = fcs.order_number
			where fc.order_id = #{orderId}
			GROUP BY fcs.process_id,
			fcs.order_number,
			fcs.technology_number,
			fcs.process