Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2025-11-20 9c5c958fed902c674e35ec89382703d37e50e21c

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

@@ -91,6 +91,7 @@
        <result column="delivery_id" property="deliveryDetail.deliveryId"/>
        <result column="delivery_number" property="deliveryDetail.deliveryNumber"/>
        <result column="delivery_detail_remakes" property="deliveryDetail.deliveryDetailRemakes"/>
            <result column="delivery_detail_state" property="deliveryDetail.deliveryDetailState"/>
        <result column="order_id" property="deliveryDetail.orderId"/>
        <result column="create_time" property="deliveryDetail.createTime"/>
        <result column="dd_quantity" property="deliveryDetail.quantity"/>
@@ -346,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 != ''">
@@ -361,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 != ''">
@@ -370,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 != ''">
@@ -379,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>
@@ -426,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 != ''">
@@ -441,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 != ''">
@@ -450,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 != ''">
@@ -459,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>
@@ -542,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>

@@ -554,7 +555,7 @@

    <update id="updateflowcardOut">
        update pp.flow_card
        set received_quantity=received_quantity-${finishedOperateLog.quantity},storage_time=now()
        set received_quantity=received_quantity-${finishedOperateLog.cancelAvailable},storage_time=now()
        where order_number=#{finishedOperateLog.operationNumber} and process_id=#{finishedOperateLog.processId} and order_id=#{finishedOperateLog.orderId}
    </update>

@@ -583,7 +584,7 @@

    <update id="updateInventoryOut">
        update mm.finished_goods_inventory
        set inventory=inventory-${finishedOperateLog.quantity},quantity_available=quantity_available-${finishedOperateLog.quantity},
        set inventory=inventory-${finishedOperateLog.cancelAvailable},quantity_available=quantity_available-${finishedOperateLog.cancelAvailable},
        update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available
        where order_number=#{finishedOperateLog.operationNumber}  and order_id=#{finishedOperateLog.orderId}
        <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
@@ -732,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 != ''">
@@ -790,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 != ''">
@@ -1107,7 +1108,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>
@@ -1148,6 +1149,7 @@
               od.building_number,
               d.creator,
               dd.delivery_detail_remakes,
               dd.delivery_detail_state,
               dd.create_time,
               dd.box_no
        from sd.delivery_detail dd
@@ -1248,4 +1250,46 @@
               where o.create_time &lt; DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
               and o.delivery=2 and fgi.inventory=0
    </delete>



    <select id="getFinishedGoodsInventoryList" resultMap="selectFinishedGoodsInventory">
        select
        fgi.id,
        fgi.process_id,
        od.order_number,
        o.order_id,
        o.project,
        o.order_type,
        o.customer_id,
        o.customer_name,
        o.batch,
        o.salesman,
        od.product_name,
        od.product_id,
        od.width,
        od.height,
        od.building_number,
        fgi.inventory,
        fgi.quantity_available,
        fgi.actual_signal_area,
        fgi.area,
        fgi.warehouse_number,
        fgi.storage_region,
        fgi.`status`,
        fgi.update_time,
        fgi.enter_storage_time,
        fgi.end_time,
        fgi.remark,
        fgi.box_no,
        fgi.compute_area,
        fgi.compute_gross_area,
        round(fgi.area*p.total_thickness*2.5/1000,5) as weight
        from finished_goods_inventory fgi
        left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
        left join sd.`order` o on fgi.order_id = o.order_id
        left join sd.product p on p.id=od.product_id
        where fgi.status = 0 and fgi.quantity_available>0 and o.create_order>0
        order by fgi.update_time desc;
    </select>
</mapper>