Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-11-21 714ed2fda4d83bdc2da48ccfe7e42f220acbee99

 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml

@@ -347,13 +347,13 @@
                 left join sd.`order` o on o.order_id = dd.order_id
        <where>
                and dd.delivery_detail_state=1
            <if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
            <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
                and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
            </if>
            <if test="orderDetail.deliveryDetail.orderId != null and orderDetail.deliveryDetail.orderId != ''">
            <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.orderId != null and orderDetail.deliveryDetail.orderId != ''">
                and dd.order_id regexp #{orderDetail.deliveryDetail.orderId}
            </if>
            <if test="orderDetail.order.project != null and orderDetail.order.project != ''">
            <if test="orderDetail.order != null and orderDetail.order.project != null and orderDetail.order.project != ''">
                and o.project regexp #{orderDetail.order.project}
            </if>
            <if test="orderDetail.productId != null and orderDetail.productId != ''">
@@ -362,7 +362,7 @@
            <if test="orderDetail.productName != null and orderDetail.productName != ''">
                and od.product_name regexp #{orderDetail.productName}
            </if>
            <if test="orderDetail.delivery.customerName != null and orderDetail.delivery.customerName != ''">
            <if test="orderDetail.delivery != null and orderDetail.delivery.customerName != null and orderDetail.delivery.customerName != ''">
                and d.customer_name regexp #{orderDetail.delivery.customerName}
            </if>
            <if test="orderDetail.width != null and orderDetail.width != ''">
@@ -371,7 +371,7 @@
            <if test="orderDetail.height != null and orderDetail.height != ''">
                and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
            </if>
            <if test="orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">
            <if test="orderDetail.delivery != null and orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">
                and d.quantity regexp #{orderDetail.delivery.quantity}
            </if>
            <if test="orderDetail.warehouseNum != null and orderDetail.warehouseNum != ''">
