代码提交 bug解决

无关风月

2024-09-03 56dfe0d4bf81262622a1919cceb2b039fd356209

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java

@@ -127,9 +127,8 @@
                res.setType(1);
            }
            this.save(res);
            return inventoriesSupplies.getId().toString();
        }
        return null;
        return inventoriesSupplies.getId().toString();
    }

    @Override
@@ -153,14 +152,29 @@
            wrapper2.eq(ManagementGoodsMaterials::getDelFlag, 0);
            ManagementGoodsMaterials managementGoodsMaterials = managementGoodsMaterialsMapper.selectOne(wrapper2);
            if (managementGoodsMaterials!=null){
                long l = page.getZkNum() - page.getSuppliesNum();
                if (l>0){
                SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(managementGoodsMaterials.getGoodsMaterialsId());
                if (slGoodsMaterials.getIsConsume() == 1){
                    // 非消耗品
                    long l = page.getZkNum() - page.getSuppliesNum();
                    if (l>0){
                        managementGoodsMaterials.setRepertoryZhai(page.getSuppliesNum());
                        Integer repertoryYishi = managementGoodsMaterials.getRepertoryYishi();
                        if (repertoryYishi!=null&& repertoryYishi!=0){
                            managementGoodsMaterials.setRepertoryYishi(repertoryYishi+(Integer.valueOf(String.valueOf(l))));
                        }else{
                            managementGoodsMaterials.setRepertoryYishi(Integer.valueOf(String.valueOf(l)));
                        }
                    }else if (l<0){
                        // 盘点数量大于在库数量 清零遗失数量
                        managementGoodsMaterials.setRepertoryZhai(page.getSuppliesNum());
                        managementGoodsMaterials.setRepertoryYishi(0);
                    }
                    managementGoodsMaterials.setCheckNum(Integer.valueOf(String.valueOf(page.getSuppliesNum())));
                    managementGoodsMaterialsMapper.updateById(managementGoodsMaterials);
                }else{
                    // 消耗品不计算遗失 更新在库数量即可
                    managementGoodsMaterials.setRepertoryZhai(page.getSuppliesNum());
                }else if (l<0){
                    managementGoodsMaterials.setRepertoryYishi(Integer.valueOf(String.valueOf(l)));
                }
                managementGoodsMaterials.setCheckNum(Integer.valueOf(String.valueOf(page.getSuppliesNum())));
                managementGoodsMaterialsMapper.updateById(managementGoodsMaterials);
            }
        }