ERP_override.git

			@@ -45,6 +45,15 @@
			select count(*) from sd.delivery where date(create_time)=CURDATE()
			</select>

			<select id="getmaximumMonth">
			select
			ifnull(SUBSTR(max(delivery_id) from 7),0)
			from
			sd.delivery as a
			where
			date(a.create_time) BETWEEN DATE_FORMAT(DATE(NOW()), '%Y-%m-01') AND DATE(NOW())
			</select>

			<select id="getDeliveryConut" >
			select count(*) from sd.delivery where delivery_id=#{deliveryId}
			</select>
			@@ -53,13 +62,25 @@
			<insert id="insertDelivery" useGeneratedKeys="true" >
			insert into sd.delivery(delivery_state,stock_state,payment_terms,delivery_id,order_id,project,customer_id,customer_name,
			delivery_date,pay_method,pay_date,salesman_id,salesman,creator_id,creator,contacts,contact_number,delivery_address,
			area,quantity,money,remarks,create_time)
			area,quantity,money,remarks,create_time,freight,freight_price,freight_quantity)
			values (
			0,0,#{delivery.paymentTerms},#{number} ,#{orderId},#{delivery.project},#{delivery.customerId},#{delivery.customerName},#{delivery.deliveryDate},#{delivery.payMethod},
			#{delivery.payDate},#{delivery.salesmanId},#{delivery.salesman},#{delivery.creatorId},#{delivery.creator},#{delivery.contacts},#{delivery.contactNumber},#{delivery.deliveryAddress},
			0,0,0,#{delivery.remarks},now()
			0,0,0,#{delivery.remarks},now(),#{delivery.freightPrice}*#{delivery.freightQuantity},#{delivery.freightPrice},#{delivery.freightQuantity}
			)
			</insert>

			<update id="updateDelivery" >
			update sd.delivery set payment_terms=#{delivery.paymentTerms},
			delivery_date=#{delivery.deliveryDate},
			pay_method=#{delivery.payMethod},
			pay_date=#{delivery.payDate},contacts=#{delivery.creator},contact_number=#{delivery.contactNumber},
			delivery_address=#{delivery.deliveryAddress},
			freight=#{delivery.freightPrice}*#{delivery.freightQuantity},
			freight_price=#{delivery.freightPrice},
			freight_quantity=#{delivery.freightQuantity}
			where delivery_id=#{number}
			</update>

			<select id="getSelectOrderInventory" resultMap="selectOrderInventory">
			select o.create_order,
			@@ -85,7 +106,7 @@
			from sd.`order` o
			left join mm.finished_goods_inventory fgi on o.order_id = fgi.order_id
			<where>
			fgi.quantity_available > 0 and date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}
			fgi.quantity_available > 0 and date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate} and o.create_order>0
			<if test="order.orderId != null and order.orderId != ''">
			and o.order_id REGEXP #{order.orderId}
			</if>
			@@ -130,6 +151,10 @@
			limit #{offset},#{pageSize};
			</select>

			<select id="selectOrderId" >
			select * from sd.`order` where order_id=#{orderId}
			</select>

			<select id="getSelectOrderInventoryPageTotal" >
			select CEILING(count(zu.order_id)/#{pageSize}) as 'pageTotal',
			count(zu.order_id) as 'total' from
			@@ -139,7 +164,7 @@
			o.money,o.area,o.create_time,o.pack_type,o.order_type,o.creator
			from sd.`order` o left join mm.finished_goods_inventory fgi on o.order_id=fgi.order_id
			<where>
			fgi.quantity_available > 0 and date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}
			fgi.quantity_available > 0 and date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate} and o.create_order>0
			<if test="order.orderId != null and order.orderId != ''">
			and o.order_id REGEXP #{order.orderId}
			</if>
			@@ -191,7 +216,7 @@
			select
			d.delivery_state,d.stock_state,d.payment_terms,
			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
			d.delivery_address,d.remarks,d.create_time,d.delivery_date,d.creator,d.salesman,d.salesman_id,d.freight,d.freight_price,d.freight_quantity
			from sd.delivery d
			<where>
			<if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
			@@ -206,7 +231,7 @@
			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
			d.delivery_address,d.remarks,d.create_time,d.delivery_date,d.creator,d.salesman,d.salesman_id,d.freight,d.freight_price,d.freight_quantity
			from sd.delivery d
			<where>
			<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
			@@ -218,7 +243,7 @@

			<select id="getSelectShippingOrderDetailPrinting" >
			select
			d.order_id,d.quantity,d.money,d.area,d.project,
			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>
			@@ -242,7 +267,7 @@
			</select>

			<select id="getSelectShippingOrder">
			select * from sd.delivery d
			select * from sd.delivery d left join sd.delivery_detail dd on d.delivery_id=dd.delivery_id
			<where>
			date(d.create_time)>=#{startDate} and date(d.create_time) <= #{endDate}
			<if test="delivery.deliveryId != null and delivery.deliveryId != ''">
			@@ -264,7 +289,7 @@
			and d.project regexp #{delivery.project}
			</if>
			<if test="delivery.orderId != null and delivery.orderId != ''">
			and d.order_id regexp #{delivery.orderId}
			and dd.order_id regexp #{delivery.orderId}
			</if>
			<if test="delivery.payMethod != null and delivery.payMethod != ''">
			and d.pay_method regexp #{delivery.payMethod}
			@@ -277,6 +302,7 @@
			</if>

			</where>
			group by d.delivery_id
			order by d.id desc
			limit #{offset},#{pageSize};
			</select>
			@@ -321,4 +347,11 @@
			</where>
			limit #{offset},#{pageSize};
			</select>

			<update id="updateDeliveryPrintNumber">
			update sd.delivery
			set printing_number=printing_number+1
			where delivery_id = #{deliveryId}

			</update>
			</mapper>