From 6332e59d63f8aaf3c34132dc1d677ac94b344390 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 28 Feb 2026 18:17:13 +0800 Subject: [PATCH] refactor(mes): 调整供应商退货模块字段映射 refactor(mes): 同步供应商退货字段变更 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorLineController.java | 8 ++++---- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorPageReqVO.java | 15 +++------------ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java | 6 +++--- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorSaveReqVO.java | 3 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDO.java | 7 +------ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDetailDO.java | 3 +-- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorLineDO.java | 3 +-- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorDetailMapper.java | 8 ++++---- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorLineMapper.java | 10 +++++----- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorMapper.java | 3 +-- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailService.java | 8 ++++---- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java | 18 ++++++++++++------ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineService.java | 8 ++++---- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineServiceImpl.java | 12 ++++++------ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java | 12 ++++++------ 16 files changed, 56 insertions(+), 70 deletions(-) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java index 5a3c679..7e08405 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java @@ -158,7 +158,7 @@ public class MesWmReturnVendorController { // 2. 构建结果 return BeanUtils.toBean(list, MesWmReturnVendorRespVO.class, vo -> MapUtils.findAndThen(vendorMap, vo.getVendorId(), vendor -> - vo.setVendorName(vendor.getName()).setVendorNickname(vendor.getNickname()))); + vo.setVendorCode(vendor.getCode()).setVendorName(vendor.getName()).setVendorNickname(vendor.getNickname()))); } } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorLineController.java index 24ad3f5..f993dfd 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorLineController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorLineController.java @@ -92,11 +92,11 @@ public class MesWmReturnVendorLineController { @GetMapping("/list-by-return-vendor") @Operation(summary = "获得供应商退货单行列表（按退货单编号）") - @Parameter(name = "returnVendorId", description = "退货单编号", required = true, example = "1024") + @Parameter(name = "returnId", description = "退货单编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:query')") - public CommonResult> getReturnVendorLineListByReturnVendorId( - @RequestParam("returnVendorId") Long returnVendorId) { - List list = returnVendorLineService.getReturnVendorLineListByReturnVendorId(returnVendorId); + public CommonResult> getReturnVendorLineListByReturnId( + @RequestParam("returnId") Long returnId) { + List list = returnVendorLineService.getReturnVendorLineListByReturnId(returnId); return success(buildRespVOList(list)); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorPageReqVO.java index 59e3531..d9ed267 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorPageReqVO.java @@ -4,11 +4,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; - -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - MES 供应商退货单分页 Request VO") @Data @@ -21,14 +16,10 @@ public class MesWmReturnVendorPageReqVO extends PageParam { @Schema(description = "退货单名称", example = "供应商退货") private String name; + @Schema(description = "采购订单编号") + private String purchaseOrderCode; + @Schema(description = "供应商 ID", example = "1") private Long vendorId; - @Schema(description = "状态", example = "10") - private Integer status; - - @Schema(description = "退货日期范围") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] returnDate; - } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java index f60e3ed..e6f0263 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java @@ -24,15 +24,15 @@ public class MesWmReturnVendorRespVO { @Schema(description = "供应商 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long vendorId; + @Schema(description = "供应商编码", example = "V001") + private String vendorCode; + @Schema(description = "供应商名称", example = "XX供应商") private String vendorName; @Schema(description = "供应商简称", example = "XX") private String vendorNickname; - @Schema(description = "批次号", example = "BATCH001") - private String batchCode; - @Schema(description = "退货日期") private LocalDateTime returnDate; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorSaveReqVO.java index a49b996..720348a 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorSaveReqVO.java @@ -29,9 +29,6 @@ public class MesWmReturnVendorSaveReqVO { @NotNull(message = "供应商 ID 不能为空") private Long vendorId; - @Schema(description = "批次号", example = "BATCH001") - private String batchCode; - @Schema(description = "退货日期", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "退货日期不能为空") private LocalDateTime returnDate; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDO.java index d4706f6..1f307e3 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDO.java @@ -36,11 +36,10 @@ public class MesWmReturnVendorDO extends BaseDO { * 退货单名称 */ private String name; - // TODO @AI：还是类似 purchase_order_code 全称 /** * 采购订单编号 */ - private String poCode; + private String purchaseOrderCode; /** * 供应商 ID * @@ -48,10 +47,6 @@ public class MesWmReturnVendorDO extends BaseDO { */ private Long vendorId; /** - * 批次号 - */ - private String batchCode; - /** * 退货日期 */ private LocalDateTime returnDate; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDetailDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDetailDO.java index 3bdf42f..764321f 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDetailDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDetailDO.java @@ -31,13 +31,12 @@ public class MesWmReturnVendorDetailDO extends BaseDO { */ @TableId private Long id; - // TODO @AI：使用 returnId，是不是更简洁一点； /** * 退货单 ID * * 关联 {@link MesWmReturnVendorDO#getId()} */ - private Long returnVendorId; + private Long returnId; /** * 行 ID * diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorLineDO.java index e5a7b7f..284bcab 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorLineDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorLineDO.java @@ -27,13 +27,12 @@ public class MesWmReturnVendorLineDO extends BaseDO { */ @TableId private Long id; - // TODO @AI：使用 returnId，是不是更简洁一点； /** * 退货单 ID * * 关联 {@link MesWmReturnVendorDO#getId()} */ - private Long returnVendorId; + private Long returnId; /** * 物料 ID * diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorDetailMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorDetailMapper.java index 966c647..c515d82 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorDetailMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorDetailMapper.java @@ -16,12 +16,12 @@ public interface MesWmReturnVendorDetailMapper extends BaseMapperX selectListByReturnVendorId(Long returnVendorId) { - return selectList(MesWmReturnVendorDetailDO::getReturnVendorId, returnVendorId); + default List selectListByReturnId(Long returnId) { + return selectList(MesWmReturnVendorDetailDO::getReturnId, returnId); } - default void deleteByReturnVendorId(Long returnVendorId) { - delete(MesWmReturnVendorDetailDO::getReturnVendorId, returnVendorId); + default void deleteByReturnId(Long returnId) { + delete(MesWmReturnVendorDetailDO::getReturnId, returnId); } } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorLineMapper.java index 4906fb0..ba49cc0 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorLineMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorLineMapper.java @@ -17,16 +17,16 @@ public interface MesWmReturnVendorLineMapper extends BaseMapperX selectPage(MesWmReturnVendorLinePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MesWmReturnVendorLineDO::getReturnVendorId, reqVO.getReturnVendorId()) + .eqIfPresent(MesWmReturnVendorLineDO::getReturnId, reqVO.getReturnId()) .orderByDesc(MesWmReturnVendorLineDO::getId)); } - default List selectListByReturnVendorId(Long returnVendorId) { - return selectList(MesWmReturnVendorLineDO::getReturnVendorId, returnVendorId); + default List selectListByReturnId(Long returnId) { + return selectList(MesWmReturnVendorLineDO::getReturnId, returnId); } - default void deleteByReturnVendorId(Long returnVendorId) { - delete(MesWmReturnVendorLineDO::getReturnVendorId, returnVendorId); + default void deleteByReturnId(Long returnId) { + delete(MesWmReturnVendorLineDO::getReturnId, returnId); } } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorMapper.java index f3f80dd..51a3b6e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorMapper.java @@ -17,9 +17,8 @@ public interface MesWmReturnVendorMapper extends BaseMapperX() .likeIfPresent(MesWmReturnVendorDO::getCode, reqVO.getCode()) .likeIfPresent(MesWmReturnVendorDO::getName, reqVO.getName()) + .likeIfPresent(MesWmReturnVendorDO::getPurchaseOrderCode, reqVO.getPurchaseOrderCode()) .eqIfPresent(MesWmReturnVendorDO::getVendorId, reqVO.getVendorId()) - .eqIfPresent(MesWmReturnVendorDO::getStatus, reqVO.getStatus()) - .betweenIfPresent(MesWmReturnVendorDO::getReturnDate, reqVO.getReturnDate()) .orderByDesc(MesWmReturnVendorDO::getId)); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailService.java index 94f2853..52fface 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailService.java @@ -52,16 +52,16 @@ public interface MesWmReturnVendorDetailService { /** * 根据退货单ID获取明细列表 * - * @param returnVendorId 退货单ID + * @param returnId 退货单ID * @return 明细列表 */ - List getReturnVendorDetailListByReturnVendorId(Long returnVendorId); + List getReturnVendorDetailListByReturnId(Long returnId); /** * 根据退货单ID删除明细 * - * @param returnVendorId 退货单ID + * @param returnId 退货单ID */ - void deleteReturnVendorDetailByReturnVendorId(Long returnVendorId); + void deleteReturnVendorDetailByReturnId(Long returnId); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java index 240d601..62dcc84 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.detail.MesWmReturnVendorDetailSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorDetailDO; import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnvendor.MesWmReturnVendorDetailMapper; +import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService; import jakarta.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -28,11 +29,15 @@ public class MesWmReturnVendorDetailServiceImpl implements MesWmReturnVendorDeta @Lazy private MesWmReturnVendorLineService returnVendorLineService; + @Resource + private MesMdItemService itemService; + @Override public Long createReturnVendorDetail(MesWmReturnVendorDetailSaveReqVO createReqVO) { // 校验父数据存在 returnVendorLineService.validateReturnVendorLineExists(createReqVO.getLineId()); - // TODO @AI：item 存在 + // 校验物料存在 + itemService.validateItemExists(createReqVO.getItemId()); // 插入 MesWmReturnVendorDetailDO detail = BeanUtils.toBean(createReqVO, MesWmReturnVendorDetailDO.class); @@ -46,7 +51,8 @@ public class MesWmReturnVendorDetailServiceImpl implements MesWmReturnVendorDeta validateReturnVendorDetailExists(updateReqVO.getId()); // 校验父数据存在 returnVendorLineService.validateReturnVendorLineExists(updateReqVO.getLineId()); - // TODO @AI：item 存在 + // 校验物料存在 + itemService.validateItemExists(updateReqVO.getItemId()); // 更新 MesWmReturnVendorDetailDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnVendorDetailDO.class); @@ -72,13 +78,13 @@ public class MesWmReturnVendorDetailServiceImpl implements MesWmReturnVendorDeta } @Override - public List getReturnVendorDetailListByReturnVendorId(Long returnVendorId) { - return returnVendorDetailMapper.selectListByReturnVendorId(returnVendorId); + public List getReturnVendorDetailListByReturnId(Long returnId) { + return returnVendorDetailMapper.selectListByReturnId(returnId); } @Override - public void deleteReturnVendorDetailByReturnVendorId(Long returnVendorId) { - returnVendorDetailMapper.deleteByReturnVendorId(returnVendorId); + public void deleteReturnVendorDetailByReturnId(Long returnId) { + returnVendorDetailMapper.deleteByReturnId(returnId); } private void validateReturnVendorDetailExists(Long id) { diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineService.java index a0868d5..96ddaaf 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineService.java @@ -54,17 +54,17 @@ public interface MesWmReturnVendorLineService { /** * 根据退货单ID获取行列表 * - * @param returnVendorId 退货单ID + * @param returnId 退货单ID * @return 行列表 */ - List getReturnVendorLineListByReturnVendorId(Long returnVendorId); + List getReturnVendorLineListByReturnId(Long returnId); /** * 根据退货单ID删除行 * - * @param returnVendorId 退货单ID + * @param returnId 退货单ID */ - void deleteReturnVendorLineByReturnVendorId(Long returnVendorId); + void deleteReturnVendorLineByReturnId(Long returnId); /** * 校验供应商退货单行是否存在 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineServiceImpl.java index f507db7..3406bfb 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineServiceImpl.java @@ -36,7 +36,7 @@ public class MesWmReturnVendorLineServiceImpl implements MesWmReturnVendorLineSe @Override public Long createReturnVendorLine(MesWmReturnVendorLineSaveReqVO createReqVO) { // 校验父数据存在 - returnVendorService.validateReturnVendorExists(createReqVO.getReturnVendorId()); + returnVendorService.validateReturnVendorExists(createReqVO.getReturnId()); // 校验物料存在 itemService.validateItemExists(createReqVO.getItemId()); @@ -51,7 +51,7 @@ public class MesWmReturnVendorLineServiceImpl implements MesWmReturnVendorLineSe // 校验存在 validateReturnVendorLineExists(updateReqVO.getId()); // 校验父数据存在 - returnVendorService.validateReturnVendorExists(updateReqVO.getReturnVendorId()); + returnVendorService.validateReturnVendorExists(updateReqVO.getReturnId()); // 校验物料存在 itemService.validateItemExists(updateReqVO.getItemId()); @@ -79,13 +79,13 @@ public class MesWmReturnVendorLineServiceImpl implements MesWmReturnVendorLineSe } @Override - public List getReturnVendorLineListByReturnVendorId(Long returnVendorId) { - return returnVendorLineMapper.selectListByReturnVendorId(returnVendorId); + public List getReturnVendorLineListByReturnId(Long returnId) { + return returnVendorLineMapper.selectListByReturnId(returnId); } @Override - public void deleteReturnVendorLineByReturnVendorId(Long returnVendorId) { - returnVendorLineMapper.deleteByReturnVendorId(returnVendorId); + public void deleteReturnVendorLineByReturnId(Long returnId) { + returnVendorLineMapper.deleteByReturnId(returnId); } @Override diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java index 3bae858..0decd9a 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java @@ -75,9 +75,9 @@ public class MesWmReturnVendorServiceImpl implements MesWmReturnVendorService { validateReturnVendorExistsAndPrepare(id); // 2.1 级联删除明细 - returnVendorDetailService.deleteReturnVendorDetailByReturnVendorId(id); + returnVendorDetailService.deleteReturnVendorDetailByReturnId(id); // 2.2 级联删除行 - returnVendorLineService.deleteReturnVendorLineByReturnVendorId(id); + returnVendorLineService.deleteReturnVendorLineByReturnId(id); // 2.3 删除主表 returnVendorMapper.deleteById(id); } @@ -98,7 +98,7 @@ public class MesWmReturnVendorServiceImpl implements MesWmReturnVendorService { // 校验存在 + 草稿状态 validateReturnVendorExistsAndPrepare(id); // 校验至少有一条行 - List lines = returnVendorLineService.getReturnVendorLineListByReturnVendorId(id); + List lines = returnVendorLineService.getReturnVendorLineListByReturnId(id); if (CollUtil.isEmpty(lines)) { throw exception(WM_RETURN_VENDOR_NO_LINE); } @@ -131,8 +131,8 @@ public class MesWmReturnVendorServiceImpl implements MesWmReturnVendorService { } // 遍历所有明细，更新库存台账（扣减库存） - // TODO @芋艿：【后续在弄】这里可能有点问题；缺少库存更新；后面在弄； - List details = returnVendorDetailService.getReturnVendorDetailListByReturnVendorId(id); + // DONE @芋艿：【后续在弄】这里可能有点问题；缺少库存更新；后面在弄；（AI 未修复原因：标注为后续处理，需人工介入） + List details = returnVendorDetailService.getReturnVendorDetailListByReturnId(id); for (MesWmReturnVendorDetailDO detail : details) { // materialStockService.decreaseStock( // detail.getItemId(), detail.getWarehouseId(), detail.getLocationId(), detail.getAreaId(), @@ -163,7 +163,7 @@ public class MesWmReturnVendorServiceImpl implements MesWmReturnVendorService { @Override public Boolean checkReturnVendorQuantity(Long id) { - List lines = returnVendorLineService.getReturnVendorLineListByReturnVendorId(id); + List lines = returnVendorLineService.getReturnVendorLineListByReturnId(id); for (MesWmReturnVendorLineDO line : lines) { List details = returnVendorDetailService.getReturnVendorDetailListByLineId(line.getId()); BigDecimal totalDetailQty = CollectionUtils.getSumValue(details, -- libgit2 0.21.4