From 3564d6d99aad47e58d9802fe710b482d9868aafa Mon Sep 17 00:00:00 2001 From: PQZ Date: Fri, 25 Oct 2024 17:53:28 +0800 Subject: [PATCH] 1 --- .../supplier/service/BaseSupplierService.java | 12 ++++-- .../service/impl/BaseSupplierServiceImpl.java | 27 +++++++++++- .../admin/DlRepairSoController.java | 42 +++++++++++++------ .../service/impl/DlRepairSoServiceImpl.java | 14 +++++++ 4 files changed, 78 insertions(+), 17 deletions(-) diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/supplier/service/BaseSupplierService.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/supplier/service/BaseSupplierService.java index 14561d3f..d1cdc73d 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/supplier/service/BaseSupplierService.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/supplier/service/BaseSupplierService.java @@ -1,6 +1,5 @@ package cn.iocoder.yudao.module.supplier.service; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.supplier.entity.BaseSupplier; import cn.iocoder.yudao.module.supplier.vo.BaseSupplierPageReqVO; import cn.iocoder.yudao.module.supplier.vo.BaseSupplierRespVO; @@ -9,8 +8,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import javax.validation.Valid; - /** * 供应商 Service 接口 * @@ -28,6 +25,15 @@ public interface BaseSupplierService extends IService { **/ void saveBaseSupplier(BaseSupplierSaveReqVO saveReqVO); + /** + * 生成采购单选择供应商 + * @author PQZ + * @date 17:43 2024/10/25 + * @param supplierName 供应商名称 + * @return java.lang.String + **/ + String appSaveSupplier(String supplierName); + /** * 删除供应商信息 * diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/supplier/service/impl/BaseSupplierServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/supplier/service/impl/BaseSupplierServiceImpl.java index efc297cb..e2c686ed 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/supplier/service/impl/BaseSupplierServiceImpl.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/supplier/service/impl/BaseSupplierServiceImpl.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.supplier.service.impl; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.supplier.entity.BaseSupplier; import cn.iocoder.yudao.module.supplier.entity.BaseSupplierAccount; import cn.iocoder.yudao.module.supplier.mapper.BaseSupplierMapper; @@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.supplier.service.BaseSupplierService; import cn.iocoder.yudao.module.supplier.vo.BaseSupplierPageReqVO; import cn.iocoder.yudao.module.supplier.vo.BaseSupplierRespVO; import cn.iocoder.yudao.module.supplier.vo.BaseSupplierSaveReqVO; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -51,6 +52,30 @@ public class BaseSupplierServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(BaseDO::getDeleted,0).eq(BaseSupplier::getName,supplierName); + List list = list(lambdaQueryWrapper); + if (!list.isEmpty()){ + //存在供应商 + return list.get(0).getId(); + } else { + BaseSupplier supplier = new BaseSupplier(); + supplier.setName(supplierName); + save(supplier); + return supplier.getId(); + } + } + /** * 删除供应商信息 diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/controller/admin/DlRepairSoController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/controller/admin/DlRepairSoController.java index b6d55a38..8a8ba885 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/controller/admin/DlRepairSoController.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/controller/admin/DlRepairSoController.java @@ -47,8 +47,8 @@ public class DlRepairSoController { * 采购单/领料单新增分页 * * @param repairSoReqVO 查询对象 - * @param pageNo 页码 - * @param pageSize 条数 + * @param pageNo 页码 + * @param pageSize 条数 * @author 小李 * @date 18:14 2024/9/14 **/ @@ -64,10 +64,10 @@ public class DlRepairSoController { /** * 采购单/领料单 作废 * + * @param repairSoReqVO 作废对象 * @author 小李 * @date 11:12 2024/9/18 - * @param repairSoReqVO 作废对象 - **/ + **/ @PostMapping("/void") @Operation(summary = "采购单/领料单 作废") public CommonResult voidRepairSo(@RequestBody DlRepairSoReqVO repairSoReqVO) { @@ -78,26 +78,26 @@ public class DlRepairSoController { /** * 采购单/领料单 查看 * + * @param id 主键 * @author 小李 * @date 9:34 2024/9/22 - * @param id 主键 - **/ + **/ @GetMapping("/get") @Operation(summary = "采购单/领料单 查看") - public CommonResult getRepairSoById(@RequestParam("id") String id){ + public CommonResult getRepairSoById(@RequestParam("id") String id) { return success(dlRepairSoService.getRepairSoById(id)); } /** * 员工确认领料 * + * @param id 单据ID 领料单主表 * @author 小李 * @date 11:58 2024/10/21 - * @param id 单据ID 领料单主表 - **/ + **/ @GetMapping("/confirmGet") @Operation(summary = "员工确认领料") - public CommonResult confirmGet(@RequestParam("id") String id){ + public CommonResult confirmGet(@RequestParam("id") String id) { dlRepairSoService.confirmGet(id); return CommonResult.ok(); } @@ -105,15 +105,31 @@ public class DlRepairSoController { /** * 员工确认退料 * + * @param id 退料单主表ID * @author 小李 * @date 19:41 2024/10/21 - * @param id 退料单主表ID - **/ + **/ @GetMapping("/confirmBack") @Operation(summary = "员工确认退料") - public CommonResult confirmBack(@RequestParam("id") String id){ + public CommonResult confirmBack(@RequestParam("id") String id) { dlRepairSoService.confirmBack(id); return CommonResult.ok(); } + + + /** + * 采购入库 + * + * @param repairSoReqVO DlRepairSoReqVO实体 + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult + * @author PQZ + * @date 10:43 2024/10/25 + **/ + @PostMapping("/inWare") + @Operation(summary = "采购入库") + public CommonResult inWare(@RequestBody DlRepairSoReqVO repairSoReqVO) { + dlRepairSoService.inWare(repairSoReqVO); + return CommonResult.ok(); + } } 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 44536258..e9051a1d 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 @@ -18,6 +18,7 @@ import cn.iocoder.yudao.module.stockOperate.service.DlRepairSoService; import cn.iocoder.yudao.module.stockOperate.service.DlRepairSoiService; import cn.iocoder.yudao.module.stockOperate.vo.DlRepairSoReqVO; import cn.iocoder.yudao.module.stockOperate.vo.DlRepairSoRespVO; +import cn.iocoder.yudao.module.supplier.service.BaseSupplierService; import cn.iocoder.yudao.module.system.api.dept.DeptApi; import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; @@ -36,6 +37,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -91,6 +93,8 @@ public class DlRepairSoServiceImpl extends ServiceImpl