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

YunaiV
1 parent 8b785cf2
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
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
@@ -13,10 +13,10 @@ import lombok.ToString;
 public class MesWmSalesNoticePageReqVO extends PageParam {
     @Schema(description = "通知单编码", example = "SN202603010001")
-    private String noticeCode;
+    private String code;
     @Schema(description = "通知单名称", example = "测试发货通知")
-    private String noticeName;
+    private String name;
     @Schema(description = "销售订单编号", example = "SO202603010001")
     private String salesOrderCode;
@@ -18,11 +18,11 @@ public class MesWmSalesNoticeRespVO {
     @Schema(description = "通知单编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "SN202603010001")
     @ExcelProperty("通知单编码")
-    private String noticeCode;
+    private String code;
     @Schema(description = "通知单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试发货通知")
     @ExcelProperty("通知单名称")
-    private String noticeName;
+    private String name;
     @Schema(description = "销售订单编号", example = "SO202603010001")
     @ExcelProperty("销售订单编号")
@@ -16,11 +16,11 @@ public class MesWmSalesNoticeSaveReqVO {
     @Schema(description = "通知单编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "SN202603010001")
     @NotEmpty(message = "通知单编码不能为空")
-    private String noticeCode;
+    private String code;
     @Schema(description = "通知单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试发货通知")
     @NotEmpty(message = "通知单名称不能为空")
-    private String noticeName;
+    private String name;
     @Schema(description = "销售订单编号", example = "SO202603010001")
     private String salesOrderCode;
@@ -31,11 +31,11 @@ public class MesWmSalesNoticeDO extends BaseDO {
     /**
      * 通知单编码
      */
-    private String noticeCode;
+    private String code;
     /**
      * 通知单名称
      */
-    private String noticeName;
+    private String name;
     /**
      * 销售订单编号
      */
@@ -15,16 +15,16 @@ public interface MesWmSalesNoticeMapper extends BaseMapperX&lt;MesWmSalesNoticeDO&gt; 
     default PageResult<MesWmSalesNoticeDO> selectPage(MesWmSalesNoticePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<MesWmSalesNoticeDO>()
-                .likeIfPresent(MesWmSalesNoticeDO::getNoticeCode, reqVO.getNoticeCode())
-                .likeIfPresent(MesWmSalesNoticeDO::getNoticeName, reqVO.getNoticeName())
+                .likeIfPresent(MesWmSalesNoticeDO::getCode, reqVO.getCode())
+                .likeIfPresent(MesWmSalesNoticeDO::getName, reqVO.getName())
                 .likeIfPresent(MesWmSalesNoticeDO::getSalesOrderCode, reqVO.getSalesOrderCode())
                 .eqIfPresent(MesWmSalesNoticeDO::getClientId, reqVO.getClientId())
                 .eqIfPresent(MesWmSalesNoticeDO::getStatus, reqVO.getStatus())
                 .orderByDesc(MesWmSalesNoticeDO::getId));
     }
-    default MesWmSalesNoticeDO selectByNoticeCode(String noticeCode) {
-        return selectOne(MesWmSalesNoticeDO::getNoticeCode, noticeCode);
+    default MesWmSalesNoticeDO selectByCode(String code) {
+        return selectOne(MesWmSalesNoticeDO::getCode, code);
     }
 }
@@ -132,15 +132,15 @@ public class MesWmSalesNoticeServiceImpl implements MesWmSalesNoticeService {
     private void validateSalesNoticeSave(MesWmSalesNoticeSaveReqVO saveReqVO) {
         // 校验编码唯一
-        validateNoticeCodeUnique(saveReqVO.getId(), saveReqVO.getNoticeCode());
+        validateNoticeCodeUnique(saveReqVO.getId(), saveReqVO.getCode());
         // 校验客户存在
         if (saveReqVO.getClientId() != null) {
             clientService.validateClientExistsAndEnable(saveReqVO.getClientId());
         }
     }
-    private void validateNoticeCodeUnique(Long id, String noticeCode) {
-        MesWmSalesNoticeDO notice = salesNoticeMapper.selectByNoticeCode(noticeCode);
+    private void validateNoticeCodeUnique(Long id, String code) {
+        MesWmSalesNoticeDO notice = salesNoticeMapper.selectByCode(code);
         if (notice == null) {
             return;
         }