@@ -380,19 +380,19 @@
            <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
                and od.building_number regexp #{orderDetail.buildingNumber}
            </if>
            <if test="orderDetail.delivery.area != null and orderDetail.delivery.area != ''">
            <if test="orderDetail.delivery != null and orderDetail.delivery.area != null and orderDetail.delivery.area != ''">
                and d.area regexp REGEXP_REPLACE(#{orderDetail.delivery.area},'\\.0+$','')
            </if>
            <if test="orderDetail.deliveryDetail.orderNumber != null and orderDetail.deliveryDetail.orderNumber != ''">
            <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.orderNumber != null and orderDetail.deliveryDetail.orderNumber != ''">
                and dd.order_number regexp #{orderDetail.deliveryDetail.orderNumber}
            </if>
            <if test="orderDetail.delivery.creator != null and orderDetail.delivery.creator != ''">
            <if test="orderDetail.delivery != null and orderDetail.delivery.creator != null and orderDetail.delivery.creator != ''">
                and d.creator regexp #{orderDetail.delivery.creator}
            </if>
            <if test="orderDetail.deliveryDetail.createTime != null and orderDetail.deliveryDetail.createTime != ''">
            <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.createTime != null and orderDetail.deliveryDetail.createTime != ''">
                and dd.create_time regexp #{orderDetail.deliveryDetail.createTime}
            </if>
            <if test="orderDetail.deliveryDetail.deliveryDetailRemakes != null and orderDetail.deliveryDetail.deliveryDetailRemakes != ''">
            <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.deliveryDetailRemakes != null and orderDetail.deliveryDetail.deliveryDetailRemakes != ''">
                and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
            </if>
        </where>
@@ -427,13 +427,13 @@

        <where>
                and dd.delivery_detail_state=1 and d.delivery_state=2
            <if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
            <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
                and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
            </if>
            <if test="orderDetail.deliveryDetail.orderId != null and orderDetail.deliveryDetail.orderId != ''">
            <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.orderId != null and orderDetail.deliveryDetail.orderId != ''">
                and dd.order_id regexp #{orderDetail.deliveryDetail.orderId}
            </if>
            <if test="orderDetail.order.project != null and orderDetail.order.project != ''">
            <if test="orderDetail.order != null and orderDetail.order.project != null and orderDetail.order.project != ''">
                and o.project regexp #{orderDetail.order.project}
            </if>
            <if test="orderDetail.productId != null and orderDetail.productId != ''">
@@ -442,7 +442,7 @@
            <if test="orderDetail.productName != null and orderDetail.productName != ''">
                and od.product_name regexp #{orderDetail.productName}
            </if>
            <if test="orderDetail.delivery.customerName != null and orderDetail.delivery.customerName != ''">
            <if test="orderDetail.delivery != null and orderDetail.delivery.customerName != null and orderDetail.delivery.customerName != ''">
                and d.customer_name regexp #{orderDetail.delivery.customerName}
            </if>
            <if test="orderDetail.width != null and orderDetail.width != ''">
@@ -451,7 +451,7 @@
            <if test="orderDetail.height != null and orderDetail.height != ''">
                and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
            </if>
            <if test="orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">
            <if test="orderDetail.delivery != null and orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">
                and d.quantity regexp #{orderDetail.delivery.quantity}
            </if>
            <if test="orderDetail.warehouseNum != null and orderDetail.warehouseNum != ''">
@@ -460,19 +460,19 @@
            <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
                and od.building_number regexp #{orderDetail.buildingNumber}
            </if>
            <if test="orderDetail.delivery.area != null and orderDetail.delivery.area != ''">
            <if test="orderDetail.delivery != null and orderDetail.delivery.area != null and orderDetail.delivery.area != ''">
                and d.area regexp REGEXP_REPLACE(#{orderDetail.delivery.area},'\\.0+$','')
            </if>
            <if test="orderDetail.deliveryDetail.orderNumber != null and orderDetail.deliveryDetail.orderNumber != ''">
            <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.orderNumber != null and orderDetail.deliveryDetail.orderNumber != ''">
                and dd.order_number regexp #{orderDetail.deliveryDetail.orderNumber}
            </if>
            <if test="orderDetail.delivery.creator != null and orderDetail.delivery.creator != ''">
            <if test="orderDetail.delivery != null and orderDetail.delivery.creator != null and orderDetail.delivery.creator != ''">
                and d.creator regexp #{orderDetail.delivery.creator}
            </if>
            <if test="orderDetail.deliveryDetail.createTime != null and orderDetail.deliveryDetail.createTime != ''">
            <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.createTime != null and orderDetail.deliveryDetail.createTime != ''">
                and dd.create_time regexp #{orderDetail.deliveryDetail.createTime}
            </if>
            <if test="orderDetail.deliveryDetail.deliveryDetailRemakes != null and orderDetail.deliveryDetail.deliveryDetailRemakes != ''">
            <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.deliveryDetailRemakes != null and orderDetail.deliveryDetail.deliveryDetailRemakes != ''">
                and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
            </if>
        </where>
@@ -543,7 +543,7 @@

    <update id="updateOrderNumberConut">
        update sd.order_detail
        set warehouse_num=${quantity},update_time=now()
        set warehouse_num=warehouse_num+${quantity},update_time=now()
        where order_number=#{orderNumber} and order_id=#{orderId}
    </update>

@@ -733,43 +733,43 @@
        o.order_id=fc.order_id
        <where>
                and fc.received_quantity <![CDATA[<]]> fc.min_inventory_quantity and o.create_order>0
            <if test="flowCard.order.orderId != null and flowCard.order.orderId != ''">
            <if test="flowCard.order != null and flowCard.order.orderId != null and flowCard.order.orderId != ''">
                and o.order_id regexp #{flowCard.order.orderId}
            </if>
            <if test="flowCard.orderDetail.buildingNumber != null and flowCard.orderDetail.buildingNumber != ''">
            <if test="flowCard.orderDetail != null and flowCard.orderDetail.buildingNumber != null and flowCard.orderDetail.buildingNumber != ''">
                and od.building_number regexp #{flowCard.orderDetail.buildingNumber}
            </if>
            <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
            <if test="flowCard.orderDetail != null and flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
                and od.product_id regexp #{flowCard.orderDetail.productId}
            </if>
            <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">
            <if test="flowCard.orderDetail != null and flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">
                and od.product_name regexp #{flowCard.orderDetail.productName}
            </if>
            <if test="flowCard.orderDetail.width != null and flowCard.orderDetail.width != ''">
            <if test="flowCard.orderDetail != null and flowCard.orderDetail.width != null and flowCard.orderDetail.width != ''">
                and od.width regexp REGEXP_REPLACE(#{flowCard.orderDetail.width},'\\.0+$','')
            </if>
            <if test="flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">
            <if test="flowCard.orderDetail != null and flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">
                and od.height regexp REGEXP_REPLACE(#{flowCard.orderDetail.height},'\\.0+$','')
            </if>
            <if test="flowCard.order.creator != null and flowCard.order.creator != ''">
            <if test="flowCard.order != null and flowCard.order.creator != null and flowCard.order.creator != ''">
                and o.creator regexp #{flowCard.order.creator}
            </if>
            <if test="flowCard.order.project != null and flowCard.order.project != ''">
            <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.orderNumber != null and flowCard.orderNumber != ''">
                and fc.order_number regexp #{flowCard.orderNumber}
            </if>
            <if test="flowCard.orderDetail.quantity != null and flowCard.orderDetail.quantity != ''">
            <if test="flowCard.orderDetail != null and flowCard.orderDetail.quantity != null and flowCard.orderDetail.quantity != ''">
                and od.quantity regexp #{flowCard.orderDetail.quantity}
            </if>
            <if test="flowCard.inventoryQuantity != null and flowCard.inventoryQuantity != ''">
                and fc.inventory_quantity regexp #{flowCard.inventoryQuantity}
            </if>
            <if test="flowCard.order.area != null and flowCard.order.area != ''">
            <if test="flowCard.order != null and flowCard.order.area != null and flowCard.order.area != ''">
                and o.area regexp REGEXP_REPLACE(#{flowCard.order.area},'\\.0+$','')
            </if>
            <if test="flowCard.order.batch != null and flowCard.order.batch != ''">
            <if test="flowCard.order != null and flowCard.order.batch != null and flowCard.order.batch != ''">
                and o.batch regexp #{flowCard.order.batch}
            </if>
            <if test="flowCard.processId != null and flowCard.processId != ''">
@@ -791,43 +791,43 @@
        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.orderId != null and flowCard.order.orderId != ''">
            <if test="flowCard.order != null and flowCard.order.orderId != null and flowCard.order.orderId != ''">
                and o.order_id regexp #{flowCard.order.orderId}
            </if>
            <if test="flowCard.orderDetail.buildingNumber != null and flowCard.orderDetail.buildingNumber != ''">
            <if test="flowCard.orderDetail != null and flowCard.orderDetail.buildingNumber != null and flowCard.orderDetail.buildingNumber != ''">
                and od.building_number regexp #{flowCard.orderDetail.buildingNumber}
            </if>
            <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
            <if test="flowCard.orderDetail != null and flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
                and od.product_id regexp #{flowCard.orderDetail.productId}
            </if>
            <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">
            <if test="flowCard.orderDetail != null and flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">
                and od.product_name regexp #{flowCard.orderDetail.productName}
            </if>
            <if test="flowCard.orderDetail.width != null and flowCard.orderDetail.width != ''">
            <if test="flowCard.orderDetail != null and flowCard.orderDetail.width != null and flowCard.orderDetail.width != ''">
                and od.width regexp REGEXP_REPLACE(#{flowCard.orderDetail.width},'\\.0+$','')
            </if>
            <if test="flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">
            <if test="flowCard.orderDetail != null and flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">
                and od.height regexp REGEXP_REPLACE(#{flowCard.orderDetail.height},'\\.0+$','')
            </if>
            <if test="flowCard.order.creator != null and flowCard.order.creator != ''">
            <if test="flowCard.order != null and flowCard.order.creator != null and flowCard.order.creator != ''">
                and o.creator regexp #{flowCard.order.creator}
            </if>
            <if test="flowCard.order.project != null and flowCard.order.project != ''">
            <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.orderNumber != null and flowCard.orderNumber != ''">
                and fc.order_number regexp #{flowCard.orderNumber}
            </if>
            <if test="flowCard.orderDetail.quantity != null and flowCard.orderDetail.quantity != ''">
            <if test="flowCard.orderDetail != null and flowCard.orderDetail.quantity != null and flowCard.orderDetail.quantity != ''">
                and od.quantity regexp #{flowCard.orderDetail.quantity}
            </if>
            <if test="flowCard.inventoryQuantity != null and flowCard.inventoryQuantity != ''">
                and fc.inventory_quantity regexp #{flowCard.inventoryQuantity}
            </if>
            <if test="flowCard.order.area != null and flowCard.order.area != ''">
            <if test="flowCard.order != null and flowCard.order.area != null and flowCard.order.area != ''">
                and o.area regexp REGEXP_REPLACE(#{flowCard.order.area},'\\.0+$','')
            </if>
            <if test="flowCard.order.batch != null and flowCard.order.batch != ''">
            <if test="flowCard.order != null and flowCard.order.batch != null and flowCard.order.batch != ''">
                and o.batch regexp #{flowCard.order.batch}
            </if>
            <if test="flowCard.processId != null and flowCard.processId != ''">
@@ -881,51 +881,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 +938,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 +982,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 +1035,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>
@@ -1108,7 +1104,7 @@

    <update id="updateOrderInventory">
        update mm.finished_goods_inventory
        set inventory=${orderDetail.quantity},quantity_available=${orderDetail.quantity},
        set inventory=inventory+${orderDetail.quantity},quantity_available=quantity_available+${orderDetail.quantity},
        update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available
        where order_number=#{orderDetail.orderNumber}  and order_id=#{orderDetail.orderId}
    </update>