refactor(mes): 调整供应商退货模块字段映射

refactor(mes): 同步供应商退货字段变更

refactor(mes): 调整供应商退货模块字段映射
refactor(mes): 同步供应商退货字段变更
YunaiV
1 parent 8a04f0ba
Showing 16 changed files with 56 additions and 70 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorLineController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorPageReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDetailDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorLineDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorDetailMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorLineMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.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())));
     }
 }
@@ -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<List<MesWmReturnVendorLineRespVO>> getReturnVendorLineListByReturnVendorId(
-            @RequestParam("returnVendorId") Long returnVendorId) {
-        List<MesWmReturnVendorLineDO> list = returnVendorLineService.getReturnVendorLineListByReturnVendorId(returnVendorId);
+    public CommonResult<List<MesWmReturnVendorLineRespVO>> getReturnVendorLineListByReturnId(
+            @RequestParam("returnId") Long returnId) {
+        List<MesWmReturnVendorLineDO> list = returnVendorLineService.getReturnVendorLineListByReturnId(returnId);
         return success(buildRespVOList(list));
     }
@@ -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;
-
 }
@@ -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;
@@ -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;
@@ -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;
@@ -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
      *
@@ -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
      *
@@ -16,12 +16,12 @@ public interface MesWmReturnVendorDetailMapper extends BaseMapperX&lt;MesWmReturnVe
         return selectList(MesWmReturnVendorDetailDO::getLineId, lineId);
     }
-    default List<MesWmReturnVendorDetailDO> selectListByReturnVendorId(Long returnVendorId) {
-        return selectList(MesWmReturnVendorDetailDO::getReturnVendorId, returnVendorId);
+    default List<MesWmReturnVendorDetailDO> 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);
     }
 }
@@ -17,16 +17,16 @@ public interface MesWmReturnVendorLineMapper extends BaseMapperX&lt;MesWmReturnVend
     default PageResult<MesWmReturnVendorLineDO> selectPage(MesWmReturnVendorLinePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<MesWmReturnVendorLineDO>()
-                .eqIfPresent(MesWmReturnVendorLineDO::getReturnVendorId, reqVO.getReturnVendorId())
+                .eqIfPresent(MesWmReturnVendorLineDO::getReturnId, reqVO.getReturnId())
                 .orderByDesc(MesWmReturnVendorLineDO::getId));
     }
-    default List<MesWmReturnVendorLineDO> selectListByReturnVendorId(Long returnVendorId) {
-        return selectList(MesWmReturnVendorLineDO::getReturnVendorId, returnVendorId);
+    default List<MesWmReturnVendorLineDO> 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);
     }
 }
@@ -17,9 +17,8 @@ public interface MesWmReturnVendorMapper extends BaseMapperX&lt;MesWmReturnVendorDO
         return selectPage(reqVO, new LambdaQueryWrapperX<MesWmReturnVendorDO>()
                 .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));
     }
@@ -52,16 +52,16 @@ public interface MesWmReturnVendorDetailService {
     /**
      * 根据退货单ID获取明细列表
      *
-     * @param returnVendorId 退货单ID
+     * @param returnId 退货单ID
      * @return 明细列表
      */
-    List<MesWmReturnVendorDetailDO> getReturnVendorDetailListByReturnVendorId(Long returnVendorId);
+    List<MesWmReturnVendorDetailDO> getReturnVendorDetailListByReturnId(Long returnId);
     /**
      * 根据退货单ID删除明细
      *
-     * @param returnVendorId 退货单ID
+     * @param returnId 退货单ID
      */
-    void deleteReturnVendorDetailByReturnVendorId(Long returnVendorId);
+    void deleteReturnVendorDetailByReturnId(Long returnId);
 }
@@ -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<MesWmReturnVendorDetailDO> getReturnVendorDetailListByReturnVendorId(Long returnVendorId) {
-        return returnVendorDetailMapper.selectListByReturnVendorId(returnVendorId);
+    public List<MesWmReturnVendorDetailDO> 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) {
@@ -54,17 +54,17 @@ public interface MesWmReturnVendorLineService {
     /**
      * 根据退货单ID获取行列表
      *
-     * @param returnVendorId 退货单ID
+     * @param returnId 退货单ID
      * @return 行列表
      */
-    List<MesWmReturnVendorLineDO> getReturnVendorLineListByReturnVendorId(Long returnVendorId);
+    List<MesWmReturnVendorLineDO> getReturnVendorLineListByReturnId(Long returnId);
     /**
      * 根据退货单ID删除行
      *
-     * @param returnVendorId 退货单ID
+     * @param returnId 退货单ID
      */
-    void deleteReturnVendorLineByReturnVendorId(Long returnVendorId);
+    void deleteReturnVendorLineByReturnId(Long returnId);
     /**
      * 校验供应商退货单行是否存在
@@ -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<MesWmReturnVendorLineDO> getReturnVendorLineListByReturnVendorId(Long returnVendorId) {
-        return returnVendorLineMapper.selectListByReturnVendorId(returnVendorId);
+    public List<MesWmReturnVendorLineDO> 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
@@ -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<MesWmReturnVendorLineDO> lines = returnVendorLineService.getReturnVendorLineListByReturnVendorId(id);
+        List<MesWmReturnVendorLineDO> 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<MesWmReturnVendorDetailDO> details = returnVendorDetailService.getReturnVendorDetailListByReturnVendorId(id);
+        // DONE @芋艿：【后续在弄】这里可能有点问题；缺少库存更新；后面在弄；（AI 未修复原因：标注为后续处理，需人工介入）
+        List<MesWmReturnVendorDetailDO> 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<MesWmReturnVendorLineDO> lines = returnVendorLineService.getReturnVendorLineListByReturnVendorId(id);
+        List<MesWmReturnVendorLineDO> lines = returnVendorLineService.getReturnVendorLineListByReturnId(id);
         for (MesWmReturnVendorLineDO line : lines) {
             List<MesWmReturnVendorDetailDO> details = returnVendorDetailService.getReturnVendorDetailListByLineId(line.getId());
             BigDecimal totalDetailQty = CollectionUtils.getSumValue(details,