blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2025-03-05 e7b7ffed9be4ce118d52e20a6f26a4ac9718eaef 
 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml


@@ -62,7 +62,6 @@




        </where>


        order by mi.id desc


        limit #{offset},#{pageSize};


    </select>




    <select id="getSelectMaterialInventoryDatePageTotal">


@@ -75,7 +74,6 @@


                 and mi.available_quantity>0




        </where>


        limit #{offset},#{pageSize};


    </select>






@@ -84,8 +82,8 @@


        ou.id as useId,


        ou.project_no as projectNo,


        mi.inventory_quantity AS inventoryQuantity,


        mi.plan_quantity AS availableQuantity,


        mi.plan_quantity AS planQuantity,


        mi.available_quantity AS availableQuantity,


        ou.not_use_count AS planQuantity,


        mi.id,


        mi.inventory_organization as inventoryOrganization,


        mi.material_code AS materialCode,


@@ -102,26 +100,22 @@


        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


            date(ou.create_time)>=#{startDate} and date(ou.create_time) &lt;= #{endDate}


            ou.not_use_count>0 and mi.plan_quantity>0 and op.state>=100 and ou.state=1




        </where>


        order by ou.id desc


        limit #{offset},#{pageSize};


    </select>




    <select id="getSelectMaterialInventoryEngineeringDatePageTotal">


        select


        CEILING(count(id)/#{pageSize}) as 'pageTotal',


        count(id) as 'total'


        from


        pp.optimize_use ou


        CEILING(count(ou.id)/#{pageSize}) as 'pageTotal',


        count(ou.id) as 'total'


        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>


            ou.not_use_count>0 and ou.state=1 and


            date(ou.create_time)>=#{startDate} and date(ou.create_time) &lt;= #{endDate}


            mi.plan_quantity>0 and op.state>=100 and ou.state=1




        </where>


        limit #{offset},#{pageSize};


    </select>






@@ -154,7 +148,6 @@


            </if>




        </where>


        limit #{offset},#{pageSize};


    </select>




    <select id="getSelectMaterialInventoryPageTotal">


@@ -170,7 +163,6 @@




        </where>




        limit #{offset},#{pageSize};


    </select>




    <select id="getSelectMaterialInventoryEngineering">


@@ -178,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,


@@ -205,7 +198,6 @@




        </where>




        limit #{offset},#{pageSize};


    </select>




    <select id="getSelectMaterialInventoryEngineeringPageTotal">


@@ -224,7 +216,6 @@




        </where>




        limit #{offset},#{pageSize};


    </select>






@@ -257,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>




@@ -291,7 +282,6 @@


                and mo.reviewed regexp #{materialOutbound.reviewed}


            </if>


        </where>


        limit #{offset},#{pageSize};


    </select>






@@ -373,7 +363,6 @@


                and rw.batch regexp #{returningWarehouse.batch}


            </if>


        </where>


        limit #{offset},#{pageSize};


    </select>




    <select id="getSelectMaterialOutbound">


@@ -428,11 +417,11 @@


                and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}


            </if>


        </where>


        limit #{offset},#{pageSize};


    </select>




    <select id="getSelectMaterialOutboundEngineering" >


        select


        ou.id as useId,


        ou.project_no as  projectNo,


        modd.inventory_id as id,


        modd.inventory_organization as inventoryOrganization,


@@ -459,7 +448,6 @@


                and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}


            </if>


        </where>


        limit #{offset},#{pageSize};


    </select>




    <select id="getSelectMaterialOutboundDetailPageTotal">


@@ -473,7 +461,6 @@


                and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}


            </if>


        </where>


        limit #{offset},#{pageSize};


    </select>






@@ -511,7 +498,6 @@


                and rwd.returning_id regexp #{returningWarehouseDetail.returningId}


            </if>


        </where>


        limit #{offset},#{pageSize};


    </select>




    <select id="getSelectReturningWarehouseDetailPageTotal">


@@ -525,7 +511,6 @@


                and rwd.returning_id regexp #{returningWarehouseDetail.returningId}


            </if>


        </where>


        limit #{offset},#{pageSize};


    </select>






@@ -696,14 +681,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>




@@ -740,6 +725,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>




@@ -966,13 +958,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}


@@ -991,6 +983,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


@@ -1027,13 +1022,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}


@@ -1077,5 +1072,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>