From ac6db1c4fddcb89c9668e34a35f023817a59f838 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 01 四月 2026 17:54:44 +0800
Subject: [PATCH] yys 1.产品导入新增excel错误提示 2.bom导入新增excel错误提示 3.仓储物流增加库位字段 4.修改发货出库-新增库位 5.修改采购入库审核-新增库位 6.生产入库-新增库位，审核
---
src/main/java/com/ruoyi/production/pojo/ProductOrder.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
index 70c82d8..ea7bbcc 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.dto.FileDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
@@ -10,11 +11,21 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
@Data
@TableName("product_order")
-public class ProductOrder implements Serializable {
+public class ProductOrder extends FileDto implements Serializable {
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐢熶骇浠诲姟")
+ private List<ProductProcessRouteItem> processRouteItems;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐗╂枡娓呭崟")
+ private List<ProductStructureRecord> productStructureRecords;
private static final long serialVersionUID = 1L;
@@ -30,12 +41,13 @@
/**
* 閿�鍞彴璐︿骇鍝乮d(sales_ledger_product)
*/
+ @ApiModelProperty(value = "閿�鍞彴璐︿骇鍝乮d")
private Long saleLedgerProductId;
/**
- * 閿�鍞彴璐︿骇鍝乮d(sales_ledger_product)
+ * 浜у搧瑙勬牸id
*/
- @ApiModelProperty(value = "閿�鍞彴璐︿骇鍝乮d")
+ @ApiModelProperty(value = "浜у搧瑙勬牸id")
private Long productModelId;
/**
@@ -50,6 +62,20 @@
@ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
@Excel(name = "鐢熶骇璁㈠崟鍙�")
private String npsNo;
+
+ /**
+ * 涓嶉�氳繃鍘熷洜
+ */
+ @ApiModelProperty(value = "涓嶉�氳繃鍘熷洜")
+ @Excel(name = "涓嶉�氳繃鍘熷洜")
+ private String reason;
+
+ /**
+ * 瀹為檯鍏ュ簱鏁伴噺
+ */
+ @ApiModelProperty(value = "瀹為檯鍏ュ簱鏁伴噺")
+ @Excel(name = "瀹為檯鍏ュ簱鏁伴噺")
+ private BigDecimal actualStockInNum;
/**
* 绉熸埛id
@@ -100,6 +126,14 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
+ @ApiModelProperty("浜や粯鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd",shape = JsonFormat.Shape.STRING,timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "浜や粯鏃ユ湡")
+ private LocalDate deliveryDate;
+ @ApiModelProperty("鐘舵�� 寰呯敓浜� 鐢熶骇涓� 宸插畬鎴�")
+ @Excel(name = "鐘舵��")
+ private String status;
}
--
Gitblit v1.9.3