From f90d9f53beb844265c4153159aadb0baf81bafdb Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 30 七月 2026 18:07:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java | 27 +++++++++++++++++++++++----
1 files changed, 23 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 34085c4..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;
@@ -108,6 +108,20 @@
@Schema(description = "鏄惁宸茬敓鎴愬彂璐ч�氱煡鍗�", example = "false")
private Boolean hasSalesNotice;
+
+ @Schema(description = "鏄惁鍙互鐢熸垚鍙戣揣閫氱煡鍗曪紙鏈夐渶瑕佺敓浜т笖鏈畬鎴愮殑鏄庣粏鏃朵负 false锛�", example = "true")
+ private Boolean canCreateSalesNotice;
+
+ @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 {
@@ -150,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