Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2025-02-13 8974cc1b4719597a95f6abc11e22027dcae3d89f

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

 north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java

@@ -74,10 +74,10 @@
                    for (MaterialOutboundDetail materialOutboundDetail : materialOutboundDetailLists) {
                        //还原物料库存数
                        materialInventoryMapper.updateMaterialInventoryAvailableInt(materialOutboundDetail.getInventoryId(), materialOutboundDetail.getOutboundQuantity());
                        /*if(materialOutboundDetail.getUseId()!=null){
                        if(materialOutboundDetail.getUseId()!=null){
                            //还原优化工程库存数
                            materialInventoryMapper.updateMaterialInventoryAvailableOptInt(materialOutboundDetail.getUseId(), materialOutboundDetail.getOutboundQuantity());
                        }else{
                        }/*else{
                            //还原物料库存数
                            materialInventoryMapper.updateMaterialInventoryAvailableInt(materialOutboundDetail.getId(), materialOutboundDetail.getOutboundQuantity());
                        }*/
@@ -108,10 +108,10 @@
                        materialInventoryMapper.insertMaterialOutboundDetail(materialOutboundDetail, oddNumber, materialOutboundDetailMaximum + 1);
                        //修改物料库存表出库数量
                        materialInventoryMapper.updateMaterialInventoryAvailableOut(materialOutboundDetail.getId(), materialOutboundDetail.getOutboundQuantity());
                    /*if(materialOutboundDetail.getUseId()!=null){
                    if(materialOutboundDetail.getUseId()!=null){
                        //修改优化工程表出库数量
                        materialInventoryMapper.updateMaterialInventoryAvailableOptOut(materialOutboundDetail.getUseId(), materialOutboundDetail.getOutboundQuantity());
                    }else{
                    }/*else{
                        //修改物料库存表出库数量
                        materialInventoryMapper.updateMaterialInventoryAvailableOut(materialOutboundDetail.getId(), materialOutboundDetail.getOutboundQuantity());
                    }*/

 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,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,
        ou.not_use_count AS availableQuantity,
        ou.not_use_count AS planQuantity,
        mi.id,
        mi.inventory_organization as inventoryOrganization,
        mi.material_code AS materialCode,
@@ -247,7 +247,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 +281,6 @@
                and mo.reviewed regexp #{materialOutbound.reviewed}
            </if>
        </where>
        limit #{offset},#{pageSize};
    </select>


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

    <select id="getSelectMaterialOutbound">
@@ -422,6 +420,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 +510,6 @@
                and rwd.returning_id regexp #{returningWarehouseDetail.returningId}
            </if>
        </where>
        limit #{offset},#{pageSize};
    </select>


@@ -682,14 +680,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>