diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java index f4cef3dc..39eefd48 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java @@ -163,29 +163,34 @@ public class DlRepairSoServiceImpl extends ServiceImpl waresList = repairSoRespVO.getWaresList(); + waresService.updateBatchById(waresList); + + // 操作配件库存表---应该是弃用了 // 获取所有需要操作的数据----生成采购单的时候,不直接操作库存,放到下面的inWares方法去操作 - if (repairSoRespVO.getSoType() != null && !repairSoRespVO.getSoType().equals("01")){ - List goodsList = repairSoRespVO.getGoodsList(); - List ids = goodsList.stream().map(DlRepairSoi::getGoodsId).collect(Collectors.toList()); - List repairWares = waresService.listByIds(ids); - // 更新库存和进价 - List newWares = repairWares.stream().map(item -> { - // 取数据 - DlRepairSoi repairSoi = goodsList.stream().filter(i -> i.getGoodsId().equals(item.getId())).collect(Collectors.toList()).get(0); - // 设置新值 - // 如果是采购入库,数量+,如果是领料出库,数量- - // 01, 03 是采购 02 是领料 - BigDecimal count = new BigDecimal(repairSoi.getGoodsCount()); - RepairWares wares = new RepairWares(); - wares.setId(item.getId()); - wares.setStock("02".equals(repairSoRespVO.getSoType()) ? item.getStock().subtract(count) : item.getStock().add(count)); - // 更新进价 - wares.setPurPrice(repairSoi.getGoodsPrice()); - return wares; - }).collect(Collectors.toList()); - waresService.updateBatchById(newWares); - } +// if (repairSoRespVO.getSoType() != null && !repairSoRespVO.getSoType().equals("01")){ +// List goodsList = repairSoRespVO.getGoodsList(); +// List ids = goodsList.stream().map(DlRepairSoi::getGoodsId).collect(Collectors.toList()); +// List repairWares = waresService.listByIds(ids); +// // 更新库存和进价 +// List newWares = repairWares.stream().map(item -> { +// // 取数据 +// DlRepairSoi repairSoi = goodsList.stream().filter(i -> i.getGoodsId().equals(item.getId())).collect(Collectors.toList()).get(0); +// // 设置新值 +// // 如果是采购入库,数量+,如果是领料出库,数量- +// // 01, 03 是采购 02 是领料 +// BigDecimal count = new BigDecimal(repairSoi.getGoodsCount()); +// RepairWares wares = new RepairWares(); +// wares.setId(item.getId()); +// wares.setStock("02".equals(repairSoRespVO.getSoType()) ? item.getStock().subtract(count) : item.getStock().add(count)); +// // 更新进价 +// wares.setPurPrice(repairSoi.getGoodsPrice()); +// return wares; +// }).collect(Collectors.toList()); +// waresService.updateBatchById(newWares); +// } } /** diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoRespVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoRespVO.java index da624f9d..ef28aff8 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoRespVO.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoRespVO.java @@ -18,4 +18,7 @@ public class DlRepairSoRespVO extends DlRepairSo { // 商品List private List goodsList; + + // 配件List + private List waresList; }