ERP_override.git

			@@ -54,6 +54,7 @@
			<result column="storage_region" property="finishedGoodsInventory.storageRegion"/>
			<result column="actual_signal_area" property="finishedGoodsInventory.actualSignalArea"/>
			<result column="box_no" property="finishedGoodsInventory.boxNo"/>
			<result column="id" property="finishedGoodsInventory.id"/>


			</resultMap>
			@@ -72,6 +73,7 @@
			<result column="delivery_detail_remakes" property="deliveryDetailRemakes"/>
			<result column="delivery_detail_state" property="deliveryDetailState"/>
			<result column="create_time" property="createTime"/>
			<result column="box_no" property="boxNo"/>

			<result column="customer_id" property="delivery.customerId"/>
			<result column="customer_name" property="delivery.customerName"/>
			@@ -91,9 +93,12 @@

			<result column="product_id" property="orderDetail.productId"/>
			<result column="product_name" property="orderDetail.productName"/>
			<result column="width" property="orderDetail.width"/>
			<result column="height" property="orderDetail.height"/>
			<result column="building_number" property="orderDetail.buildingNumber"/>

			<result column="other_money" property="order.otherMoney"/>

			<result column="batch" property="order.batch"/>


			</resultMap>
			@@ -119,6 +124,7 @@
			<result column="height" property="orderDetail.shape"/>

			<result column="contract_id" property="order.contractId"/>
			<result column="batch" property="order.batch"/>



			@@ -181,7 +187,7 @@
			fgi.quantity_available + dd.quantity as quantity_available,
			od.order_number,
			od.quantity-od.delivery_num as t_quantity,
			od.quantity as o_quantity,
			(fgi.quantity_available+ifnull(dd1.sumQuantity,0)) as o_quantity,
			dd.quantity as d_quantity,
			od.building_number,
			od.product_id,
			@@ -207,10 +213,14 @@
			left join sd.delivery d on dd.delivery_id=d.delivery_id
			left join sd.order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
			left join sd.`order` o on dd.order_id=o.order_id
			left join mm.finished_goods_inventory fgi on dd.order_id=fgi.order_id and dd.order_number=fgi.order_number
			left join mm.finished_goods_inventory fgi on dd.order_id=fgi.order_id and dd.order_number=fgi.order_number and fgi.box_no = dd.box_no
			left join (SELECT IFNULL(sum(quantity),0) as sumQuantity,dd.*
			from sd.delivery_detail dd
			GROUP BY dd.order_id,dd.order_number,dd.box_no) AS dd1
			on od.order_id = dd1.order_id and od.order_number = dd1.order_number and dd1.box_no = fgi.box_no
			<where>
			<if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
			and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
			and dd.delivery_id = #{orderDetail.deliveryDetail.deliveryId}
			</if>
			<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
			and od.order_id regexp #{orderDetail.orderId}
			@@ -283,7 +293,7 @@
			</if>

			</where>
			order by dd.id
			order by dd.box_no,dd.order_id,dd.order_number
			</select>

			<select id="getSelectShippingOrderDetailPageTotal">
			@@ -371,14 +381,16 @@
			</select>

			<select id="getSelectShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
			select od.order_id,
			select
			fgi.id,
			od.order_id,
			od.order_number,
			o.batch,
			o.calculate_type,
			fgi.quantity_available,
			od.quantity- od.delivery_num as t_quantity,
			od.quantity as o_quantity,
			fgi.quantity_available as d_quantity,
			od.quantity- od.delivery_num as t_quantity,-- 未发数量
			ifnull(dd1.sumQuantity,0)+fgi.quantity_available as o_quantity,-- 数量
			fgi.quantity_available as d_quantity,-- 发货数量
			od.building_number,
			od.product_id,
			od.product_name,
			@@ -401,6 +413,13 @@
			left join sd.`order` o on od.order_id = o.order_id
			left join mm.finished_goods_inventory fgi
			on od.order_id = fgi.order_id and od.order_number = fgi.order_number
			left join (SELECT IFNULL(sum(quantity),0) as sumQuantity,dd.*
			from sd.delivery_detail dd
			where dd.order_id regexp #{orderDetail.orderId}
			GROUP BY dd.order_id,dd.order_number,dd.box_no) AS dd1
			on od.order_id = dd1.order_id and od.order_number = dd1.order_number and dd1.box_no = fgi.box_no


			<where>
			fgi.quantity_available > 0 and od.quantity > od.delivery_num
			<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
			@@ -573,13 +592,33 @@
			o.other_money,
			d.freight_price,
			d.freight_quantity,
			d.freight
			d.freight,
			o.batch,
			od.width,
			od.height,
			od.building_number,
			dd.box_no
			from sd.delivery_detail dd
			left join sd.delivery d on dd.delivery_id=d.delivery_id
			left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
			left join sd.`order` o on dd.order_id=o.order_id
			<where>
			and date(dd.create_time)>=#{startDate} and date(dd.create_time) <= #{endDate}
			<if test="deliveryDetail.order!=null and (deliveryDetail.order.batch != null and deliveryDetail.order.batch != '')">
			and o.batch like concat('%',#{deliveryDetail.order.batch},'%')
			</if>
			<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.width != null and deliveryDetail.orderDetail.width != '')">
			and od.width regexp REGEXP_REPLACE(#{deliveryDetail.orderDetail.width},'\\.0+$','')
			</if>
			<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.height != null and deliveryDetail.orderDetail.height != '')">
			and od.height regexp REGEXP_REPLACE(#{deliveryDetail.orderDetail.height},'\\.0+$','')
			</if>
			<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.buildingNumber != null and deliveryDetail.orderDetail.buildingNumber != '')">
			and od.building_number like concat('%',#{deliveryDetail.orderDetail.buildingNumber},'%')
			</if>
			<if test="deliveryDetail.boxNo != null and deliveryDetail.boxNo != ''">
			and dd.box_no like concat('%',#{deliveryDetail.boxNo},'%')
			</if>
			<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
			and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
			</if>
			@@ -679,6 +718,21 @@
			left join sd.`order` o on dd.order_id=o.order_id
			<where>
			and date(dd.create_time)>=#{startDate} and date(dd.create_time) <= #{endDate}
			<if test="deliveryDetail.order!=null and (deliveryDetail.order.batch != null and deliveryDetail.order.batch != '')">
			and o.batch like concat('%',#{deliveryDetail.order.batch},'%')
			</if>
			<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.width != null and deliveryDetail.orderDetail.width != '')">
			and od.width regexp REGEXP_REPLACE(#{deliveryDetail.orderDetail.width},'\\.0+$','')
			</if>
			<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.height != null and deliveryDetail.orderDetail.height != '')">
			and od.height regexp REGEXP_REPLACE(#{deliveryDetail.orderDetail.height},'\\.0+$','')
			</if>
			<if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.buildingNumber != null and deliveryDetail.orderDetail.buildingNumber != '')">
			and od.building_number like concat('%',#{deliveryDetail.orderDetail.buildingNumber},'%')
			</if>
			<if test="deliveryDetail.boxNo != null and deliveryDetail.boxNo != ''">
			and dd.box_no like concat('%',#{deliveryDetail.boxNo},'%')
			</if>
			<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
			and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
			</if>
			@@ -763,6 +817,7 @@
			<if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightPrice != null )">
			and d.freight_price regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freightPrice},'\\.0+$','')
			</if>

			</where>
			order by dd.delivery_id,dd.delivery_number
			</select>
			@@ -995,7 +1050,7 @@

			<select id="getSelectDeliveryPrinting" resultMap="selectDeliveryDetailOrderDetail" >
			select dd.delivery_id,od.order_id,od.product_id,IF(#{type}='product_abbreviation',pt.remarks,od.product_name) as product_name,dd.price,sum(dd.area) as area,
			sum(dd.money) as money,sum(dd.quantity) as quantity,o.contract_id from
			sum(dd.money) as money,sum(dd.quantity) as quantity,o.contract_id,o.batch from
			delivery_detail dd left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
			left join product pt on pt.id=od.product_id
			left join sd.`order` o on o.order_id=dd.order_id
			@@ -1291,7 +1346,12 @@
			o.other_money,
			d.freight,
			d.freight_price,
			d.freight_quantity
			d.freight_quantity,
			od.width,
			od.height,
			o.batch,
			od.building_number,
			dd.box_no
			from sd.delivery_detail dd
			left join sd.delivery d on dd.delivery_id=d.delivery_id
			left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number