BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 02c6339235099190de22f73fc31ea29a3971b548

Authored by YunaiV
1 parent 8b785cf2

♻️ refactor(mes): 重命名通知单编码和名称字段

Inline Side-by-side
Showing 6 changed files with 15 additions and 15 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticePageReqVO.java
  View file @02c6339
... ... @@ -13,10 +13,10 @@ import lombok.ToString;
13 13 public class MesWmSalesNoticePageReqVO extends PageParam {
14 14  
15 15 @Schema(description = "通知单编码", example = "SN202603010001")
16   - private String noticeCode;
  16 + private String code;
17 17  
18 18 @Schema(description = "通知单名称", example = "测试发货通知")
19   - private String noticeName;
  19 + private String name;
20 20  
21 21 @Schema(description = "销售订单编号", example = "SO202603010001")
22 22 private String salesOrderCode;
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeRespVO.java
  View file @02c6339
... ... @@ -18,11 +18,11 @@ public class MesWmSalesNoticeRespVO {
18 18  
19 19 @Schema(description = "通知单编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "SN202603010001")
20 20 @ExcelProperty("通知单编码")
21   - private String noticeCode;
  21 + private String code;
22 22  
23 23 @Schema(description = "通知单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试发货通知")
24 24 @ExcelProperty("通知单名称")
25   - private String noticeName;
  25 + private String name;
26 26  
27 27 @Schema(description = "销售订单编号", example = "SO202603010001")
28 28 @ExcelProperty("销售订单编号")
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeSaveReqVO.java
  View file @02c6339
... ... @@ -16,11 +16,11 @@ public class MesWmSalesNoticeSaveReqVO {
16 16  
17 17 @Schema(description = "通知单编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "SN202603010001")
18 18 @NotEmpty(message = "通知单编码不能为空")
19   - private String noticeCode;
  19 + private String code;
20 20  
21 21 @Schema(description = "通知单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试发货通知")
22 22 @NotEmpty(message = "通知单名称不能为空")
23   - private String noticeName;
  23 + private String name;
24 24  
25 25 @Schema(description = "销售订单编号", example = "SO202603010001")
26 26 private String salesOrderCode;
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeDO.java
  View file @02c6339
... ... @@ -31,11 +31,11 @@ public class MesWmSalesNoticeDO extends BaseDO {
31 31 /**
32 32 * 通知单编码
33 33 */
34   - private String noticeCode;
  34 + private String code;
35 35 /**
36 36 * 通知单名称
37 37 */
38   - private String noticeName;
  38 + private String name;
39 39 /**
40 40 * 销售订单编号
41 41 */
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeMapper.java
  View file @02c6339
... ... @@ -15,16 +15,16 @@ public interface MesWmSalesNoticeMapper extends BaseMapperX<MesWmSalesNoticeDO>
15 15  
16 16 default PageResult<MesWmSalesNoticeDO> selectPage(MesWmSalesNoticePageReqVO reqVO) {
17 17 return selectPage(reqVO, new LambdaQueryWrapperX<MesWmSalesNoticeDO>()
18   - .likeIfPresent(MesWmSalesNoticeDO::getNoticeCode, reqVO.getNoticeCode())
19   - .likeIfPresent(MesWmSalesNoticeDO::getNoticeName, reqVO.getNoticeName())
  18 + .likeIfPresent(MesWmSalesNoticeDO::getCode, reqVO.getCode())
  19 + .likeIfPresent(MesWmSalesNoticeDO::getName, reqVO.getName())
20 20 .likeIfPresent(MesWmSalesNoticeDO::getSalesOrderCode, reqVO.getSalesOrderCode())
21 21 .eqIfPresent(MesWmSalesNoticeDO::getClientId, reqVO.getClientId())
22 22 .eqIfPresent(MesWmSalesNoticeDO::getStatus, reqVO.getStatus())
23 23 .orderByDesc(MesWmSalesNoticeDO::getId));
24 24 }
25 25  
26   - default MesWmSalesNoticeDO selectByNoticeCode(String noticeCode) {
27   - return selectOne(MesWmSalesNoticeDO::getNoticeCode, noticeCode);
  26 + default MesWmSalesNoticeDO selectByCode(String code) {
  27 + return selectOne(MesWmSalesNoticeDO::getCode, code);
28 28 }
29 29  
30 30 }
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
  View file @02c6339
... ... @@ -132,15 +132,15 @@ public class MesWmSalesNoticeServiceImpl implements MesWmSalesNoticeService {
132 132  
133 133 private void validateSalesNoticeSave(MesWmSalesNoticeSaveReqVO saveReqVO) {
134 134 // 校验编码唯一
135   - validateNoticeCodeUnique(saveReqVO.getId(), saveReqVO.getNoticeCode());
  135 + validateNoticeCodeUnique(saveReqVO.getId(), saveReqVO.getCode());
136 136 // 校验客户存在
137 137 if (saveReqVO.getClientId() != null) {
138 138 clientService.validateClientExistsAndEnable(saveReqVO.getClientId());
139 139 }
140 140 }
141 141  
142   - private void validateNoticeCodeUnique(Long id, String noticeCode) {
143   - MesWmSalesNoticeDO notice = salesNoticeMapper.selectByNoticeCode(noticeCode);
  142 + private void validateNoticeCodeUnique(Long id, String code) {
  143 + MesWmSalesNoticeDO notice = salesNoticeMapper.selectByCode(code);
144 144 if (notice == null) {
145 145 return;
146 146 }
... ...