ERP_override.git

			@@ -37,7 +37,7 @@
			</update>

			<update id="updatedelivery">
			update sd.delivery set area=#{area},quantity=#{quantity},money=#{money} where delivery_id=#{oddNumber}
			update sd.delivery set area=#{area},quantity=#{quantity},money=#{money},other_money=#{otherMoney} where delivery_id=#{oddNumber}
			</update>


			@@ -216,6 +216,19 @@
			</where>
			</select>

			<select id="getSelectShippingOrderDetailPrinting" >
			select
			d.order_id,d.quantity,round(d.money,0) as money ,d.area,d.project,
			d.customer_id,d.customer_name,d.creator,d.salesman,d.salesman_id
			from sd.`order` d
			<where>
			<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
			and d.order_id like concat('%',#{orderDetail.orderId},'%')
			</if>

			</where>
			</select>


			<select id="getSelectShippingOrderDetailDeliverys" >
			select customer_id,customer_name,project,salesman,salesman_id,contacts,contact_number,delivery_address from sd.`order`