From a08dce3de307ce138396db5fe7274ead2ef5c573 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 17:12:08 +0800
Subject: [PATCH] Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-management-after into sqd-hb
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
new file mode 100644
index 0000000..f851c05
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -0,0 +1,44 @@
+package com.ruoyi.production.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.production.pojo.ProductionProductMain;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ExcelIgnoreUnannotated
+public class ProductionProductMainDto extends ProductionProductMain {
+ @ApiModelProperty(value = "宸ュ崟缂栧彿")
+ @Excel(name = "宸ュ崟缂栧彿")
+ private String workOrderNo;
+
+ @ApiModelProperty(value = "宸ュ崟鐘舵��")
+ private String workOrderStatus;
+
+ @ApiModelProperty(value = "鎶ュ伐浜哄憳鏄电О")
+ @Excel(name = "鎶ュ伐浜�")
+ private String nickName;
+
+ @ApiModelProperty(value = "鎶ュ伐鏁伴噺")
+ @Excel(name = "鎶ュ伐鏁伴噺")
+ private BigDecimal quantity;
+
+ //浜у搧鍚嶇О
+ @Excel(name = "浜у搧鍚嶇О")
+ private String productName;
+
+ //浜у搧瑙勬牸鍨嬪彿
+ @Excel(name = "浜у搧瑙勬牸鍨嬪彿")
+ private String productModelName;
+
+ //鍗曚綅
+ @Excel(name = "鍗曚綅")
+ private String unit;
+
+ //閿�鍞悎鍚屽彿
+ @Excel(name = "閿�鍞悎鍚屽彿")
+ private String salesContractNo;
+}
--
Gitblit v1.9.3