ERP_override.git

			@@ -43,17 +43,15 @@
			</select>

			<select id="SelectWorkBasicDeviceMp">
			select *
			from basic_data_produce as a
			where a.basic_category = #{process}
			and a.basic_type = '设备'
			SELECT bdp.id,bdp.basic_type,bdp.basic_name, bd.basic_name as basic_category FROM sd.basic_data as bd left join `basic_data_produce` as bdp
			on bd.id=bdp.basic_category
			where bd.basic_category="process" and bdp.basic_type="device" and bd.basic_name = #{process}
			</select>

			<select id="SelectWorkBasicTeamsMp">
			select *
			from basic_data_produce as a
			where a.basic_category = #{process}
			and a.basic_type = '班组'
			SELECT bdp.id,bdp.basic_type,bdp.basic_name, bd.basic_name as basic_category FROM sd.basic_data as bd left join `basic_data_produce` as bdp
			on bd.id=bdp.basic_category
			where bd.basic_category="process" and bdp.basic_type="teamsgroups" and bd.basic_name = #{process}
			</select>

			<!-- 查询流程卡工艺流程-->
			@@ -82,7 +80,7 @@
			ogd.child_width,
			ogd.child_height,
			od.shape,
			fc.quantity - IFNULL(fc.number_patches,0)-IFNULL(rwd.completed_quantity,0)-IFNULL(rwd.breakage_quantity,0)-IFNULL((rwd.breakage_quantity-rwd.rework_quantity),0)
			fc.quantity - IFNULL(fc.number_patches,0)-IFNULL(rwd.completed_quantity,0)-IFNULL(rwd.breakage_quantity,0)-IFNULL((rwd.wait_rework_quantity),0)
			as quantity
			FROM
			sd.order_detail AS od
			@@ -111,7 +109,7 @@
			ogd.child_width,
			ogd.child_height,
			od.shape,
			reportingwork_num -IFNULL(rwd.completed_quantity,0)-IFNULL(rwd.breakage_quantity,0)-IFNULL((rwd.breakage_quantity-rwd.rework_quantity),0) as quantity
			reportingwork_num -IFNULL(rwd.completed_quantity,0)-IFNULL(rwd.breakage_quantity,0)-IFNULL((rwd.wait_rework_quantity),0) as quantity
			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