ERP_override.git

			@@ -92,6 +92,7 @@
			<result column="area" property="area"/>
			<result column="breakage_quantity" property="breakageQuantity"/>
			<result column="project" property="project"/>
			<result column="batch" property="batch"/>
			<result column="process_id" property="processId"/>
			<result column="order_number" property="orderNumber"/>
			<result column="technology_number" property="technologyNumber"/>
			@@ -566,6 +567,7 @@
			SELECT
			o.order_id,
			o.project,
			o.batch,
			rw.process_id,
			dd.order_number,
			dd.technology_number,
			@@ -594,7 +596,7 @@
			rw.reporting_work_time >= #{selectTime1}
			AND rw.reporting_work_time < #{selectTime2}

			AND dd.available = 0
			AND dd.available = 0 and rw.reviewed_state>=0
			<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
			and o.order_id regexp #{damageReportDTO.orderId}
			</if>
			@@ -995,6 +997,7 @@
			<select id="exportDamageReportMp">
			SELECT o.order_id,
			o.project,
			o.batch,
			rw.process_id,
			dd.order_number,
			dd.technology_number,
			@@ -1018,7 +1021,7 @@
			AND dd.technology_number = ogd.technology_number
			WHERE rw.reporting_work_time >= #{dates[0]}
			and rw.reporting_work_time <= #{dates[1]}
			AND dd.available = 0
			AND dd.available = 0 and rw.reviewed_state>=0
			GROUP BY dd.id
			</select>

			@@ -1433,6 +1436,7 @@
			rw.reviewed,
			rw.examine_time,
			rw.device_name,
			-- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
			CASE
			WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
			ELSE MAX( ogd.glass_child )
			@@ -1444,9 +1448,9 @@
			left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number and ogd.technology_number=fc.technology_number
			left join sd.order_detail as od on od.order_id=ogd.order_id and od.order_number=ogd.order_number
			left join sd.`order` as o on o.order_id=od.order_id
			where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0
			and date(rw.reporting_work_time) >= #{date[0]}
			and date(rw.reporting_work_time) <= #{date[1]}
			where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and
			rw.reporting_work_time >= #{date[0]}
			AND rw.reporting_work_time < #{date[1]}
			and position(#{process} in rw.this_process)
			<choose>
			<when test="laminating == ''">
			@@ -1936,7 +1940,7 @@
			sum(aa.stockNum) AS stockNum,
			SUM(aa.stockArea) AS stockArea,
			count(* ) AS 'total',
			CEILING( count(* )/100 ) AS 'pageTotal'
			CEILING( count(* )/#{pageSize} ) AS 'pageTotal'
			from
			(
			SELECT (od.quantity) AS quantity,
			@@ -2546,4 +2550,161 @@
			order by d.process
			limit #{offset},#{pageSize};
			</select>

			<select id="workInProgressCombinationOrderFootSum">
			SELECT SUM(aa.quantity) AS quantity,
			sum(aa.stockNum) AS stockNum,
			SUM(aa.stockArea) AS stockArea,
			count(* ) AS 'total',
			CEILING( count(* )/#{pageSize} ) AS 'pageTotal'
			from
			(
			SELECT (od.quantity) AS quantity,
			d.numCounts + d.patchNumSum - d.numCount -d.broken_num as stockNum,
			ROUND(ogd.child_width * ogd.child_height *
			(d.numCounts + d.patchNumSum - d.numCount -
			d.broken_num) / 1000000, 2) as stockArea
			FROM
			sd.order_detail AS od
			LEFT JOIN sd.order_glass_detail AS ogd
			ON od.order_id = ogd.order_id
			AND od.order_number = ogd.order_number
			LEFT JOIN pp.flow_card AS fc
			ON fc.order_id = ogd.order_id
			and fc.production_id = ogd.production_id
			AND fc.order_number = ogd.order_number
			AND fc.technology_number = ogd.technology_number
			left join (
			SELECT
			odpd.process,
			odpd.process_id,
			odpd.order_number,
			odpd.technology_number,
			odpds.reporting_work_num_count as numCounts,
			ifnull( c.patchNumSum, 0 ) as patchNumSum,
			odpd.reporting_work_num_count as numCount,
			odpd.broken_num
			FROM
			sd.order_process_detail AS odpd
			LEFT JOIN sd.order_process_detail AS odpds ON odpds.id = odpd.id - 1
			LEFT JOIN (
			SELECT
			sum( rw.rework_num ) AS 'patchNumSum',
			rw.process_id,
			rw.order_sort,
			rw.technology_number,
			rwk.this_process
			FROM
			pp.rework AS rw
			LEFT JOIN pp.reporting_work AS rwk ON rw.reporting_work_id = rwk.reporting_work_id
			WHERE
			position( #{selectProcesses} IN rwk.this_process )
			AND rw.review_status >= 0
			GROUP BY
			rw.process_id,
			rw.order_sort,
			rw.technology_number
			) AS c ON c.process_id = odpd.process_id
			AND c.order_sort = odpd.order_number
			AND c.technology_number = odpd.technology_number
			WHERE
			position(#{selectProcesses} IN odpd.process ) and odpds.reporting_work_num_count is not null
			GROUP BY
			odpd.process_id,
			odpd.order_number,
			odpd.technology_number,
			odpd.process

			) as d
			on d.process_id=fc.process_id and d.order_number=fc.order_number and d.technology_number=fc.technology_number
			and position(#{selectProcesses} in d.process)
			left join sd.`order` as o on o.order_id=od.order_id
			where o.create_order>0
			and d.numCounts +d.patchNumSum - d.numCount - d.broken_num != 0
			and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
			and position(#{selectProcesses} in d.process)

			<if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
			and o.project regexp #{workInProgressDTO.project}
			</if>
			group by d.process
			) as aa
			</select>

			<select id="selectProcess">
			SELECT basic_name
			FROM sd.basic_data as bd
			where bd.basic_category = 'process'
			and bd.basic_type = 'product'
			and basic_name!='切割'
			</select>

			<select id="getWorkInProgressCombination">
			select
			#{process} as thisProcess,
			if(#{optionVal} = 1,'',h.project) as project,
			SUM(h.quantity) as stockNum,
			SUM(h.glassArea) as stockArea,
			if(#{optionVal} = 1,'',h.childName) as glassName

			from (

			SELECT g.*
			,GROUP_CONCAT(g.glass_child SEPARATOR '+') as childName
			from( SELECT f.*,
			e.reporting_work_num-f.reporting_work_num as quantity,
			(e.reporting_work_num-f.reporting_work_num)*f.area as glassArea
			from (SELECT a.order_id,
			a.project,
			C.product_id,
			b.order_number,
			b.process_id,
			b.technology_number,
			b.reporting_work_num,
			d.`group` ,
			b.id,
			c.area,
			d.glass_child

			FROM sd.`order` as a
			LEFT JOIN sd.order_process_detail as b
			on b.process = #{process} and a.order_id =b.order_id
			LEFT JOIN sd.order_detail as c
			on a.order_id = c.order_id and b.order_number =c.order_number
			left join sd.order_glass_detail as d
			on d.order_id =a.order_id and d.order_number = b.order_number and d.technology_number = b.technology_number
			where a.processing_card>0
			and a.warehousing!=2
			and (c.quantity-b.reporting_work_num)>0
			GROUP BY b.process_id, b.order_number,
			b.technology_number) as f
			LEFT JOIN sd.order_process_detail as e
			on e.id=(f.id-1) and e.process_id = f.process_id and e.order_number = f.order_number and e.technology_number =f.technology_number
			where
			e.id is not null
			and e.reporting_work_num-f.reporting_work_num>0 ) as g
			<choose>
			<when test="laminating == 'stepC'">
			GROUP BY g.process_id, g.order_number, g.`group`
			</when>
			<when test="laminating == 'stepD'">
			GROUP BY g.process_id, g.order_number
			</when>
			<otherwise>
			GROUP BY g.process_id, g.order_number, g.technology_number
			</otherwise>
			</choose>


			) as h
			<choose>
			<when test="optionVal == 1">
			GROUP BY thisProcess
			</when>
			<otherwise>
			GROUP BY h.project,h.childName
			</otherwise>
			</choose>

			</select>
			</mapper>