From eee03bbfea8b15d1a56ab63bd09a35c6c861c4cb Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 09 十一月 2026 13:01:08 +0800
Subject: [PATCH] feat(mes): 不合格品处置联动入库与生产订单

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeRespVO.java |   34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeRespVO.java
index 473de99..96529bb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeRespVO.java
@@ -5,6 +5,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Schema(description = "绠$悊鍚庡彴 - MES 鍙戣揣閫氱煡鍗� Response VO")
@@ -24,20 +25,19 @@
     @ExcelProperty("閫氱煡鍗曞悕绉�")
     private String name;
 
-    @Schema(description = "閿�鍞鍗曠紪鍙�", example = "SO202603010001")
-    @ExcelProperty("閿�鍞鍗曠紪鍙�")
-    private String salesOrderCode;
-
     @Schema(description = "瀹㈡埛缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long clientId;
-
-    @Schema(description = "瀹㈡埛缂栫爜", example = "C001")
-    @ExcelProperty("瀹㈡埛缂栫爜")
-    private String clientCode;
 
     @Schema(description = "瀹㈡埛鍚嶇О", example = "鏌愬鎴�")
     @ExcelProperty("瀹㈡埛鍚嶇О")
     private String clientName;
+
+    @Schema(description = "閿�鍞鍗旾D", example = "1")
+    private Long saleOrderId;
+
+    @Schema(description = "閿�鍞鍗曞彿", example = "SO202603010001")
+    @ExcelProperty("閿�鍞鍗曞彿")
+    private String saleOrderCode;
 
     @Schema(description = "鍙戣揣鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("鍙戣揣鏃ユ湡")
@@ -55,9 +55,25 @@
     @ExcelProperty("鏀惰揣鍦板潃")
     private String recipientAddress;
 
+    @Schema(description = "鐗╂祦鍏徃", example = "椤轰赴閫熻繍")
+    @ExcelProperty("鐗╂祦鍏徃")
+    private String logisticsCompany;
+
+    @Schema(description = "蹇�掕垂", example = "25.00")
+    @ExcelProperty("蹇�掕垂")
+    private BigDecimal expressFee;
+
+    @Schema(description = "寮�绁ㄧ姸鎬侊細0 鏈紑绁� 1 閮ㄥ垎寮�绁� 2 宸插紑绁�", example = "0")
+    @ExcelProperty("寮�绁ㄧ姸鎬�")
+    private Integer invoiceStatus;
+
     @Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
     @ExcelProperty("鐘舵��")
     private Integer status;
+
+    @Schema(description = "鍑哄簱鐘舵��", example = "0")
+    @ExcelProperty("鍑哄簱鐘舵��")
+    private Integer outStatus;
 
     @Schema(description = "澶囨敞", example = "澶囨敞")
     @ExcelProperty("澶囨敞")
@@ -67,4 +83,4 @@
     @ExcelProperty("鍒涘缓鏃堕棿")
     private LocalDateTime createTime;
 
-}
+}
\ No newline at end of file

--
Gitblit v1.9.3