From 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 15:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java | 159 ++++++++++------------------------------------------
1 files changed, 32 insertions(+), 127 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java
index a6aa0ce..5dd5160 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java
@@ -1,12 +1,11 @@
package com.ruoyi.production.bean.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
/**
* <br>
@@ -20,126 +19,43 @@
@Data
@Schema(name = "閿�鍞敓浜ч渶姹� Excel瀵煎叆瀵煎嚭DTO")
public class ProductionPlanImportDto {
- /**
- * 鐢宠鍗曠紪鍙�
- */
- @Schema(description = "鐢宠鍗曠紪鍙�")
- @Excel(name = "鐢宠鍗曠紪鍙�")
- private String applyNo;
- /**
- * 瀹㈡埛鍚嶇О
- */
- @Schema(description = "瀹㈡埛鍚嶇О")
- @Excel(name = "瀹㈡埛鍚嶇О")
- private String customerName;
+ @Schema(description = "涓荤敓浜ц鍒掑彿")
+ @Excel(name = "涓荤敓浜ц鍒掑彿")
+ private String mpsNo;
- /**
- * 鐗╂枡缂栫爜
- */
- @Schema(description = "鐗╂枡缂栫爜")
- @Excel(name = "鐗╂枡缂栫爜")
- private String materialCode;
+ @Schema(description = "闇�姹傛棩鏈�")
+ @Excel(name = "闇�姹傛棩鏈�")
+ private LocalDate requiredDate;
- /**
- * 浜у搧鍚嶇О
- */
+ @Schema(description = "澶囨敞")
+ @Excel(name = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "闇�姹傛暟閲�")
+ @Excel(name = "闇�姹傛暟閲�")
+ private BigDecimal qtyRequired;
+
+ @Schema(description = "鏉ユ簮 閿�鍞�/鍐呴儴")
+ @Excel(name = "鏉ユ簮 閿�鍞�/鍐呴儴")
+ private String source;
+
+ @Schema(description = "鎵胯鏃ユ湡")
+ @Excel(name = "鎵胯鏃ユ湡")
+ private LocalDate promisedDeliveryDate;
+
@Schema(description = "浜у搧鍚嶇О")
@Excel(name = "浜у搧鍚嶇О")
private String productName;
- /**
- * 浜у搧瑙勬牸
- */
- @Schema(description = "浜у搧瑙勬牸")
- @Excel(name = "浜у搧瑙勬牸")
- private String productSpec;
+ @Schema(description = "瑙勬牸鍨嬪彿")
+ @Excel(name = "瑙勬牸鍨嬪彿")
+ private String model;
- /**
- * 闀�
- */
- @Schema(description = "闀�")
- @Excel(name = "闀�(mm)")
- private Integer length;
+ @Schema(description = "鍗曚綅")
+ @Excel(name = "鍗曚綅")
+ private String unit;
- /**
- * 瀹�
- */
- @Schema(description = "瀹�")
- @Excel(name = "瀹�(mm)")
- private Integer width;
-
- /**
- * 楂�
- */
- @Schema(description = "楂�")
- @Excel(name = "楂�(mm)")
- private Integer height;
-
- /**
- * 鍧楁暟
- */
- @Schema(description = "鍧楁暟")
- @Excel(name = "鍧楁暟")
- private Integer quantity;
-
- /**
- * 鏂规暟
- */
- @Schema(description = "鏂规暟")
- @Excel(name = "鏂规暟")
- private BigDecimal volume;
-
- /**
- * 寮哄害
- */
- @Schema(description = "寮哄害")
- @Excel(name = "寮哄害")
- private String strength;
-
- /**
- * 寮�濮嬫棩鏈�
- */
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @Schema(description = "寮�濮嬫棩鏈�")
- @Excel(name = "寮�濮嬫棩鏈�", width = 20, dateFormat = "yyyy-MM-dd")
- private Date startDate;
-
- /**
- * 缁撴潫鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @Schema(description = "缁撴潫鏃ユ湡")
- @Excel(name = "缁撴潫鏃ユ湡", width = 20, dateFormat = "yyyy-MM-dd")
- private Date endDate;
-
- /**
- * 鎻愪氦浜�
- */
- @Schema(description = "鎻愪氦浜�")
- @Excel(name = "鎻愪氦浜�")
- private String submitter;
-
- /**
- * 鎻愪氦浜虹粍缁�
- */
- @Schema(description = "鎻愪氦浜虹粍缁�")
- @Excel(name = "鎻愪氦浜虹粍缁�")
- private String submitOrg;
-
- /**
- * 澶囨敞1
- */
- @Schema(description = "澶囨敞1")
- @Excel(name = "澶囨敞1")
- private String remarkOne;
-
- /**
- * 澶囨敞2
- */
- @Schema(description = "澶囨敞2")
- @Excel(name = "澶囨敞2")
- private String remarkTwo;
/**
* 鍒涘缓浜�
@@ -155,22 +71,11 @@
@Excel(name = "淇敼浜�", type = Excel.Type.EXPORT)
private String modifierName;
- /**
- * 鏁版嵁鍚屾绫诲瀷锛�1=鎵嬪姩 2=瀹氭椂浠诲姟
- */
- @Schema(description = "鏁版嵁鍚屾绫诲瀷锛�1=鎵嬪姩 2=瀹氭椂浠诲姟")
- private Integer dataSyncType;
/**
- * 鏁版嵁鏉ユ簮绫诲瀷锛�1=鍚屾 2=鏂板
+ * 宸蹭笅鍙戞暟閲�
*/
- @Schema(description = "鏁版嵁鏉ユ簮绫诲瀷锛�1=鍚屾 2=鏂板")
- private Integer dataSourceType;
-
- /**
- * 涓嬪彂鏁伴噺
- */
- @Schema(description = "涓嬪彂鏁伴噺")
- @Excel(name = "涓嬪彂鏁伴噺", type = Excel.Type.EXPORT)
+ @Schema(description = "宸蹭笅鍙戞暟閲�")
+ @Excel(name = "宸蹭笅鍙戞暟閲�", type = Excel.Type.EXPORT)
private BigDecimal assignedQuantity;
}
--
Gitblit v1.9.3