ERP_override.git

			@@ -28,6 +28,10 @@

			</resultMap>

			<update id="updateToExamine">
			update mm.finished_operate_log set reviewed=#{userName},reviewed_time=now(),status=#{type} where operation_order_number=#{finishedOperateLog.operationOrderNumber};
			</update>

			<select id="getSelectOperateRecord" resultMap="selectFinishedGoodsInventory">
			select fol.operation_order_number,
			fol.order_id,
			@@ -49,6 +53,7 @@
			from mm.finished_operate_log aa where aa.operate_type = '领出' or aa.operate_type = '返工') fol
			left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
			<where>
			date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
			<if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
			and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
			</if>
			@@ -71,10 +76,10 @@
			and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
			</if>
			<if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
			and od.width regexp #{finishedOperateLog.orderDetail.width}
			and od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
			</if>
			<if test="finishedOperateLog.orderDetail.height != null and finishedOperateLog.orderDetail.height != ''">
			and od.height regexp #{finishedOperateLog.orderDetail.height}
			and od.height regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.height},'\\.0+$','')
			</if>
			<if test="finishedOperateLog.operateTime != null and finishedOperateLog.operateTime != ''">
			and fol.operate_time regexp #{finishedOperateLog.operateTime}
			@@ -95,16 +100,18 @@
			and fol.remarks regexp #{finishedOperateLog.remarksr}
			</if>
			</where>

			order by fol.`status` desc
			limit #{offset},#{pageSize};
			</select>

			<select id="getSelectOperateRecordLogPageTotal" >
			select CEILING(count(fol.id)/#{pageSize})
			select CEILING(count(fol.id)/#{pageSize}) as 'pageTotal',
			count(fol.id) as 'total'
			from (select *
			from mm.finished_operate_log aa where aa.operate_type = '领出' or aa.operate_type = '返工') fol
			left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
			<where>
			date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
			<if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
			and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
			</if>
			@@ -127,10 +134,10 @@
			and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
			</if>
			<if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
			and od.width regexp #{finishedOperateLog.orderDetail.width}
			and od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
			</if>
			<if test="finishedOperateLog.orderDetail.height != null and finishedOperateLog.orderDetail.height != ''">
			and od.height regexp #{finishedOperateLog.orderDetail.height}
			and od.height regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.height},'\\.0+$','')
			</if>
			<if test="finishedOperateLog.operateTime != null and finishedOperateLog.operateTime != ''">
			and fol.operate_time regexp #{finishedOperateLog.operateTime}
			@@ -151,6 +158,7 @@
			and fol.remarks regexp #{finishedOperateLog.remarksr}
			</if>
			</where>
			order by fol.`status` desc
			limit #{offset},#{pageSize};
			</select>

			@@ -171,6 +179,7 @@
			from mm.finished_operate_log aa where aa.operate_type = '调拨') fol
			left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
			<where>
			date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
			<if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
			and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
			</if>
			@@ -199,10 +208,10 @@
			and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
			</if>
			<if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
			and od.width regexp #{finishedOperateLog.orderDetail.width}
			and od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
			</if>
			<if test="finishedOperateLog.orderDetail.height != null and finishedOperateLog.orderDetail.height != ''">
			and od.height regexp #{finishedOperateLog.orderDetail.height}
			and od.height regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.height},'\\.0+$','')
			</if>
			<if test="finishedOperateLog.operateTime != null and finishedOperateLog.operateTime != ''">
			and fol.operate_time regexp #{finishedOperateLog.operateTime}
			@@ -212,10 +221,50 @@
			</select>

			<select id="getselectAllocateFinishedOperateLogPageTotal" >
			select CEILING(count(fol.id)/#{pageSize})
			select CEILING(count(fol.id)/#{pageSize}) as 'pageTotal',
			count(fol.id) as 'total'
			from (select *
			from mm.finished_operate_log aa where aa.operate_type = '调拨') fol
			left join sd.order_detail od on fol.order_id = od.order_id and fol.end_operation_order_number = od.order_number
			<where>
			date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
			<if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
			and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
			</if>
			<if test="finishedOperateLog.orderId != null and finishedOperateLog.orderId != ''">
			and fol.order_id regexp #{finishedOperateLog.orderId}
			</if>
			<if test="finishedOperateLog.operationNumber != null and finishedOperateLog.operationNumber != ''">
			and fol.operation_number regexp #{finishedOperateLog.operationNumber}
			</if>
			<if test="finishedOperateLog.staterOperationOrderNumber != null and finishedOperateLog.staterOperationOrderNumber != ''">
			and fol.stater_operation_order_number regexp #{finishedOperateLog.staterOperationOrderNumber}
			</if>
			<if test="finishedOperateLog.endOperationOrderNumber != null and finishedOperateLog.endOperationOrderNumber != ''">
			and fol.end_operation_order_number regexp #{finishedOperateLog.endOperationOrderNumber}
			</if>
			<if test="finishedOperateLog.quantity != null and finishedOperateLog.quantity != ''">
			and fol.quantity regexp #{finishedOperateLog.quantity}
			</if>
			<if test="finishedOperateLog.operator != null and finishedOperateLog.operator != ''">
			and fol.operator regexp #{finishedOperateLog.operator}
			</if>
			<if test="finishedOperateLog.orderDetail.productId != null and finishedOperateLog.orderDetail.productId != ''">
			and od.product_id regexp #{finishedOperateLog.orderDetail.productId}
			</if>
			<if test="finishedOperateLog.orderDetail.productName != null and finishedOperateLog.orderDetail.productName != ''">
			and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
			</if>
			<if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
			and od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
			</if>
			<if test="finishedOperateLog.orderDetail.height != null and finishedOperateLog.orderDetail.height != ''">
			and od.height regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.height},'\\.0+$','')
			</if>
			<if test="finishedOperateLog.operateTime != null and finishedOperateLog.operateTime != ''">
			and fol.operate_time regexp #{finishedOperateLog.operateTime}
			</if>
			</where>
			limit #{offset},#{pageSize};
			</select>

			@@ -256,7 +305,7 @@
			operate_time
			)
			values (
			#{orderDetail.deliveryDetail.deliveryId} ,#{orderDetail.deliveryDetail.order_id},#{orderDetail.deliveryDetail.orderNumber}
			#{orderDetail.deliveryDetail.deliveryId} ,#{orderDetail.deliveryDetail.orderId},#{orderDetail.deliveryDetail.orderNumber}
			,"出库",#{userName},#{orderDetail.warehouseNum},now()
			)
			</insert>
			@@ -279,6 +328,24 @@
			)
			</insert>

			<insert id="insertFinishedOperateLogRework" useGeneratedKeys="true" >
			insert into mm.finished_operate_log(operation_order_number,
			order_id,
			operation_number,
			operate_type,
			operator,
			quantity,
			operate_time,
			status,
			type,
			remarks
			)
			values (
			#{oddNumber} ,#{orderDetail.finishedGoodsInventory.orderId},#{orderDetail.finishedGoodsInventory.orderNumber}
			,"返工",#{userName},#{orderDetail.quantity},now(),"未审核",#{operateType},#{remarks}
			)
			</insert>

			<insert id="insertFinishedOperateLogAllocate" useGeneratedKeys="true" >
			insert into mm.finished_operate_log(operation_order_number,
			order_id,