blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2024-02-27 b09e0423b15d6402b44d4ef338bfb85f027daf3c 
 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml


@@ -64,6 +64,7 @@


        <result column="product_name" property="productName"/>


        <result column="product_id" property="productId"/>


        <result column="warehouse_num" property="warehouseNum"/>


        <result column="delivery_num" property="deliveryNum"/>




        <result column="order_number" property="deliveryDetail.orderNumber"/>


        <result column="delivery_id" property="deliveryDetail.deliveryId"/>


@@ -181,10 +182,10 @@


                and od.product_name regexp #{orderDetail.productName}


            </if>


            <if test="orderDetail.width != null and orderDetail.width != ''">


                and od.width regexp #{orderDetail.width}


                and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')


            </if>


            <if test="orderDetail.height != null and orderDetail.height != ''">


                and od.height regexp #{orderDetail.height}


                and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')


            </if>


            <if test="orderDetail.order.customerId != null and orderDetail.order.customerId != ''">


                and o.customer_id regexp #{orderDetail.order.customerId}


@@ -193,10 +194,10 @@


                and o.customer_name regexp #{orderDetail.order.customerName}


            </if>


            <if test="orderDetail.finishedGoodsInventory.actualSignalArea != null and orderDetail.finishedGoodsInventory.actualSignalArea != ''">


                and fgi.actual_signal_area regexp #{orderDetail.finishedGoodsInventory.actualSignalArea}


                and fgi.actual_signal_area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.actualSignalArea},'\\.0+$','')


            </if>


            <if test="orderDetail.finishedGoodsInventory.area != null and orderDetail.finishedGoodsInventory.area != ''">


                and fgi.area regexp #{orderDetail.finishedGoodsInventory.area}


                and fgi.area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.area},'\\.0+$','')


            </if>


            <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">


                and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}


@@ -234,10 +235,10 @@


                and od.product_name regexp #{orderDetail.productName}


            </if>


            <if test="orderDetail.width != null and orderDetail.width != ''">


                and od.width regexp #{orderDetail.width}


                and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')


            </if>


            <if test="orderDetail.height != null and orderDetail.height != ''">


                and od.height regexp #{orderDetail.height}


                and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')


            </if>


            <if test="orderDetail.order.customerId != null and orderDetail.order.customerId != ''">


                and o.customer_id regexp #{orderDetail.order.customerId}


@@ -246,10 +247,10 @@


                and o.customer_name regexp #{orderDetail.order.customerName}


            </if>


            <if test="orderDetail.finishedGoodsInventory.actualSignalArea != null and orderDetail.finishedGoodsInventory.actualSignalArea != ''">


                and fgi.actual_signal_area regexp #{orderDetail.finishedGoodsInventory.actualSignalArea}


                and fgi.actual_signal_area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.actualSignalArea},'\\.0+$','')


            </if>


            <if test="orderDetail.finishedGoodsInventory.area != null and orderDetail.finishedGoodsInventory.area != ''">


                and fgi.area regexp #{orderDetail.finishedGoodsInventory.area}


                and fgi.area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.area},'\\.0+$','')


            </if>


            <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">


                and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}


@@ -263,7 +264,7 @@


    <update id="updateDeliveryDetailState">


        update sd.delivery_detail


        set delivery_detail_state=#{state}


        where order_number=#{orderDetail.deliveryDetail.orderNumber}  and order_id=#{orderDetail.deliveryDetail.orderId}


        where order_number=#{orderDetail.deliveryDetail.orderNumber}  and order_id=#{orderDetail.deliveryDetail.orderId} and delivery_id=#{orderDetail.deliveryDetail.deliveryId}


    </update>




    <update id="updateInventoryquantityavailable">


