From f7649c532163847914e3591236e77c99fb68e1a8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 30 一月 2026 16:42:00 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New
---
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
index f9fdbbd..299cfd7 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -1,38 +1,57 @@
package com.ruoyi.production.dto;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.time.LocalDate;
@Data
+@ExcelIgnoreUnannotated
public class ProductOrderDto extends ProductOrder {
@ApiModelProperty(value = "閿�鍞悎鍚屽彿")
+ @Excel(name = "閿�鍞悎鍚屽彿")
private String salesContractNo;
@ApiModelProperty(value = "椤圭洰鍚�")
+ @Excel(name = "椤圭洰鍚�")
private String projectName;
- @ApiModelProperty(value = "瀹㈡埛鍚�")
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
@ApiModelProperty(value = "浜у搧鍚嶇О")
+ @Excel(name = "浜у搧鍚嶇О")
private String productCategory;
@ApiModelProperty(value = "瑙勬牸")
+ @Excel(name = "瑙勬牸")
private String specificationModel;
- @ApiModelProperty(value = "璁″垝鏁伴噺")
- private Integer planQuantity;
- @ApiModelProperty(value = "鏁伴噺")
- private Integer Quantity;
- @ApiModelProperty(value = "宸ュ崟鍙�")
- private String workOrderNo;
- @ApiModelProperty(value = "鏄惁鎶ュ伐")
- private Integer reportWork;
- @ApiModelProperty(value = "宸ュ崟鐘舵��")
- private Integer status;
- @ApiModelProperty(value = "璁㈠崟瀹屾垚搴�")
+
+ @ApiModelProperty(value = "宸ヨ壓璺嚎缂栧彿")
+ @Excel(name = "宸ヨ壓璺嚎缂栧彿")
+ private String processRouteCode;
+
+ @ApiModelProperty(value = "瀹屾垚鐘舵��")
+ @Excel(name = "瀹屾垚鐘舵��")
private BigDecimal completionStatus;
+
+ @ApiModelProperty(value = "BOM缂栧彿")
+ @Excel(name = "BOM缂栧彿")
+ private String bomNo;
+
+ @ApiModelProperty(value = "浜ゆ湡鍋忓樊")
+ private Integer deliveryDaysDiff;
+
+ @ApiModelProperty(value = "浜ゆ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate deliveryDate;
}
--
Gitblit v1.9.3