ERP_override.git

			@@ -437,7 +437,7 @@
			</select>

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

			<update id="updateOrderWarehousingState">
			@@ -461,13 +461,19 @@

			<update id="updateIntOrderNumberConut">
			update sd.order_detail
			set warehouse_num=warehouse_num+${quantity}
			set warehouse_num=warehouse_num+${quantity},update_time=now()
			where order_number=#{orderNumber} and order_id=#{orderId}
			</update>

			<update id="updateOutOrderNumberConut">
			update sd.order_detail
			set warehouse_num=warehouse_num-${quantity}
			where order_number=#{orderNumber} and order_id=#{orderId}
			</update>

			<update id="updateOrderNumberConut">
			update sd.order_detail
			set warehouse_num=${quantity},update_time=now()
			where order_number=#{orderNumber} and order_id=#{orderId}
			</update>

			@@ -529,6 +535,13 @@

			<select id="findOrderNumberdcount" >
			select count(*)
			from mm.`finished_goods_inventory`
			where order_number = #{orderNumber} and order_id=#{orderId};

			</select>

			<select id="findOrderNumberd" >
			select *
			from mm.`finished_goods_inventory`
			where order_number = #{orderNumber} and order_id=#{orderId};

			@@ -837,6 +850,51 @@
			;
			</select>

			<select id="getSelectOrderDetail" >
			select * from sd.order_detail where order_id=#{orderId}
			</select>

			<insert id="insertOrderFinishedGoodsInventory" useGeneratedKeys="true" >
			insert into mm.finished_goods_inventory (order_id,
			order_number,
			process_id,
			inventory,
			actual_signal_area,
			area,
			quantity_available,
			warehouse_number,
			storage_region,
			`status`,
			enter_storage_time,
			update_time,
			end_time,
			remark
			)
			values (
			#{orderDetail.orderId} ,#{orderDetail.orderNumber},"",#{orderDetail.quantity},#{orderDetail.computeArea},
			#{orderDetail.computeGrossArea},
			#{orderDetail.quantity},null,"",
			0,now(),now(),null,""
			)
			</insert>

			<update id="updateOrderInventory">
			update mm.finished_goods_inventory
			set inventory=${orderDetail.quantity},quantity_available=${orderDetail.quantity},
			update_time=now(),area=actual_signal_area*quantity_available
			where order_number=#{orderDetail.orderNumber} and order_id=#{orderDetail.orderId}
			</update>

			<select id="findFlowCard">
			select * from pp.flow_card
			where order_number=#{orderNumber} and process_id=#{processId} and order_id=#{order.orderId} group by process_id
			</select>

			<select id="findDeliverydetail">
			select * from sd.delivery_detail
			where order_number=#{orderNumber} and order_id=#{orderId} and delivery_id=#{deliveryId} and delivery_detail_state=0
			</select>