From f02d0df2f1dfc7a8b775cf50d45375e57628a5ef Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 10 十一月 2026 11:26:22 +0800
Subject: [PATCH] feat(ncr): 完善NCR处置联动逻辑与关闭校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeSaveReqVO.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeSaveReqVO.java
index b3ad25a..d839f34 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeSaveReqVO.java
@@ -1,10 +1,13 @@
package cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo;
import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
import lombok.Data;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
@Schema(description = "绠$悊鍚庡彴 - MES 鍙戣揣閫氱煡鍗曟柊澧�/淇敼 Request VO")
@@ -22,12 +25,15 @@
@NotEmpty(message = "閫氱煡鍗曞悕绉颁笉鑳戒负绌�")
private String name;
- @Schema(description = "閿�鍞鍗曠紪鍙�", example = "SO202603010001")
- private String salesOrderCode;
-
@Schema(description = "瀹㈡埛缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "瀹㈡埛缂栧彿涓嶈兘涓虹┖")
private Long clientId;
+
+ @Schema(description = "閿�鍞鍗旾D", example = "1")
+ private Long saleOrderId;
+
+ @Schema(description = "閿�鍞鍗曞彿", example = "SO202603010001")
+ private String saleOrderCode;
@Schema(description = "鍙戣揣鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "鍙戣揣鏃ユ湡涓嶈兘涓虹┖")
@@ -42,6 +48,17 @@
@Schema(description = "鏀惰揣鍦板潃", example = "鍖椾含甯傛湞闃冲尯xxx")
private String recipientAddress;
+ @Schema(description = "鐗╂祦鍏徃", example = "椤轰赴閫熻繍")
+ @Size(max = 128, message = "鐗╂祦鍏徃鍚嶇О涓嶈兘瓒呰繃 128 涓瓧绗�")
+ private String logisticsCompany;
+
+ @Schema(description = "蹇�掕垂", example = "25.00")
+ @DecimalMin(value = "0", message = "蹇�掕垂涓嶈兘灏忎簬 0")
+ private BigDecimal expressFee;
+
+ @Schema(description = "寮�绁ㄧ姸鎬侊細0 鏈紑绁� 1 閮ㄥ垎寮�绁� 2 宸插紑绁�", example = "0")
+ private Integer invoiceStatus;
+
@Schema(description = "澶囨敞", example = "澶囨敞")
private String remark;
--
Gitblit v1.9.3