ERP_override.git

			@@ -71,6 +71,9 @@
			<if test="finishedOperateLog.quantity != null and finishedOperateLog.quantity != ''">
			and fol.quantity regexp #{finishedOperateLog.quantity}
			</if>
			<if test="finishedOperateLog.processId != null and finishedOperateLog.processId != ''">
			and fol.process_id regexp #{finishedOperateLog.processId}
			</if>
			<if test="finishedOperateLog.operator != null and finishedOperateLog.operator != ''">
			and fol.operator regexp #{finishedOperateLog.operator}
			</if>
			@@ -845,4 +848,31 @@
			fol.operate_time DESC

			</select>

			<select id="getSelectStorageRecordDeliveryId" resultMap="selectFinishedGoodsInventory">
			select fol.id,
			fol.operation_order_number,
			fol.order_id,
			fol.operate_type,
			fol.process_id,
			fol.operation_number,
			fol.quantity,
			fol.operator,
			od.product_id,
			od.product_name,
			od.width,
			od.height,
			fol.operate_time,
			fol.`status`,
			fol.is_state,
			fol.reviewed,
			fol.reviewed_time,
			fol.type,
			fol.remarks
			from (select *
			from mm.finished_operate_log aa where aa.operate_type = #{type} and aa.status!='已作废') fol
			left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
			left join sd.`order` o on o.order_id=fol.order_id
			where fol.operation_order_number=#{deliveryId}
			</select>
			</mapper>