From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 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 64926fa..ca6b241 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;
@@ -39,6 +39,11 @@
@Schema(description = "鍚堝悓鍗曞彿", example = "HT001")
@ExcelProperty("鍚堝悓鍗曞彿")
private String contractNo;
+
+ @Schema(description = "閿�鍞被鍨嬶細1鍐呴攢 2澶栭攢 3鏍峰搧 4鍏朵粬", example = "1")
+ @ExcelProperty(value = "閿�鍞被鍨�", converter = cn.iocoder.yudao.framework.excel.core.convert.DictConvert.class)
+ @cn.iocoder.yudao.framework.excel.core.annotations.DictFormat(cn.iocoder.yudao.module.erp.enums.DictTypeConstants.SALES_TYPE)
+ private Integer saleType;
@Schema(description = "缁撶畻璐︽埛缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "311.89")
@ExcelProperty("缁撶畻璐︽埛缂栧彿")
@@ -50,6 +55,10 @@
@Schema(description = "涓嬪崟鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("涓嬪崟鏃堕棿")
private LocalDateTime orderTime;
+
+ @Schema(description = "鏀舵鏃ユ湡锛堢敤浜� 30 澶╄处鏈熸彁閱掞級")
+ @ExcelProperty("鏀舵鏃ユ湡")
+ private LocalDateTime receiptDate;
@Schema(description = "鍚堣鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "15663")
@ExcelProperty("鍚堣鏁伴噺")
@@ -77,12 +86,15 @@
@ExcelProperty("澶囨敞")
private String remark;
+ @Schema(description = "BPM 娴佺▼瀹炰緥缂栧彿", example = "b00eb97d-2d1c-4cf1-9b4b-2a5bcdc9a3a7")
+ private String processInstanceId;
+
@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)
@@ -95,6 +107,14 @@
@Schema(description = "浜у搧淇℃伅", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("浜у搧淇℃伅")
private String productNames;
+
+ @Schema(description = "浜у搧缂栧彿锛堣鍗曢」鐗╂枡缂栫爜锛屽琛屼互閫楀彿鍒嗛殧锛�", example = "ITEM001,ITEM002")
+ @ExcelProperty("浜у搧缂栧彿")
+ private String productCodes;
+
+ @Schema(description = "宸茬敓浜ф暟閲忥紙鎸夎鍗曢」鍏宠仈鐨� MPS 宸茬敓浜ф暟閲忓悎璁★級", example = "100.00")
+ @ExcelProperty("鐢熶骇鏁伴噺")
+ private BigDecimal producedCount;
// ========== 閿�鍞嚭搴� ==========
@@ -132,6 +152,9 @@
@Schema(description = "浜у搧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
private Long productId;
+ @Schema(description = "閿�鍞骇鍝佹槑缁嗘墜宸ュ綍鍏ョ殑鐩樺彿")
+ private String reelNo;
+
@Schema(description = "浜у搧鍗曚綅鍗曚綅", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
private Long productUnitId;
@@ -147,6 +170,12 @@
@Schema(description = "绋庨锛屽崟浣嶏細鍏�", example = "100.00")
private BigDecimal taxPrice;
+
+ @Schema(description = "浜у搧閲戦锛屽崟浣嶏細鍏�", example = "100.00")
+ private BigDecimal totalProductPrice;
+
+ @Schema(description = "鍚◣閲戦锛屽崟浣嶏細鍏�", example = "113.00")
+ private BigDecimal totalPrice;
@Schema(description = "澶囨敞", example = "闅忎究")
private String remark;
@@ -173,6 +202,10 @@
@Schema(description = "浜у搧鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "宸у厠鍔�")
private String productName;
+ @Schema(description = "浜у搧缂栧彿锛堢墿鏂欑紪鐮侊級", example = "ITEM001")
+ private String productCode;
+ @Schema(description = "宸茬敓浜ф暟閲�", example = "60.00")
+ private BigDecimal quantityProduced;
@Schema(description = "浜у搧鏉＄爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "A9985")
private String productBarCode;
@Schema(description = "浜у搧鍗曚綅鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐩�")
--
Gitblit v1.9.3