From 96a020a65509f807ac3d27872f903e22f2218165 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 31 七月 2026 16:54:43 +0800
Subject: [PATCH] 员工新增修改问题解决

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java
index 63d2389..4070879 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java
@@ -2,6 +2,7 @@
 
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
+import cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -72,13 +73,12 @@
     @Schema(description = "瀹氶噾閲戦锛屽崟浣嶏細鍏�", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
     private BigDecimal depositPrice;
 
-    @Schema(description = "闄勪欢鍦板潃", example = "https://www.iocoder.cn")
-    @ExcelProperty("闄勪欢鍦板潃")
-    private String fileUrl;
-
     @Schema(description = "澶囨敞", example = "浣犵寽")
     @ExcelProperty("澶囨敞")
     private String remark;
+
+    @Schema(description = "闄勪欢鍒楄〃")
+    private List<StorageBlobRespDTO> attachmentList;
 
     @Schema(description = "鍒涘缓浜�", example = "鑺嬮亾")
     private String creator;
@@ -114,6 +114,14 @@
 
     @Schema(description = "鏄惁鏈夐渶瑕佺敓浜х殑鏄庣粏锛�0=鍚� 1=鏄級", example = "1")
     private Integer needProduction;
+
+    // ========== 鐢熶骇鍏宠仈 ==========
+
+    @Schema(description = "鐢熶骇鐘舵�侊細0-鏈畬鎴愶紝1-宸插畬鎴�", example = "1")
+    private Integer productionStatus;
+
+    @Schema(description = "鐢熶骇瀹屾垚鏃堕棿")
+    private LocalDateTime productionFinishTime;
 
     @Data
     public static class Item {
@@ -156,6 +164,11 @@
         @Schema(description = "鍏宠仈鐨� MPS 缂栧彿", example = "1024")
         private Long mpsId;
 
+        // ========== 鍑哄簱鎵瑰彿 ==========
+
+        @Schema(description = "鍑哄簱鎵瑰彿", example = "B2026001銆丅2026002")
+        private String batchCode;
+
         // ========== 鍏宠仈瀛楁 ==========
 
         @Schema(description = "浜у搧鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "宸у厠鍔�")

--
Gitblit v1.9.3