ERP_override.git

			@@ -23,6 +23,7 @@
			<result property="wornArea" column="wornArea"/>
			<result property="qualityInspector" column="quality_inspector"/>
			<result property="qualityInsTime" column="quality_ins_time"/>
			<result property="notes" column="notes"/>

			<association property="order" javaType="com.example.erp.entity.sd.Order">
			<result property="customerId" column="customer_id"/>
			@@ -87,6 +88,7 @@
			left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id and rwd.technology_number=fc.technology_number
			where fc.process_id = #{processIdStr}
			and fc.technology_number = #{technologyStr}
			and if(#{reportType}=1,o.order_type!='样品订单',o.order_id!='')
			GROUP BY fc.process_id
			</select>

			@@ -165,11 +167,13 @@
			on patch.process_id = fc.process_id
			and patch.order_sort = fc.order_number
			and patch.technology_number = fc.technology_number
			left join sd.`order` as o on o.order_id=od.order_id

			WHERE
			fc.process_id = #{processIdStr}
			AND fc.technology_number = #{technologyStr}
			AND odpd.process = #{process}
			and if(#{reportType}=1,o.order_type!='样品订单',o.order_id!='')
			order by fc.order_number
			</select>

			@@ -195,7 +199,7 @@
			ogd.`group`,
			if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 判断是否已经完成，已经完成不序号和同序号数量相同才能提交
			od.other_columns,
			ogd.id
			ogd.id as 'glassId'

			FROM
			sd.order_detail AS od
			@@ -507,7 +511,8 @@
			round(ogd.area * rw.this_worn_quantity,2) as wornArea,
			rw.device_name,
			rw.teams_groups_name,
			rw.reviewed_state
			rw.reviewed_state,
			rw.notes
			# (IF(rw.reviewed_state = 0, '未审核', IF(rw.reviewed_state = 1, '审核通过', '审核不通过'))) as reviewed_state
			from sd.order as o
			left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id