From 0797e13704665c3de6f45d9a9819052bbde10ef7 Mon Sep 17 00:00:00 2001 From: xiaofajia <1665375861@qq.com> Date: Thu, 28 Nov 2024 17:23:17 +0800 Subject: [PATCH] =?UTF-8?q?11.22=E6=89=80=E6=8F=90PC=E6=96=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=9A=82=E4=B8=8D=E5=8F=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/DlRepairSoiController.java | 2 +- .../mapper/DlRepairSoiMapper.java | 2 +- .../service/impl/DlRepairSoServiceImpl.java | 33 ------------ .../service/impl/DlRepairSoiServiceImpl.java | 4 +- .../mapper/stockOperate/DlRepairSoiMapper.xml | 52 +++++++++++++------ 5 files changed, 39 insertions(+), 54 deletions(-) diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/controller/admin/DlRepairSoiController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/controller/admin/DlRepairSoiController.java index aad77af5..e6d1fc2b 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/controller/admin/DlRepairSoiController.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/controller/admin/DlRepairSoiController.java @@ -91,7 +91,7 @@ public class DlRepairSoiController{ } /** - * 根据供应商查询该供应商采购过的配件 + * 根据供应商查询该供应商采购过的配件 分页 * * @author 小李 * @date 11:49 2024/11/28 diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/mapper/DlRepairSoiMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/mapper/DlRepairSoiMapper.java index 9bb185c6..7666f785 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/mapper/DlRepairSoiMapper.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/mapper/DlRepairSoiMapper.java @@ -44,7 +44,7 @@ public interface DlRepairSoiMapper extends BaseMapper { * @date 11:49 2024/11/28 * @param reqVO 查询对象 **/ - IPage getSoBySupplier(@Param("map") DlRepairSoiReqVO reqVO, Page page); + IPage getSoBySupplier(@Param("map") DlRepairSoiReqVO reqVO, Page page); } 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 8ff125c7..4d2c4e06 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 @@ -121,14 +121,6 @@ public class DlRepairSoServiceImpl extends ServiceImpl { -// if (item.getGoodsPrice() == null){ -// throw exception0(500, "有配件未设置进价"); -// } -// }); -// } //保存供应商 if (StringUtils.isEmpty(repairSoRespVO.getSupplierId())) { //采购单中录入供应商或无供应商情况 @@ -164,7 +156,6 @@ public class DlRepairSoServiceImpl extends ServiceImpl { item.setSoId(repairSoRespVO.getId()); -// item.setSoiType(repairSoRespVO.getSoType()); }); repairSoiService.saveBatch(repairSoRespVO.getGoodsList()); @@ -172,30 +163,6 @@ 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); -// } } /** diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoiServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoiServiceImpl.java index 028c2d4f..876e823e 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoiServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoiServiceImpl.java @@ -177,9 +177,7 @@ public class DlRepairSoiServiceImpl extends ServiceImpl getSoBySupplier(DlRepairSoiReqVO reqVO, Page page){ - IPage repairSoiIPage = baseMapper.getSoBySupplier(reqVO, page); -// TODO - return null; + return baseMapper.getSoBySupplier(reqVO, page); } } diff --git a/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoiMapper.xml b/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoiMapper.xml index 2a09c976..4211421c 100644 --- a/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoiMapper.xml +++ b/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoiMapper.xml @@ -149,24 +149,44 @@ - + select drsi.*, + drw.id AS wares_id, + drw.bar_code, + drw.code, + drw.name, + drw.model, + drw.price, + drw.pur_price, + drw.type, + drw.unit, + drw.warehouse, + drw.mini_stock, + drw.max_stock, + drw.stock, + drw.img, + drw.attribute, + drw.corp_id, + drw.cover_img, + drw.car_model, + drw.remark AS wares_remark, + drw.status, + drw.data_form from dl_repair_soi drsi join dl_repair_so drs on drsi.so_id = drs.id join dl_repair_wares drw on drsi.goods_id = drw.id - - - and drs.supplier_id = #{map.supplierId} - - - and ( - drw.name like concat('%', #{map.query}, '%') - or - drw.code like concat('%', #{map.query}, '%') - or - drw.model like concat('%', #{map.query}, '%') - ) - - + where drs.so_type = '02' + + and drs.supplier_id = #{map.supplierId} + + + and ( + drw.name like concat('%', #{map.query}, '%') + or + drw.code like concat('%', #{map.query}, '%') + or + drw.model like concat('%', #{map.query}, '%') + ) +