ERP_override.git

			@@ -484,7 +484,7 @@
			</select>

			<select id="selectPrintFlowCard">
			select project_no,glass_total,glass_total_area
			select project_no,glass_total,glass_total_area,labelPrintNum,processPrintNum
			from pp.optimize_project
			where date(create_time)>=#{selectTime1} and date(create_time) <= #{selectTime2}
			and state >= 20
			@@ -492,7 +492,7 @@
			</select>

			<select id="selectPrintMp">
			select *
			SELECT result.,fcc.print_status from ( select
			from ((select fc.id,
			fc.order_id,
			fc.process_id,
			@@ -507,7 +507,6 @@
			ogdss.concatenated_glass_child as glass_child,
			fc.founder,
			date(fc.splitFrame_time) as splitFrame_time,
			fc.print_status,
			processed_part as process

			from flow_card as fc
			@@ -549,7 +548,6 @@
			ogdss.concatenated_glass_child as glass_child,
			fc.founder,
			date(fc.splitFrame_time) as splitFrame_time,
			fc.print_status,
			processed_part as process

			from flow_card as fc
			@@ -587,7 +585,6 @@
			ogdss.concatenated_glass_child as glass_child,
			fc.founder,
			date(fc.splitFrame_time) as splitFrame_time,
			fc.print_status,
			processed_part as process

			from flow_card as fc
			@@ -618,7 +615,9 @@
			where process is not null
			and process != ""
			GROUP BY order_id, process_id, technology_number, process
			order by order_id, process_id, length(technology_number)
			order by order_id, process_id, length(technology_number)) as result
			LEFT JOIN (SELECT * from flow_card GROUP BY process_id,technology_number) as fcc
			on result.process_id = fcc.process_id and result.technology_number = fcc.technology_number
			</select>

			<select id="getPrimaryList">
			@@ -1140,7 +1139,19 @@
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S07')) AS remarks4,
			JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S08')) AS remarks5,
			p.remarks as filmNumber,
			od.bend_radius as bendRadius
			od.bend_radius as bendRadius,
			CONCAT(
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
			' = ',pl.patch_num ) as size,

			CONCAT(
			od.order_number,') ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
			' = ',pl.patch_num ) as numberSize
			from sd.order as o
			left join sd.order_detail as od on o.order_id = od.order_id
			left join flow_card as fc on o.order_id = fc.order_id and
			@@ -1151,6 +1162,7 @@
			left join sd.customer as c on c.id = o.customer_id
			left join sd.product_detail as pd on pd.prod_id = p.id and pd.sort_num = od.order_number
			where pl.process_id = #{processId}
			and pl.order_sort=#{orderNumber}
			and pl.technology_number = #{technologyNumber}
			and pl.reporting_work_id = #{reportingWorkId}
			group by od.order_number, width, height
			@@ -1925,7 +1937,19 @@
			od.bend_radius as bendRadius,
			ogd.glass_child as glassChild,
			ogd.glass_address as glassAddress,
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color')) AS color
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color')) AS color,
			CONCAT(
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
			' = ',pl.patch_num ) as size,

			CONCAT(
			od.order_number,') ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
			' = ',pl.patch_num ) as numberSize
			from sd.order as o
			left join sd.order_detail as od on o.order_id = od.order_id
			left join flow_card as fc on o.order_id = fc.order_id and
			@@ -1939,6 +1963,7 @@
			on ogd.order_id = o.order_id and ogd.order_number = od.order_number and
			ogd.technology_number = fc.technology_number
			where pl.process_id = #{processId}
			and pl.order_sort=#{orderNumber}
			and pl.technology_number = #{technologyNumber}
			and pl.reporting_work_id = #{reportingWorkId}
			group by od.order_number, width, height
			@@ -2647,4 +2672,22 @@
			GROUP BY fc.process_id, ogd.technology_number
			order by fc.process_id, ogd.technology_number
			</select>

			<update id="updateProjectLabelPrintCount">
			update optimize_project set labelPrintNum=labelPrintNum+1 where project_no=#{projectNo}
			</update>

			<select id="selectProjectLabelPrintCount">
			select labelPrintNum from optimize_project where project_no=#{projectNo}
			</select>

			<update id="updateProjectProcessPrintCount">
			update optimize_project set processPrintNum=processPrintNum+1 where project_no=#{projectNo}
			</update>

			<select id="selectProjectProcessPrintCount">
			select processPrintNum from optimize_project where project_no=#{projectNo}
			</select>


			</mapper>