提交筛选日期调整

guoyujie

2025-04-08 3c55debea2b60faf89acdf89074ffd135dc44d7e

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

@@ -83,7 +83,7 @@
        ou.project_no as projectNo,
        mi.inventory_quantity AS inventoryQuantity,
        mi.available_quantity AS availableQuantity,
        mi.plan_quantity AS planQuantity,
        ou.not_use_count AS planQuantity,
        mi.id,
        mi.inventory_organization as inventoryOrganization,
        mi.material_code AS materialCode,
@@ -100,7 +100,7 @@
        ms.json from pp.optimize_use ou left join mm.material_inventory mi on ou.raw_stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id
        left join pp.optimize_project op on op.project_no=ou.project_no
        <where>
            mi.plan_quantity>0 and op.state>=100 and ou.state=1
            ou.not_use_count>0 and mi.plan_quantity>0 and op.state>=100 and ou.state=1

        </where>
        order by ou.id desc
@@ -170,8 +170,9 @@
        ou.id as useId,
        ou.project_no as projectNo,
        mi.inventory_quantity AS inventoryQuantity,
        mi.plan_quantity AS availableQuantity,
        mi.plan_quantity AS planQuantity,
        ou.not_use_count AS availableQuantity,
        ou.not_use_count AS planQuantity,
        ou.not_use_count AS outboundQuantity,
        mi.id,
        mi.inventory_organization as inventoryOrganization,
        mi.material_code AS materialCode,
@@ -247,7 +248,7 @@
                and mo.reviewed regexp #{materialOutbound.reviewed}
            </if>
        </where>
        order by mo.reviewed_state desc,mo.create_time desc
        order by mo.create_time desc
        limit #{offset},#{pageSize};
    </select>

@@ -281,7 +282,6 @@
                and mo.reviewed regexp #{materialOutbound.reviewed}
            </if>
        </where>
        limit #{offset},#{pageSize};
    </select>


@@ -363,7 +363,6 @@
                and rw.batch regexp #{returningWarehouse.batch}
            </if>
        </where>
        limit #{offset},#{pageSize};
    </select>

    <select id="getSelectMaterialOutbound">
@@ -422,6 +421,7 @@

    <select id="getSelectMaterialOutboundEngineering" >
        select
        ou.id as useId,
        ou.project_no as  projectNo,
        modd.inventory_id as id,
        modd.inventory_organization as inventoryOrganization,
@@ -511,7 +511,6 @@
                and rwd.returning_id regexp #{returningWarehouseDetail.returningId}
            </if>
        </where>
        limit #{offset},#{pageSize};
    </select>


@@ -537,6 +536,10 @@

    <delete id="deleteMaterialLog" >
        delete from mm.material_log where operation_order_number=#{materialOutboundId}
    </delete>

    <delete id="deleteMaterialLogById" >
        delete from mm.material_log where id=#{id}
    </delete>

    <delete id="deleteReturningWarehouseDetail" >
@@ -584,11 +587,11 @@
    </select>

    <select id="getMaterialInventoryCount" >
        select count(*) from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
        select * from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
    </select>

    <select id="getMaterialInventoryCountNull" >
        select count(*) from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture is null
        select * from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture is null
    </select>

    <select id="getMaterialInventoryCountId" >
@@ -682,14 +685,14 @@
    </insert>

    <update id="updateMaterialInventoryAvailableOptOut">
        update mm.material_inventory
        set available_quantity=available_quantity-#{quantity}
        update pp.optimize_use
        set not_use_count=not_use_count-#{quantity}
        where id=#{useId}
    </update>

    <update id="updateMaterialInventoryAvailableOptInt">
        update mm.material_inventory
        set available_quantity=available_quantity+#{quantity}
        update pp.optimize_use
        set not_use_count=not_use_count+#{quantity}
        where id=#{useId}
    </update>

@@ -705,15 +708,27 @@
        where id=#{inventoryId}
    </update>

    <update id="updateMaterialInventoryInventoryOut">
    <update id="updateMaterialInventoryInventoryPlanQuantityOut">
        update mm.material_inventory
        set inventory_quantity=inventory_quantity-#{quantity},plan_quantity=if(plan_quantity-#{quantity}>=0,plan_quantity-#{quantity},0),total_area=inventory_quantity*single_piece_area
        where id=#{inventoryId}
    </update>

    <update id="updateMaterialInventoryInventoryInt">
    <update id="updateMaterialInventoryInventoryPlanQuantityInt">
        update mm.material_inventory
        set inventory_quantity=inventory_quantity+#{quantity},plan_quantity=plan_quantity+#{quantity},total_area=inventory_quantity*single_piece_area
        where id=#{inventoryId}
    </update>

    <update id="updateMaterialInventoryInventoryOut">
        update mm.material_inventory
        set inventory_quantity=inventory_quantity-#{quantity},total_area=inventory_quantity*single_piece_area
        where id=#{inventoryId}
    </update>

    <update id="updateMaterialInventoryInventoryInt">
        update mm.material_inventory
        set inventory_quantity=inventory_quantity+#{quantity},total_area=inventory_quantity*single_piece_area
        where id=#{inventoryId}
    </update>

@@ -726,6 +741,13 @@
    <update id="updateMaterialInventoryAvailableInventoryInt">
        update mm.material_inventory
        set available_quantity=available_quantity+#{quantity},inventory_quantity=inventory_quantity+#{quantity},total_area=inventory_quantity*single_piece_area
        where id=#{inventoryId}
    </update>

    <update id="updateMaterialInventoryAvailableInventoryOutMes">
        update mm.material_inventory
        set available_quantity=available_quantity-#{quantity},inventory_quantity=inventory_quantity-#{quantity},
            plan_quantity=plan_quantity-#{quantity},total_area=inventory_quantity*single_piece_area
        where id=#{inventoryId}
    </update>

