From 7ea8883ca6b47ec014a32ed57c3bea64544e893e Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 19 三月 2026 17:09:34 +0800
Subject: [PATCH] feat: 生产订单绑定工艺路线、BOM、工艺路线、工序参数新增修改
---
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java | 74 ++++++++++++++++++++++++++-----------
1 files changed, 52 insertions(+), 22 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..589f885 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -1,38 +1,68 @@
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 = "閿�鍞悎鍚屽彿")
- private String salesContractNo;
-
- @ApiModelProperty(value = "椤圭洰鍚�")
- private String projectName;
-
- @ApiModelProperty(value = "瀹㈡埛鍚�")
- private String customerName;
-
@ApiModelProperty(value = "浜у搧鍚嶇О")
- private String productCategory;
+ @Excel(name = "浜у搧鍚嶇О")
+ private String productName;
@ApiModelProperty(value = "瑙勬牸")
- 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 = "璁㈠崟瀹屾垚搴�")
+ @Excel(name = "瑙勬牸")
+ private String model;
+
+ @ApiModelProperty(value = "浜у搧绫诲瀷")
+ @Excel(name = "浜у搧绫诲瀷")
+ private String strength;
+
+ @ApiModelProperty(value = "宸ヨ壓璺嚎鎻忚堪")
+ @Excel(name = "宸ヨ壓璺嚎鎻忚堪")
+ private String description;
+
+ @ApiModelProperty(value = "宸ヨ壓璺嚎浜у搧绫诲瀷")
+ @Excel(name = "宸ヨ壓璺嚎浜у搧绫诲瀷")
+ private String dictLabel;
+
+ @ApiModelProperty(value = "鐗╂枡缂栫爜")
+ @Excel(name = "鐗╂枡缂栫爜")
+ private String materialCode;
+
+ @ApiModelProperty(value = "宸ヨ壓璺嚎缂栧彿")
+ @Excel(name = "宸ヨ壓璺嚎缂栧彿")
+ private String processRouteCode;
+
+ @ApiModelProperty(value = "瀹屾垚杩涘害")
+ @Excel(name = "瀹屾垚杩涘害", suffix = "%")
private BigDecimal completionStatus;
+
+ @ApiModelProperty(value = "BOM ID")
+ @Excel(name = "BOM ID")
+ private String bomId;
+
+ @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;
+
+ //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
+ private Boolean isFh;
}
--
Gitblit v1.9.3