ERP_override.git

			@@ -28,6 +28,10 @@
			<result column="quantity_available" property="finishedGoodsInventory.quantityAvailable"/>
			</resultMap>


			<delete id="deleteDelivery">
			delete from sd.delivery where delivery_id=#{deliveryId}
			</delete>
			<update id="updateDeliveryToExamine">
			update sd.delivery set delivery_state=#{deliveryState} where delivery_id=#{deliveryId}
			</update>
			@@ -198,6 +202,20 @@
			limit 0,1
			</select>

			<select id="getSelectShippingOrderDetailDeliveryPrinting" >
			select
			d.delivery_id,d.quantity,d.money,d.area,d.project,
			d.customer_id,d.customer_name,d.project,d.pay_method,d.pay_date,d.contacts,d.contact_number,
			d.delivery_address,d.remarks,d.create_time,d.delivery_date,d.creator,d.salesman,d.salesman_id
			from sd.delivery d
			<where>
			<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
			and d.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
			</if>

			</where>
			</select>


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