From bb0b80bd7ca7c1f979ab0125ae01f3faa1d14f4b Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:37:57 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_business' into fix/hsy/20260811
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 f28a6e2..dd38717 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
@@ -30,7 +30,7 @@
@Schema(description = "瀹㈡埛缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724")
private Long customerId;
- @Schema(description = "瀹㈡埛鍚嶇О", example = "鑺嬮亾")
+ @Schema(description = "瀹㈡埛鍚嶇О", example = "瓒呯骇绠＄悊鍛�")
@ExcelProperty("瀹㈡埛鍚嶇О")
private String customerName;
@@ -80,9 +80,9 @@
@Schema(description = "闄勪欢鍒楄〃")
private List<StorageBlobRespDTO> attachmentList;
- @Schema(description = "鍒涘缓浜�", example = "鑺嬮亾")
+ @Schema(description = "鍒涘缓浜�", example = "瓒呯骇绠＄悊鍛�")
private String creator;
- @Schema(description = "鍒涘缓浜哄悕绉�", example = "鑺嬮亾")
+ @Schema(description = "鍒涘缓浜哄悕绉�", example = "瓒呯骇绠＄悊鍛�")
private String creatorName;
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -164,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 = "宸у厠鍔�")
@@ -176,6 +181,9 @@
@Schema(description = "搴撳瓨鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
private BigDecimal stockCount; // 璇ュ瓧娈典粎浠呭湪璇︽儏鍜岀紪杈戞椂浣跨敤
+ @Schema(description = "瑙勬牸鍨嬪彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "-")
+ private String productSpecification;
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3