From f2c7576cbd050824ec78233483e06fc375382bfb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 四月 2026 17:04:03 +0800
Subject: [PATCH] yys 1.客户档案导入-维护人，维护时间默认当前 2.销售报价审核非必填，产品选择方式也要改 3.销售产品增加物料号字段 4.产品维护增加录入时间，修改时间 6.发货审核不需要了 7.BI的生产核算分析不要了，增加生产订单当前工序 3.库存导入模板规格改成图纸编号，产品名称可以为空，加个库位 4.库存管理外购改为标准件 5.bom产品唯一 6.产品根据bom计算子项数量（只统计二级）
---
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
index b12803d..288965f 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -1,12 +1,18 @@
package com.ruoyi.production.dto;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductOrder;
+import com.ruoyi.production.pojo.ProductWorkOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
@Data
@ExcelIgnoreUnannotated
@@ -28,6 +34,9 @@
@Excel(name = "浜у搧鍚嶇О")
private String productCategory;
+
+ private String drawingNumber;
+
@ApiModelProperty(value = "瑙勬牸")
@Excel(name = "瑙勬牸")
private String specificationModel;
@@ -36,11 +45,32 @@
@Excel(name = "宸ヨ壓璺嚎缂栧彿")
private String processRouteCode;
- @ApiModelProperty(value = "瀹屾垚鐘舵��")
- @Excel(name = "瀹屾垚鐘舵��")
+ @ApiModelProperty(value = "瀹屾垚杩涘害")
+ @Excel(name = "瀹屾垚杩涘害", suffix = "%")
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;
+
+ //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
+ private Boolean isFh;
+
+ @ApiModelProperty(value = "搴撳瓨鏁伴噺")
+ @Excel(name = "搴撳瓨鏁伴噺")
+ private BigDecimal inventoryQuantity;
+
+ @ApiModelProperty(value = "鎿嶄綔 1-寮�濮� 2-鏆傚仠")
+ private Integer operation;
+
+ @ApiModelProperty(value = "鐢熶骇浠诲姟")
+ private List<ProductWorkOrderDto> productWorkOrders;
}
--
Gitblit v1.9.3