ERP_override.git

			@@ -64,6 +64,7 @@
			<result column="product_name" property="productName"/>
			<result column="product_id" property="productId"/>
			<result column="warehouse_num" property="warehouseNum"/>
			<result column="delivery_num" property="deliveryNum"/>

			<result column="order_number" property="deliveryDetail.orderNumber"/>
			<result column="delivery_id" property="deliveryDetail.deliveryId"/>
			@@ -208,7 +209,8 @@
			</select>

			<select id="getSelectAllocatePageTotal" >
			select CEILING(count(zu.order_number)/#{pageSize}) from
			select CEILING(count(zu.order_number)/#{pageSize}) as 'pageTotal',
			count(zu.order_number) as 'total' from
			(select fgi.order_number as order_number
			from mm.finished_goods_inventory fgi
			left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
			@@ -263,7 +265,7 @@
			<update id="updateDeliveryDetailState">
			update sd.delivery_detail
			set delivery_detail_state=#{state}
			where order_number=#{orderDetail.deliveryDetail.orderNumber} and order_id=#{orderDetail.deliveryDetail.orderId}
			where order_number=#{orderDetail.deliveryDetail.orderNumber} and order_id=#{orderDetail.deliveryDetail.orderId} and delivery_id=#{orderDetail.deliveryDetail.deliveryId}
			</update>

			<update id="updateInventoryquantityavailable">
			@@ -274,13 +276,15 @@
			</update>


			<select id="getseletdeliveryDetailPageTotal" >
			select CEILING(count(dd.id)/#{pageSize})
			<select id="getSelectDeliveryDetailPageTotal" >
			select CEILING(count(dd.id)/#{pageSize}) as 'pageTotal',
			count(dd.id) as 'total'
			from sd.delivery_detail dd
			left join sd.delivery d on dd.delivery_id = d.delivery_id
			left join sd.order_detail od on od.order_id = dd.order_id and dd.order_number = od.order_number
			left join sd.`order` o on o.order_id = dd.order_id
			<where>
			and dd.delivery_detail_state=1
			<if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
			and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
			</if>
			@@ -335,7 +339,7 @@
			limit #{offset},#{pageSize};
			</select>

			<select id="getseletdeliveryDetail" resultMap="selectDelivery">
			<select id="getSelectDeliveryDetail" resultMap="selectDelivery">
			select dd.delivery_id,
			dd.order_number,
			dd.order_id,
			@@ -347,6 +351,7 @@
			od.height,
			d.quantity,
			od.warehouse_num,
			od.delivery_num,
			d.area,
			od.building_number,
			d.creator,
			@@ -355,9 +360,10 @@
			from sd.delivery_detail dd
			left join sd.delivery d on dd.delivery_id = d.delivery_id
			left join sd.order_detail od on od.order_id = dd.order_id and dd.order_number = od.order_number
			left join sd.`order` o on o.order_id = dd.order_id where dd.delivery_detail_state=1
			left join sd.`order` o on o.order_id = dd.order_id

			<where>
			and dd.delivery_detail_state=1
			<if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
			and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
			</if>
			@@ -421,6 +427,14 @@
			select sum(warehouse_num) from sd.order_detail where order_id=#{orderId}
			</select>

			<select id="findDeliveryQuantity" >
			select quantity from sd.`delivery` where delivery_id=#{deliveryId}
			</select>

			<select id="findDeliverydetailsum" >
			select sum(quantity) from sd.`delivery_detail` where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}
			</select>

			<update id="updateOrderWarehousingState">
			update sd.`order`
			set warehousing=#{state}
			@@ -431,6 +445,12 @@
			update sd.`order`
			set delivery=#{state}
			where order_id=#{orderId}
			</update>

			<update id="updateDeliveryDeliveryState">
			update sd.`delivery`
			set stock_state=#{state}
			where delivery_id=#{deliveryId}
			</update>

			<update id="updateIntOrderNumberConut">
			@@ -447,7 +467,7 @@

			<update id="updateflowcard">
			update pp.flow_card
			set received_quantity=received_quantity+${inventoryQuantity}
			set received_quantity=received_quantity+${inventoryQuantity},storage_time=now()
			where order_number=#{orderNumber} and process_id=#{processId} and order_id=#{order.orderId}
			</update>

			@@ -502,7 +522,7 @@
			</select>


			<select id="getseletwarehousing" resultMap="selectFlowCard">
			<select id="getSelectWarehousing" resultMap="selectFlowCard">
			select
			fc.id,
			o.order_id,
			@@ -574,8 +594,10 @@
			group by fc.order_id,fc.order_number,fc.process_id order by fc.create_time
			limit #{offset},#{pageSize};
			</select>
			<select id="getseletwarehousingPageTotal" >
			select CEILING(count(zu.order_number)/#{pageSize}) from (
			<select id="getSelectWarehousingPageTotal" >
			select
			CEILING(count(zu.order_number)/#{pageSize}) as 'pageTotal',
			count(zu.order_number) as 'total' from (
			select fc.order_number as order_number,fc.process_id from pp.flow_card fc left join sd.order_detail od on
			fc.order_id=od.order_id and fc.order_number=od.order_number inner join sd.`order` o on o.order_id=fc.order_id
			<where>
			@@ -717,14 +739,14 @@
			</where>
			order by fgi.id

			limit #{offset},#{pageSize}
			;
			limit #{offset},#{pageSize};
			</select>


			<select id="getPageTotal">
			select
			CEILING(count(fgi.id)/#{pageSize})
			CEILING(count(fgi.id)/#{pageSize}) as 'pageTotal',
			count(fgi.id) as 'total'
			from finished_goods_inventory fgi
			left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
			left join sd.`order` o on fgi.order_id = o.order_id