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


@@ -172,6 +172,7 @@


        mi.inventory_quantity AS inventoryQuantity,


        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,


@@ -957,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}


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


@@ -1018,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}


@@ -1086,13 +1090,13 @@


        </where>


    </select>




    <select id="updateMaterialOutboundOptimizeUses">


    <update id="updateMaterialOutboundOptimizeUses">


        update mm.material_outbound_detail set outbound_quantity=outbound_quantity+#{quantity} where use_id=#{useId};


    </select>


    </update>




    <select id="updateOptimizeUsesMes">


    <update id="updateOptimizeUsesMes">


        update pp.optimize_use set not_use_count=not_use_count-#{quantity} where id=#{useId};


    </select>


    </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,


@@ -1111,5 +1115,9 @@


               )


    </insert>




    <select id="selectProjectNo">


        select project_no from pp.optimize_use where id=#{useId};


    </select>






</mapper>