ERP_override.git

			@@ -7,7 +7,7 @@
			<resultMap id="reworkAdd" type="com.example.erp.entity.pp.ReportingWorkDetail">
			<id column="id" property="id"/>
			<result column="rework_team" property="reworkTeam"/>
			<result column="breakage_number" property="breakageNumber"/>
			<result column="breakage_quantity" property="breakageQuantity"/>
			<result column="return_process" property="returnProcess"/>
			<result column="breakage_reason" property="breakageReason"/>
			<result column="responsible_equipment" property="responsibleEquipment"/>
			@@ -79,6 +79,9 @@
			<result column="child_height" property="childHeight"/>
			<result column="child_width" property="childWidth"/>

			</association>
			<association property="OrderProcessDetail" javaType="com.example.erp.entity.sd.OrderProcessDetail">
			<result column="reporting_work_num" property="reportingWorkNum"/>
			</association>


			@@ -154,13 +157,21 @@
			</select>



			<!--查询detail明细-->
			<select id="reportingWorkId">
			select * from reporting_work_detail
			where reporting_work_id = #{reportingWorkId}
			</select>


			<select id="selectInventory">
			select reporting_work_num
			FROM sd.order_process_detail as opd
			where opd.process_id = #{processId}
			and opd.order_number = #{orderNumber}
			and opd.technology_number = #{technologyNumber}
			and opd.process = '包装'
			</select>
			<!--<where>

			create_time <![CDATA[>=]]> #{startTime} and create_time <![CDATA[<=]]> #{endTime}}
			@@ -251,4 +262,6 @@
			`b`.`available` = 1)
			</select>-->



			</mapper>