@@ -300,22 +301,22 @@


                and d.customer_name regexp #{orderDetail.delivery.customerName}


            </if>


            <if test="orderDetail.width != null and orderDetail.width != ''">


                and od.width regexp #{orderDetail.width}


                and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')


            </if>


            <if test="orderDetail.height != null and orderDetail.height != ''">


                and od.height regexp #{orderDetail.height}


                and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')


            </if>


            <if test="orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">


                and d.quantity regexp #{orderDetail.delivery.quantity}


            </if>


            <if test="orderDetail.warehouseNum != null and orderDetail.warehouseNum != ''">


                and od.warehouseNum regexp #{orderDetail.warehouseNum}


                and od.warehouse_num regexp #{orderDetail.warehouseNum}


            </if>


            <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 != ''">


                and d.area regexp #{orderDetail.delivery.area}


                and d.area regexp REGEXP_REPLACE(#{orderDetail.delivery.area},'\\.0+$','')


            </if>


            <if test="orderDetail.deliveryDetail.orderNumber != null and orderDetail.deliveryDetail.orderNumber != ''">


                and dd.order_number regexp #{orderDetail.deliveryDetail.orderNumber}


@@ -347,6 +348,7 @@


               od.height,


               d.quantity,


               od.warehouse_num,


               od.delivery_num,


               d.area,


               od.building_number,


               d.creator,


@@ -377,22 +379,22 @@


                and d.customer_name regexp #{orderDetail.delivery.customerName}


            </if>


            <if test="orderDetail.width != null and orderDetail.width != ''">


                and od.width regexp #{orderDetail.width}


                and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')


            </if>


            <if test="orderDetail.height != null and orderDetail.height != ''">


                and od.height regexp #{orderDetail.height}


                and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')


            </if>


            <if test="orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">


                and d.quantity regexp #{orderDetail.delivery.quantity}


            </if>


            <if test="orderDetail.warehouseNum != null and orderDetail.warehouseNum != ''">


                and od.warehouseNum regexp #{orderDetail.warehouseNum}


                and od.warehouse_num regexp #{orderDetail.warehouseNum}


            </if>


            <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 != ''">


                and d.area regexp #{orderDetail.delivery.area}


                and d.area regexp REGEXP_REPLACE(#{orderDetail.delivery.area},'\\.0+$','')


            </if>


            <if test="orderDetail.deliveryDetail.orderNumber != null and orderDetail.deliveryDetail.orderNumber != ''">


                and dd.order_number regexp #{orderDetail.deliveryDetail.orderNumber}


@@ -421,6 +423,14 @@


        select sum(warehouse_num) from sd.order_detail where order_id=#{orderId}


    </select>




    <select id="findDeliveryQuantity" >


        select quantity from sd.`delivery`  where delivery_id=#{deliveryId}


    </select>




    <select id="findDeliverydetailsum"  >


        select sum(quantity) from sd.`delivery_detail`  where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}


    </select>




    <update id="updateOrderWarehousingState">


        update sd.`order`


        set warehousing=#{state}


@@ -431,6 +441,12 @@


        update sd.`order`


        set delivery=#{state}


        where order_id=#{orderId}


    </update>




    <update id="updateDeliveryDeliveryState">


        update sd.`delivery`


        set stock_state=#{state}


        where delivery_id=#{deliveryId}


    </update>




    <update id="updateIntOrderNumberConut">


@@ -537,10 +553,10 @@


                and od.product_name regexp #{flowCard.orderDetail.productName}


            </if>


            <if test="flowCard.orderDetail.width != null and flowCard.orderDetail.width != ''">


                and od.width regexp #{flowCard.orderDetail.width}


                and od.width regexp REGEXP_REPLACE(#{flowCard.orderDetail.width},'\\.0+$','')


            </if>


            <if test="flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">


                and od.height regexp #{flowCard.orderDetail.height}


                and od.height regexp REGEXP_REPLACE(#{flowCard.orderDetail.height},'\\.0+$','')


            </if>


            <if test="flowCard.order.creator != null and flowCard.order.creator != ''">


                and o.creator regexp #{flowCard.order.creator}


@@ -558,7 +574,7 @@


                and fc.inventory_quantity regexp #{flowCard.inventoryQuantity}


            </if>


            <if test="flowCard.order.area != null and flowCard.order.area != ''">


                and o.area regexp #{flowCard.order.area}


                and o.area regexp REGEXP_REPLACE(#{flowCard.order.area},'\\.0+$','')


            </if>


            <if test="flowCard.order.batch != null and flowCard.order.batch != ''">


                and o.batch regexp #{flowCard.order.batch}


@@ -593,10 +609,10 @@


                and od.product_name regexp #{flowCard.orderDetail.productName}


            </if>


            <if test="flowCard.orderDetail.width != null and flowCard.orderDetail.width != ''">


                and od.width regexp #{flowCard.orderDetail.width}


                and od.width regexp REGEXP_REPLACE(#{flowCard.orderDetail.width},'\\.0+$','')


            </if>


            <if test="flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">


                and od.height regexp #{flowCard.orderDetail.height}


                and od.height regexp REGEXP_REPLACE(#{flowCard.orderDetail.height},'\\.0+$','')


            </if>


            <if test="flowCard.order.creator != null and flowCard.order.creator != ''">


                and o.creator regexp #{flowCard.order.creator}


@@ -614,7 +630,7 @@


                and fc.inventory_quantity regexp #{flowCard.inventoryQuantity}


            </if>


            <if test="flowCard.order.area != null and flowCard.order.area != ''">


                and o.area regexp #{flowCard.order.area}


                and o.area regexp REGEXP_REPLACE(#{flowCard.order.area},'\\.0+$','')


            </if>


            <if test="flowCard.order.batch != null and flowCard.order.batch != ''">


                and o.batch regexp #{flowCard.order.batch}


@@ -678,7 +694,7 @@


                and o.order_type regexp #{finishedGoodsInventory.order.orderType}


            </if>


            <if test="finishedGoodsInventory.orderDetail.height != null and finishedGoodsInventory.orderDetail.height != ''">


                and od.height regexp #{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}


@@ -687,10 +703,10 @@


                and fgi.quantity_available regexp #{finishedGoodsInventory.quantityAvailable}


            </if>


            <if test="finishedGoodsInventory.actualSignalArea != null and finishedGoodsInventory.actualSignalArea != ''">


                and fgi.actual_signal_area regexp #{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 #{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}


@@ -752,7 +768,7 @@


                and o.order_type regexp #{finishedGoodsInventory.order.orderType}


            </if>


            <if test="finishedGoodsInventory.orderDetail.height != null and finishedGoodsInventory.orderDetail.height != ''">


                and od.height regexp #{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}


@@ -761,10 +777,10 @@


                and fgi.quantity_available regexp #{finishedGoodsInventory.quantityAvailable}


            </if>


            <if test="finishedGoodsInventory.actualSignalArea != null and finishedGoodsInventory.actualSignalArea != ''">


                and fgi.actual_signal_area regexp #{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 #{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}