@@ -761,7 +783,21 @@
        update mm.material_inventory set inventory_quantity=inventory_quantity+#{materialInventory.inventoryQuantity},
                                         available_quantity=available_quantity+#{materialInventory.inventoryQuantity},
                                         total_area=single_piece_area*inventory_quantity
        where  material_code=#{materialCode}
        where  material_code=#{materialCode} and date_of_manufacture is null
    </update>

    <update id="updateMaterialInventoryOut" >
        update mm.material_inventory set inventory_quantity=inventory_quantity-#{quantity},
                                         available_quantity=available_quantity-#{quantity},
                                         total_area=single_piece_area*inventory_quantity
        where  material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
    </update>

    <update id="updateMaterialInventoryNullOut" >
        update mm.material_inventory set inventory_quantity=inventory_quantity-#{quantity},
                                         available_quantity=available_quantity-#{quantity},
                                         total_area=single_piece_area*inventory_quantity
        where  material_code=#{materialCode} and date_of_manufacture is null
    </update>

    <update id="updateMaterialInventoryReturning" >
@@ -952,13 +988,13 @@
            </if>

            <if test="materialLog.inventoryId != null and materialLog.inventoryId != ''">
                and  ml.inventoryId regexp  #{materialLog.inventoryId}
                and  ml.inventory_id regexp  #{materialLog.inventoryId}
            </if>
            <if test="materialLog.materialCode != null and materialLog.materialCode != ''">
                and  ml.materialCode regexp  #{materialLog.materialCode}
                and  ml.material_code regexp  #{materialLog.materialCode}
            </if>
            <if test="materialLog.materialName != null and materialLog.materialName != ''">
                and  ml.materialName regexp  #{materialLog.materialName}
                and  ml.material_name regexp  #{materialLog.materialName}
            </if>
            <if test="materialLog.producer != null and materialLog.producer != ''">
                and  ml.producer regexp  #{materialLog.producer}
@@ -977,6 +1013,9 @@
            </if>
            <if test="materialLog.remarks != null and materialLog.remarks != ''">
                and ml.remarks regexp #{materialLog.remarksr}
            </if>
            <if test="materialLog.projectNo != null and materialLog.projectNo != ''">
                and ml.project_no regexp #{materialLog.projectNo}
            </if>
        </where>
        order by ml.id desc
@@ -1013,13 +1052,13 @@
            </if>

            <if test="materialLog.inventoryId != null and materialLog.inventoryId != ''">
                and  ml.inventoryId regexp  #{materialLog.inventoryId}
                and  ml.inventory_id regexp  #{materialLog.inventoryId}
            </if>
            <if test="materialLog.materialCode != null and materialLog.materialCode != ''">
                and  ml.materialCode regexp  #{materialLog.materialCode}
                and  ml.material_code regexp  #{materialLog.materialCode}
            </if>
            <if test="materialLog.materialName != null and materialLog.materialName != ''">
                and  ml.materialName regexp  #{materialLog.materialName}
                and  ml.material_name regexp  #{materialLog.materialName}
            </if>
            <if test="materialLog.producer != null and materialLog.producer != ''">
                and  ml.producer regexp  #{materialLog.producer}
@@ -1063,5 +1102,52 @@
        </where>
    </select>

    <select id="getSelectMaterialOutboundProjectNo">
        select * from mm.material_outbound mo where order_id=#{projectNo}
    </select>

    <select id="getSelectOptimizeUses">
        select * from pp.optimize_use  where project_no=#{projectNo} and width=#{width} and height=#{height} and state=1
    </select>

    <select id="getSelectMaterialOutboundOptimizeUses">
        select * from mm.material_outbound_detail mo
        <where>
            mo.material_outbound_id=#{materialOutboundId}
            <if test="useId != null">
               and mo.use_id=#{useId}
            </if>
        </where>
    </select>

    <update id="updateMaterialOutboundOptimizeUses">
        update mm.material_outbound_detail set outbound_quantity=outbound_quantity+#{quantity} where use_id=#{useId};
    </update>

    <update id="updateOptimizeUsesMes">
        update pp.optimize_use set not_use_count=not_use_count-#{quantity} where id=#{useId};
    </update>

    <insert id="insertMaterialOutboundDetailOptimizeUses"  useGeneratedKeys="true" >
        insert into mm.material_outbound_detail (material_outbound_id,material_outbound_number,material_code,use_id,inventory_id,inventory_organization,
                                                 outbound_quantity,single_piece_area,inventory_area,date_of_manufacture)
        values (
                   #{materialOutboundId} ,#{number},#{materialCode},#{useId},#{inventoryId},'原片库',#{outboundQuantity},
                   #{singlePieceArea},#{inventoryArea},#{dateOfManufacture}
               )
    </insert>

    <insert id="insertMaterialOutboundOptimizeUses"  useGeneratedKeys="true" >
        insert into mm.material_outbound(material_outbound_id,order_id,outbound_type,
                                         warehouse_manager,material_requisition_date,reviewed_state,reviewed,create_time,reviewed_time)
        values (
                   #{materialOutboundId} ,#{projectNo},'标准出库',#{name},now(),1,#{name},now(),now()
               )
    </insert>

    <select id="selectProjectNo">
        select project_no from pp.optimize_use where id=#{useId};
    </select>


</mapper>