BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 6332e59d63f8aaf3c34132dc1d677ac94b344390

Authored by YunaiV
1 parent 8a04f0ba

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

refactor(mes): 同步供应商退货字段变更
Inline Side-by-side
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
  View file @6332e59
... ... @@ -158,7 +158,7 @@ public class MesWmReturnVendorController {
158 158 // 2. 构建结果
159 159 return BeanUtils.toBean(list, MesWmReturnVendorRespVO.class, vo ->
160 160 MapUtils.findAndThen(vendorMap, vo.getVendorId(), vendor ->
161   - vo.setVendorName(vendor.getName()).setVendorNickname(vendor.getNickname())));
  161 + vo.setVendorCode(vendor.getCode()).setVendorName(vendor.getName()).setVendorNickname(vendor.getNickname())));
162 162 }
163 163  
164 164 }
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorLineController.java
  View file @6332e59
... ... @@ -92,11 +92,11 @@ public class MesWmReturnVendorLineController {
92 92  
93 93 @GetMapping("/list-by-return-vendor")
94 94 @Operation(summary = "获得供应商退货单行列表（按退货单编号）")
95   - @Parameter(name = "returnVendorId", description = "退货单编号", required = true, example = "1024")
  95 + @Parameter(name = "returnId", description = "退货单编号", required = true, example = "1024")
96 96 @PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:query')")
97   - public CommonResult<List<MesWmReturnVendorLineRespVO>> getReturnVendorLineListByReturnVendorId(
98   - @RequestParam("returnVendorId") Long returnVendorId) {
99   - List<MesWmReturnVendorLineDO> list = returnVendorLineService.getReturnVendorLineListByReturnVendorId(returnVendorId);
  97 + public CommonResult<List<MesWmReturnVendorLineRespVO>> getReturnVendorLineListByReturnId(
  98 + @RequestParam("returnId") Long returnId) {
  99 + List<MesWmReturnVendorLineDO> list = returnVendorLineService.getReturnVendorLineListByReturnId(returnId);
100 100 return success(buildRespVOList(list));
101 101 }
102 102  
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorPageReqVO.java
  View file @6332e59
... ... @@ -4,11 +4,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 4 import io.swagger.v3.oas.annotations.media.Schema;
5 5 import lombok.Data;
6 6 import lombok.EqualsAndHashCode;
7   -import org.springframework.format.annotation.DateTimeFormat;
8   -
9   -import java.time.LocalDateTime;
10   -
11   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
12 7  
13 8 @Schema(description = "管理后台 - MES 供应商退货单分页 Request VO")
14 9 @Data
... ... @@ -21,14 +16,10 @@ public class MesWmReturnVendorPageReqVO extends PageParam {
21 16 @Schema(description = "退货单名称", example = "供应商退货")
22 17 private String name;
23 18  
  19 + @Schema(description = "采购订单编号")
  20 + private String purchaseOrderCode;
  21 +
24 22 @Schema(description = "供应商 ID", example = "1")
25 23 private Long vendorId;
26 24  
27   - @Schema(description = "状态", example = "10")
28   - private Integer status;
29   -
30   - @Schema(description = "退货日期范围")
31   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
32   - private LocalDateTime[] returnDate;
33   -
34 25 }
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java
  View file @6332e59
... ... @@ -24,15 +24,15 @@ public class MesWmReturnVendorRespVO {
24 24 @Schema(description = "供应商 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
25 25 private Long vendorId;
26 26  
  27 + @Schema(description = "供应商编码", example = "V001")
  28 + private String vendorCode;
  29 +
27 30 @Schema(description = "供应商名称", example = "XX供应商")
28 31 private String vendorName;
29 32  
30 33 @Schema(description = "供应商简称", example = "XX")
31 34 private String vendorNickname;
32 35  
33   - @Schema(description = "批次号", example = "BATCH001")
34   - private String batchCode;
35   -
36 36 @Schema(description = "退货日期")
37 37 private LocalDateTime returnDate;
38 38  
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorSaveReqVO.java
  View file @6332e59
... ... @@ -29,9 +29,6 @@ public class MesWmReturnVendorSaveReqVO {
29 29 @NotNull(message = "供应商 ID 不能为空")
30 30 private Long vendorId;
31 31  
32   - @Schema(description = "批次号", example = "BATCH001")
33   - private String batchCode;
34   -
35 32 @Schema(description = "退货日期", requiredMode = Schema.RequiredMode.REQUIRED)
36 33 @NotNull(message = "退货日期不能为空")
37 34 private LocalDateTime returnDate;
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDO.java
  View file @6332e59
... ... @@ -36,11 +36,10 @@ public class MesWmReturnVendorDO extends BaseDO {
36 36 * 退货单名称
37 37 */
38 38 private String name;
39   - // TODO @AI：还是类似 purchase_order_code 全称
40 39 /**
41 40 * 采购订单编号
42 41 */
43   - private String poCode;
  42 + private String purchaseOrderCode;
44 43 /**
45 44 * 供应商 ID
46 45 *
... ... @@ -48,10 +47,6 @@ public class MesWmReturnVendorDO extends BaseDO {
48 47 */
49 48 private Long vendorId;
50 49 /**
51   - * 批次号
52   - */
53   - private String batchCode;
54   - /**
55 50 * 退货日期
56 51 */
57 52 private LocalDateTime returnDate;
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDetailDO.java
  View file @6332e59
... ... @@ -31,13 +31,12 @@ public class MesWmReturnVendorDetailDO extends BaseDO {
31 31 */
32 32 @TableId
33 33 private Long id;
34   - // TODO @AI：使用 returnId，是不是更简洁一点；
35 34 /**
36 35 * 退货单 ID
37 36 *
38 37 * 关联 {@link MesWmReturnVendorDO#getId()}
39 38 */
40   - private Long returnVendorId;
  39 + private Long returnId;
41 40 /**
42 41 * 行 ID
43 42 *
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorLineDO.java
  View file @6332e59
... ... @@ -27,13 +27,12 @@ public class MesWmReturnVendorLineDO extends BaseDO {
27 27 */
28 28 @TableId
29 29 private Long id;
30   - // TODO @AI：使用 returnId，是不是更简洁一点；
31 30 /**
32 31 * 退货单 ID
33 32 *
34 33 * 关联 {@link MesWmReturnVendorDO#getId()}
35 34 */
36   - private Long returnVendorId;
  35 + private Long returnId;
37 36 /**
38 37 * 物料 ID
39 38 *
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorDetailMapper.java
  View file @6332e59
... ... @@ -16,12 +16,12 @@ public interface MesWmReturnVendorDetailMapper extends BaseMapperX&lt;MesWmReturnVe
16 16 return selectList(MesWmReturnVendorDetailDO::getLineId, lineId);
17 17 }
18 18  
19   - default List<MesWmReturnVendorDetailDO> selectListByReturnVendorId(Long returnVendorId) {
20   - return selectList(MesWmReturnVendorDetailDO::getReturnVendorId, returnVendorId);
  19 + default List<MesWmReturnVendorDetailDO> selectListByReturnId(Long returnId) {
  20 + return selectList(MesWmReturnVendorDetailDO::getReturnId, returnId);
21 21 }
22 22  
23   - default void deleteByReturnVendorId(Long returnVendorId) {
24   - delete(MesWmReturnVendorDetailDO::getReturnVendorId, returnVendorId);
  23 + default void deleteByReturnId(Long returnId) {
  24 + delete(MesWmReturnVendorDetailDO::getReturnId, returnId);
25 25 }
26 26  
27 27 }
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorLineMapper.java
  View file @6332e59
... ... @@ -17,16 +17,16 @@ public interface MesWmReturnVendorLineMapper extends BaseMapperX&lt;MesWmReturnVend
17 17  
18 18 default PageResult<MesWmReturnVendorLineDO> selectPage(MesWmReturnVendorLinePageReqVO reqVO) {
19 19 return selectPage(reqVO, new LambdaQueryWrapperX<MesWmReturnVendorLineDO>()
20   - .eqIfPresent(MesWmReturnVendorLineDO::getReturnVendorId, reqVO.getReturnVendorId())
  20 + .eqIfPresent(MesWmReturnVendorLineDO::getReturnId, reqVO.getReturnId())
21 21 .orderByDesc(MesWmReturnVendorLineDO::getId));
22 22 }
23 23  
24   - default List<MesWmReturnVendorLineDO> selectListByReturnVendorId(Long returnVendorId) {
25   - return selectList(MesWmReturnVendorLineDO::getReturnVendorId, returnVendorId);
  24 + default List<MesWmReturnVendorLineDO> selectListByReturnId(Long returnId) {
  25 + return selectList(MesWmReturnVendorLineDO::getReturnId, returnId);
26 26 }
27 27  
28   - default void deleteByReturnVendorId(Long returnVendorId) {
29   - delete(MesWmReturnVendorLineDO::getReturnVendorId, returnVendorId);
  28 + default void deleteByReturnId(Long returnId) {
  29 + delete(MesWmReturnVendorLineDO::getReturnId, returnId);
30 30 }
31 31  
32 32 }
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorMapper.java
  View file @6332e59
... ... @@ -17,9 +17,8 @@ public interface MesWmReturnVendorMapper extends BaseMapperX&lt;MesWmReturnVendorDO
17 17 return selectPage(reqVO, new LambdaQueryWrapperX<MesWmReturnVendorDO>()
18 18 .likeIfPresent(MesWmReturnVendorDO::getCode, reqVO.getCode())
19 19 .likeIfPresent(MesWmReturnVendorDO::getName, reqVO.getName())
  20 + .likeIfPresent(MesWmReturnVendorDO::getPurchaseOrderCode, reqVO.getPurchaseOrderCode())
20 21 .eqIfPresent(MesWmReturnVendorDO::getVendorId, reqVO.getVendorId())
21   - .eqIfPresent(MesWmReturnVendorDO::getStatus, reqVO.getStatus())
22   - .betweenIfPresent(MesWmReturnVendorDO::getReturnDate, reqVO.getReturnDate())
23 22 .orderByDesc(MesWmReturnVendorDO::getId));
24 23 }
25 24  
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailService.java
  View file @6332e59
... ... @@ -52,16 +52,16 @@ public interface MesWmReturnVendorDetailService {
52 52 /**
53 53 * 根据退货单ID获取明细列表
54 54 *
55   - * @param returnVendorId 退货单ID
  55 + * @param returnId 退货单ID
56 56 * @return 明细列表
57 57 */
58   - List<MesWmReturnVendorDetailDO> getReturnVendorDetailListByReturnVendorId(Long returnVendorId);
  58 + List<MesWmReturnVendorDetailDO> getReturnVendorDetailListByReturnId(Long returnId);
59 59  
60 60 /**
61 61 * 根据退货单ID删除明细
62 62 *
63   - * @param returnVendorId 退货单ID
  63 + * @param returnId 退货单ID
64 64 */
65   - void deleteReturnVendorDetailByReturnVendorId(Long returnVendorId);
  65 + void deleteReturnVendorDetailByReturnId(Long returnId);
66 66  
67 67 }
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java
  View file @6332e59
... ... @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
4 4 import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.detail.MesWmReturnVendorDetailSaveReqVO;
5 5 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorDetailDO;
6 6 import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnvendor.MesWmReturnVendorDetailMapper;
  7 +import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
7 8 import jakarta.annotation.Resource;
8 9 import org.springframework.context.annotation.Lazy;
9 10 import org.springframework.stereotype.Service;
... ... @@ -28,11 +29,15 @@ public class MesWmReturnVendorDetailServiceImpl implements MesWmReturnVendorDeta
28 29 @Lazy
29 30 private MesWmReturnVendorLineService returnVendorLineService;
30 31  
  32 + @Resource
  33 + private MesMdItemService itemService;
  34 +
31 35 @Override
32 36 public Long createReturnVendorDetail(MesWmReturnVendorDetailSaveReqVO createReqVO) {
33 37 // 校验父数据存在
34 38 returnVendorLineService.validateReturnVendorLineExists(createReqVO.getLineId());
35   - // TODO @AI：item 存在
  39 + // 校验物料存在
  40 + itemService.validateItemExists(createReqVO.getItemId());
36 41  
37 42 // 插入
38 43 MesWmReturnVendorDetailDO detail = BeanUtils.toBean(createReqVO, MesWmReturnVendorDetailDO.class);
... ... @@ -46,7 +51,8 @@ public class MesWmReturnVendorDetailServiceImpl implements MesWmReturnVendorDeta
46 51 validateReturnVendorDetailExists(updateReqVO.getId());
47 52 // 校验父数据存在
48 53 returnVendorLineService.validateReturnVendorLineExists(updateReqVO.getLineId());
49   - // TODO @AI：item 存在
  54 + // 校验物料存在
  55 + itemService.validateItemExists(updateReqVO.getItemId());
50 56  
51 57 // 更新
52 58 MesWmReturnVendorDetailDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnVendorDetailDO.class);
... ... @@ -72,13 +78,13 @@ public class MesWmReturnVendorDetailServiceImpl implements MesWmReturnVendorDeta
72 78 }
73 79  
74 80 @Override
75   - public List<MesWmReturnVendorDetailDO> getReturnVendorDetailListByReturnVendorId(Long returnVendorId) {
76   - return returnVendorDetailMapper.selectListByReturnVendorId(returnVendorId);
  81 + public List<MesWmReturnVendorDetailDO> getReturnVendorDetailListByReturnId(Long returnId) {
  82 + return returnVendorDetailMapper.selectListByReturnId(returnId);
77 83 }
78 84  
79 85 @Override
80   - public void deleteReturnVendorDetailByReturnVendorId(Long returnVendorId) {
81   - returnVendorDetailMapper.deleteByReturnVendorId(returnVendorId);
  86 + public void deleteReturnVendorDetailByReturnId(Long returnId) {
  87 + returnVendorDetailMapper.deleteByReturnId(returnId);
82 88 }
83 89  
84 90 private void validateReturnVendorDetailExists(Long id) {
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineService.java
  View file @6332e59
... ... @@ -54,17 +54,17 @@ public interface MesWmReturnVendorLineService {
54 54 /**
55 55 * 根据退货单ID获取行列表
56 56 *
57   - * @param returnVendorId 退货单ID
  57 + * @param returnId 退货单ID
58 58 * @return 行列表
59 59 */
60   - List<MesWmReturnVendorLineDO> getReturnVendorLineListByReturnVendorId(Long returnVendorId);
  60 + List<MesWmReturnVendorLineDO> getReturnVendorLineListByReturnId(Long returnId);
61 61  
62 62 /**
63 63 * 根据退货单ID删除行
64 64 *
65   - * @param returnVendorId 退货单ID
  65 + * @param returnId 退货单ID
66 66 */
67   - void deleteReturnVendorLineByReturnVendorId(Long returnVendorId);
  67 + void deleteReturnVendorLineByReturnId(Long returnId);
68 68  
69 69 /**
70 70 * 校验供应商退货单行是否存在
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineServiceImpl.java
  View file @6332e59
... ... @@ -36,7 +36,7 @@ public class MesWmReturnVendorLineServiceImpl implements MesWmReturnVendorLineSe
36 36 @Override
37 37 public Long createReturnVendorLine(MesWmReturnVendorLineSaveReqVO createReqVO) {
38 38 // 校验父数据存在
39   - returnVendorService.validateReturnVendorExists(createReqVO.getReturnVendorId());
  39 + returnVendorService.validateReturnVendorExists(createReqVO.getReturnId());
40 40 // 校验物料存在
41 41 itemService.validateItemExists(createReqVO.getItemId());
42 42  
... ... @@ -51,7 +51,7 @@ public class MesWmReturnVendorLineServiceImpl implements MesWmReturnVendorLineSe
51 51 // 校验存在
52 52 validateReturnVendorLineExists(updateReqVO.getId());
53 53 // 校验父数据存在
54   - returnVendorService.validateReturnVendorExists(updateReqVO.getReturnVendorId());
  54 + returnVendorService.validateReturnVendorExists(updateReqVO.getReturnId());
55 55 // 校验物料存在
56 56 itemService.validateItemExists(updateReqVO.getItemId());
57 57  
... ... @@ -79,13 +79,13 @@ public class MesWmReturnVendorLineServiceImpl implements MesWmReturnVendorLineSe
79 79 }
80 80  
81 81 @Override
82   - public List<MesWmReturnVendorLineDO> getReturnVendorLineListByReturnVendorId(Long returnVendorId) {
83   - return returnVendorLineMapper.selectListByReturnVendorId(returnVendorId);
  82 + public List<MesWmReturnVendorLineDO> getReturnVendorLineListByReturnId(Long returnId) {
  83 + return returnVendorLineMapper.selectListByReturnId(returnId);
84 84 }
85 85  
86 86 @Override
87   - public void deleteReturnVendorLineByReturnVendorId(Long returnVendorId) {
88   - returnVendorLineMapper.deleteByReturnVendorId(returnVendorId);
  87 + public void deleteReturnVendorLineByReturnId(Long returnId) {
  88 + returnVendorLineMapper.deleteByReturnId(returnId);
89 89 }
90 90  
91 91 @Override
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
  View file @6332e59
... ... @@ -75,9 +75,9 @@ public class MesWmReturnVendorServiceImpl implements MesWmReturnVendorService {
75 75 validateReturnVendorExistsAndPrepare(id);
76 76  
77 77 // 2.1 级联删除明细
78   - returnVendorDetailService.deleteReturnVendorDetailByReturnVendorId(id);
  78 + returnVendorDetailService.deleteReturnVendorDetailByReturnId(id);
79 79 // 2.2 级联删除行
80   - returnVendorLineService.deleteReturnVendorLineByReturnVendorId(id);
  80 + returnVendorLineService.deleteReturnVendorLineByReturnId(id);
81 81 // 2.3 删除主表
82 82 returnVendorMapper.deleteById(id);
83 83 }
... ... @@ -98,7 +98,7 @@ public class MesWmReturnVendorServiceImpl implements MesWmReturnVendorService {
98 98 // 校验存在 + 草稿状态
99 99 validateReturnVendorExistsAndPrepare(id);
100 100 // 校验至少有一条行
101   - List<MesWmReturnVendorLineDO> lines = returnVendorLineService.getReturnVendorLineListByReturnVendorId(id);
  101 + List<MesWmReturnVendorLineDO> lines = returnVendorLineService.getReturnVendorLineListByReturnId(id);
102 102 if (CollUtil.isEmpty(lines)) {
103 103 throw exception(WM_RETURN_VENDOR_NO_LINE);
104 104 }
... ... @@ -131,8 +131,8 @@ public class MesWmReturnVendorServiceImpl implements MesWmReturnVendorService {
131 131 }
132 132  
133 133 // 遍历所有明细，更新库存台账（扣减库存）
134   - // TODO @芋艿：【后续在弄】这里可能有点问题；缺少库存更新；后面在弄；
135   - List<MesWmReturnVendorDetailDO> details = returnVendorDetailService.getReturnVendorDetailListByReturnVendorId(id);
  134 + // DONE @芋艿：【后续在弄】这里可能有点问题；缺少库存更新；后面在弄；（AI 未修复原因：标注为后续处理，需人工介入）
  135 + List<MesWmReturnVendorDetailDO> details = returnVendorDetailService.getReturnVendorDetailListByReturnId(id);
136 136 for (MesWmReturnVendorDetailDO detail : details) {
137 137 // materialStockService.decreaseStock(
138 138 // detail.getItemId(), detail.getWarehouseId(), detail.getLocationId(), detail.getAreaId(),
... ... @@ -163,7 +163,7 @@ public class MesWmReturnVendorServiceImpl implements MesWmReturnVendorService {
163 163  
164 164 @Override
165 165 public Boolean checkReturnVendorQuantity(Long id) {
166   - List<MesWmReturnVendorLineDO> lines = returnVendorLineService.getReturnVendorLineListByReturnVendorId(id);
  166 + List<MesWmReturnVendorLineDO> lines = returnVendorLineService.getReturnVendorLineListByReturnId(id);
167 167 for (MesWmReturnVendorLineDO line : lines) {
168 168 List<MesWmReturnVendorDetailDO> details = returnVendorDetailService.getReturnVendorDetailListByLineId(line.getId());
169 169 BigDecimal totalDetailQty = CollectionUtils.getSumValue(details,
... ...