ERP_override.git

			@@ -61,6 +61,8 @@
			<result column="batch" property="order.batch"/>
			<result column="order_quantity" property="order.quantity"/>
			<result column="calculate_type" property="order.calculateType"/>
			<result column="customer_name" property="order.customerName"/>


			<result column="building_number" property="orderDetail.buildingNumber"/>
			<result column="width" property="orderDetail.width"/>
			@@ -714,6 +716,7 @@
			od.height,
			o.creator,
			o.project,
			o.customer_name,
			fc.order_number,
			od.quantity,
			fc.quantity as fc_quantity,
			@@ -757,6 +760,9 @@
			<if test="flowCard.order != null and flowCard.order.project != null and flowCard.order.project != ''">
			and o.project regexp #{flowCard.order.project}
			</if>
			<if test="flowCard.order != null and flowCard.order.customerName != null and flowCard.order.customerName != ''">
			and o.customer_name regexp #{flowCard.order.customerName}
			</if>
			<if test="flowCard.orderNumber != null and flowCard.orderNumber != ''">
			and fc.order_number regexp #{flowCard.orderNumber}
			</if>
			@@ -785,10 +791,12 @@
			</select>
			<select id="getSelectWarehousingPageTotal" >
			select
			CEILING(count(zu.order_number)/#{pageSize}) as 'pageTotal',
			count(zu.order_number) as 'total' from (
			select fc.order_number as order_number,fc.process_id from pp.flow_card fc left join sd.order_detail od on
			fc.order_id=od.order_id and fc.order_number=od.order_number inner join sd.`order` o on o.order_id=fc.order_id
			CEILING(count(zu.id)/#{pageSize}) as 'pageTotal',
			count(zu.id) as 'total' from (
			select fc.id as id
			from (select *,min(inventory_quantity) as min_inventory_quantity from pp.flow_card group by order_id,order_number,process_id) as fc
			left join sd.order_detail od on fc.order_id=od.order_id and fc.order_number=od.order_number inner join sd.`order` o on
			o.order_id=fc.order_id
			<where>
			and fc.received_quantity <![CDATA[<]]> fc.inventory_quantity and o.create_order>0
			<if test="flowCard.order != null and flowCard.order.orderId != null and flowCard.order.orderId != ''">
			@@ -814,6 +822,9 @@
			</if>
			<if test="flowCard.order != null and flowCard.order.project != null and flowCard.order.project != ''">
			and o.project regexp #{flowCard.order.project}
			</if>
			<if test="flowCard.order != null and flowCard.order.customerName != null and flowCard.order.customerName != ''">
			and o.customer_name regexp #{flowCard.order.customerName}
			</if>
			<if test="flowCard.orderNumber != null and flowCard.orderNumber != ''">
			and fc.order_number regexp #{flowCard.orderNumber}
			@@ -881,51 +892,49 @@
			<where>
			and fgi.status = 0 and fgi.quantity_available>0 and o.create_order>0
			<if test="finishedGoodsInventory.orderDetail.width != null and finishedGoodsInventory.orderDetail.width != ''">
			and od.width regexp #{finishedGoodsInventory.orderDetail.width}
			and od.width regexp REGEXP_REPLACE(#{finishedGoodsInventory.orderDetail.width},'\\.0+$','')
			</if>
			<if test="finishedGoodsInventory.orderDetail.orderNumber != null and finishedGoodsInventory.orderDetail.orderNumber != ''">
			and od.order_number regexp #{finishedGoodsInventory.orderDetail.orderNumber}
			and od.order_number like concat('%', #{finishedGoodsInventory.orderDetail.orderNumber}, '%')
			</if>
			<if test="finishedGoodsInventory.orderDetail.productName != null and finishedGoodsInventory.orderDetail.productName != ''">
			and od.product_name regexp #{finishedGoodsInventory.orderDetail.productName}
			and od.product_name like concat('%', #{finishedGoodsInventory.orderDetail.productName}, '%')
			</if>
			<if test="finishedGoodsInventory.orderDetail.productId != null and finishedGoodsInventory.orderDetail.productId != ''">
			and od.product_id regexp #{finishedGoodsInventory.orderDetail.productId}
			and od.product_id like concat('%', #{finishedGoodsInventory.orderDetail.productId}, '%')
			</if>
			<if test="finishedGoodsInventory.orderDetail.buildingNumber != null and finishedGoodsInventory.orderDetail.buildingNumber != ''">
			and od.building_number regexp #{finishedGoodsInventory.orderDetail.buildingNumber}
			and od.building_number like concat('%', #{finishedGoodsInventory.orderDetail.buildingNumber}, '%')
			</if>
			<if test="finishedGoodsInventory.order.orderId != null and finishedGoodsInventory.order.orderId != ''">
			and o.order_id regexp #{finishedGoodsInventory.order.orderId}
			and o.order_id like concat('%', #{finishedGoodsInventory.order.orderId}, '%')
			</if>
			<if test="finishedGoodsInventory.order.project != null and finishedGoodsInventory.order.project != ''">
			and o.project regexp #{finishedGoodsInventory.order.project}
			and o.project like concat('%', #{finishedGoodsInventory.order.project}, '%')
			</if>
			<if test="finishedGoodsInventory.order.orderType != null and finishedGoodsInventory.order.orderType != ''">
			and o.order_type regexp #{finishedGoodsInventory.order.orderType}
			and o.order_type like concat('%', #{finishedGoodsInventory.order.orderType}, '%')
			</if>

			<if test="finishedGoodsInventory.order.customerId != null and finishedGoodsInventory.order.customerId != ''">
			and o.customer_id regexp #{finishedGoodsInventory.order.customerId}
			and o.customer_id like concat('%', #{finishedGoodsInventory.order.customerId}, '%')
			</if>
			<if test="finishedGoodsInventory.order.customerName != null and finishedGoodsInventory.order.customerName != ''">
			and o.customer_name regexp #{finishedGoodsInventory.order.customerName}
			and o.customer_name like concat('%', #{finishedGoodsInventory.order.customerName}, '%')
			</if>
			<if test="finishedGoodsInventory.order.batch != null and finishedGoodsInventory.order.batch != ''">
			and o.batch regexp #{finishedGoodsInventory.order.batch}
			and o.batch like concat('%', #{finishedGoodsInventory.order.batch}, '%')
			</if>
			<if test="finishedGoodsInventory.order.salesman != null and finishedGoodsInventory.order.salesman != ''">
			and o.salesman regexp #{finishedGoodsInventory.order.salesman}
			and o.salesman like concat('%', #{finishedGoodsInventory.order.salesman}, '%')
			</if>

			<if test="finishedGoodsInventory.orderDetail.height != null and finishedGoodsInventory.orderDetail.height != ''">
			and od.height regexp REGEXP_REPLACE(#{finishedGoodsInventory.orderDetail.height},'\\.0+$','')
			</if>
			<if test="finishedGoodsInventory.inventory != null and finishedGoodsInventory.inventory != ''">
			and fgi.inventory regexp #{finishedGoodsInventory.inventory}
			and fgi.inventory like concat('%', #{finishedGoodsInventory.inventory}, '%')
			</if>
			<if test="finishedGoodsInventory.quantityAvailable != null and finishedGoodsInventory.quantityAvailable != ''">
			and fgi.quantity_available regexp #{finishedGoodsInventory.quantityAvailable}
			and fgi.quantity_available like concat('%', #{finishedGoodsInventory.quantityAvailable}, '%')
			</if>
			<if test="finishedGoodsInventory.actualSignalArea != null and finishedGoodsInventory.actualSignalArea != ''">
			and fgi.actual_signal_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.actualSignalArea},'\\.0+$','')
			@@ -940,28 +949,28 @@
			and fgi.area regexp REGEXP_REPLACE(#{finishedGoodsInventory.area},'\\.0+$','')
			</if>
			<if test="finishedGoodsInventory.warehouseNumber != null and finishedGoodsInventory.warehouseNumber != ''">
			and fgi.warehouse_number regexp #{finishedGoodsInventory.warehouseNumber}
			and fgi.warehouse_number like concat('%', #{finishedGoodsInventory.warehouseNumber}, '%')
			</if>
			<if test="finishedGoodsInventory.storageRegion != null and finishedGoodsInventory.storageRegion != ''">
			and fgi.storage_region regexp #{finishedGoodsInventory.storageRegion}
			and fgi.storage_region like concat('%', #{finishedGoodsInventory.storageRegion}, '%')
			</if>
			<if test="finishedGoodsInventory.status != null and finishedGoodsInventory.status != ''">
			and fgi.`status` regexp #{finishedGoodsInventory.status}
			and fgi.`status` like concat('%', #{finishedGoodsInventory.status}, '%')
			</if>
			<if test="finishedGoodsInventory.enterStorageTime != null and finishedGoodsInventory.enterStorageTime != ''">
			and fgi.enter_storage_time regexp #{finishedGoodsInventory.enterStorageTime}
			and fgi.enter_storage_time like concat('%', #{finishedGoodsInventory.enterStorageTime}, '%')
			</if>
			<if test="finishedGoodsInventory.updateTime != null and finishedGoodsInventory.updateTime != ''">
			and fgi.update_time regexp #{finishedGoodsInventory.updateTime}
			and fgi.update_time like concat('%', #{finishedGoodsInventory.updateTime}, '%')
			</if>
			<if test="finishedGoodsInventory.endTime != null and finishedGoodsInventory.endTime != ''">
			and fgi.end_time regexp #{finishedGoodsInventory.endTime}
			and fgi.end_time like concat('%', #{finishedGoodsInventory.endTime}, '%')
			</if>
			<if test="finishedGoodsInventory.remark != null and finishedGoodsInventory.remark != ''">
			and fgi.remark regexp #{finishedGoodsInventory.remark}
			and fgi.remark like concat('%', #{finishedGoodsInventory.remark}, '%')
			</if>
			<if test="finishedGoodsInventory.boxNo != null and finishedGoodsInventory.boxNo != ''">
			and fgi.box_no regexp #{finishedGoodsInventory.boxNo}
			and fgi.box_no like concat('%', #{finishedGoodsInventory.boxNo}, '%')
			</if>

			</where>
			@@ -984,57 +993,52 @@
			<where>
			and fgi.status = 0 and fgi.quantity_available>0 and o.create_order>0
			<if test="finishedGoodsInventory.orderDetail.width != null and finishedGoodsInventory.orderDetail.width != ''">
			and od.width regexp #{finishedGoodsInventory.orderDetail.width}
			and od.width regexp REGEXP_REPLACE(#{finishedGoodsInventory.orderDetail.width},'\\.0+$','')
			</if>
			<if test="finishedGoodsInventory.orderDetail.orderNumber != null and finishedGoodsInventory.orderDetail.orderNumber != ''">
			and od.order_number regexp #{finishedGoodsInventory.orderDetail.orderNumber}
			and od.order_number like concat('%', #{finishedGoodsInventory.orderDetail.orderNumber}, '%')
			</if>
			<if test="finishedGoodsInventory.orderDetail.productName != null and finishedGoodsInventory.orderDetail.productName != ''">
			and od.product_name regexp #{finishedGoodsInventory.orderDetail.productName}
			and od.product_name like concat('%', #{finishedGoodsInventory.orderDetail.productName}, '%')
			</if>
			<if test="finishedGoodsInventory.orderDetail.productId != null and finishedGoodsInventory.orderDetail.productId != ''">
			and od.product_id regexp #{finishedGoodsInventory.orderDetail.productId}
			and od.product_id like concat('%', #{finishedGoodsInventory.orderDetail.productId}, '%')
			</if>
			<if test="finishedGoodsInventory.orderDetail.buildingNumber != null and finishedGoodsInventory.orderDetail.buildingNumber != ''">
			and od.building_number regexp #{finishedGoodsInventory.orderDetail.buildingNumber}
			and od.building_number like concat('%', #{finishedGoodsInventory.orderDetail.buildingNumber}, '%')
			</if>
			<if test="finishedGoodsInventory.order.orderId != null and finishedGoodsInventory.order.orderId != ''">
			and o.order_id regexp #{finishedGoodsInventory.order.orderId}
			and o.order_id like concat('%', #{finishedGoodsInventory.order.orderId}, '%')
			</if>
			<if test="finishedGoodsInventory.order.project != null and finishedGoodsInventory.order.project != ''">
			and o.project regexp #{finishedGoodsInventory.order.project}
			and o.project like concat('%', #{finishedGoodsInventory.order.project}, '%')
			</if>
			<if test="finishedGoodsInventory.order.orderType != null and finishedGoodsInventory.order.orderType != ''">
			and o.order_type regexp #{finishedGoodsInventory.order.orderType}
			and o.order_type like concat('%', #{finishedGoodsInventory.order.orderType}, '%')
			</if>

			<if test="finishedGoodsInventory.order.customerId != null and finishedGoodsInventory.order.customerId != ''">
			and o.customer_id regexp #{finishedGoodsInventory.order.customerId}
			and o.customer_id like concat('%', #{finishedGoodsInventory.order.customerId}, '%')
			</if>
			<if test="finishedGoodsInventory.order.customerName != null and finishedGoodsInventory.order.customerName != ''">
			and o.customer_name regexp #{finishedGoodsInventory.order.customerName}
			and o.customer_name like concat('%', #{finishedGoodsInventory.order.customerName}, '%')
			</if>
			<if test="finishedGoodsInventory.order.batch != null and finishedGoodsInventory.order.batch != ''">
			and o.batch regexp #{finishedGoodsInventory.order.batch}
			and o.batch like concat('%', #{finishedGoodsInventory.order.batch}, '%')
			</if>
			<if test="finishedGoodsInventory.order.salesman != null and finishedGoodsInventory.order.salesman != ''">
			and o.salesman regexp #{finishedGoodsInventory.order.salesman}
			and o.salesman like concat('%', #{finishedGoodsInventory.order.salesman}, '%')
			</if>

			<if test="finishedGoodsInventory.orderDetail.height != null and finishedGoodsInventory.orderDetail.height != ''">
			and od.height regexp REGEXP_REPLACE(#{finishedGoodsInventory.orderDetail.height},'\\.0+$','')
			</if>
			<if test="finishedGoodsInventory.inventory != null and finishedGoodsInventory.inventory != ''">
			and fgi.inventory regexp #{finishedGoodsInventory.inventory}
			and fgi.inventory like concat('%', #{finishedGoodsInventory.inventory}, '%')
			</if>
			<if test="finishedGoodsInventory.quantityAvailable != null and finishedGoodsInventory.quantityAvailable != ''">
			and fgi.quantity_available regexp #{finishedGoodsInventory.quantityAvailable}
			and fgi.quantity_available like concat('%', #{finishedGoodsInventory.quantityAvailable}, '%')
			</if>
			<if test="finishedGoodsInventory.actualSignalArea != null and finishedGoodsInventory.actualSignalArea != ''">
			and fgi.actual_signal_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.actualSignalArea},'\\.0+$','')
			</if>
			<if test="finishedGoodsInventory.area != null and finishedGoodsInventory.area != ''">
			and fgi.area regexp REGEXP_REPLACE(#{finishedGoodsInventory.area},'\\.0+$','')
			</if>
			<if test="finishedGoodsInventory.computeArea != null and finishedGoodsInventory.computeArea != ''">
			and fgi.compute_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.computeArea},'\\.0+$','')
			@@ -1042,29 +1046,32 @@
			<if test="finishedGoodsInventory.computeGrossArea != null and finishedGoodsInventory.computeGrossArea != ''">
			and fgi.compute_gross_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.computeGrossArea},'\\.0+$','')
			</if>
			<if test="finishedGoodsInventory.area != null and finishedGoodsInventory.area != ''">
			and fgi.area regexp REGEXP_REPLACE(#{finishedGoodsInventory.area},'\\.0+$','')
			</if>
			<if test="finishedGoodsInventory.warehouseNumber != null and finishedGoodsInventory.warehouseNumber != ''">
			and fgi.warehouse_number regexp #{finishedGoodsInventory.warehouseNumber}
			and fgi.warehouse_number like concat('%', #{finishedGoodsInventory.warehouseNumber}, '%')
			</if>
			<if test="finishedGoodsInventory.storageRegion != null and finishedGoodsInventory.storageRegion != ''">
			and fgi.storage_region regexp #{finishedGoodsInventory.storageRegion}
			and fgi.storage_region like concat('%', #{finishedGoodsInventory.storageRegion}, '%')
			</if>
			<if test="finishedGoodsInventory.status != null and finishedGoodsInventory.status != ''">
			and fgi.`status` regexp #{finishedGoodsInventory.status}
			and fgi.`status` like concat('%', #{finishedGoodsInventory.status}, '%')
			</if>
			<if test="finishedGoodsInventory.enterStorageTime != null and finishedGoodsInventory.enterStorageTime != ''">
			and fgi.enter_storage_time regexp #{finishedGoodsInventory.enterStorageTime}
			and fgi.enter_storage_time like concat('%', #{finishedGoodsInventory.enterStorageTime}, '%')
			</if>
			<if test="finishedGoodsInventory.updateTime != null and finishedGoodsInventory.updateTime != ''">
			and fgi.update_time regexp #{finishedGoodsInventory.updateTime}
			and fgi.update_time like concat('%', #{finishedGoodsInventory.updateTime}, '%')
			</if>
			<if test="finishedGoodsInventory.endTime != null and finishedGoodsInventory.endTime != ''">
			and fgi.end_time regexp #{finishedGoodsInventory.endTime}
			and fgi.end_time like concat('%', #{finishedGoodsInventory.endTime}, '%')
			</if>
			<if test="finishedGoodsInventory.remark != null and finishedGoodsInventory.remark != ''">
			and fgi.remark regexp #{finishedGoodsInventory.remark}
			and fgi.remark like concat('%', #{finishedGoodsInventory.remark}, '%')
			</if>
			<if test="finishedGoodsInventory.boxNo != null and finishedGoodsInventory.boxNo != ''">
			and fgi.box_no regexp #{finishedGoodsInventory.boxNo}
			and fgi.box_no like concat('%', #{finishedGoodsInventory.boxNo}, '%')
			</if>

			</where>