From 5c891d8d2c206dfd2aa6daf59579eb2b6843dcc0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 01 四月 2026 18:00:37 +0800
Subject: [PATCH] fix:1.采购/销售入库去掉审批 2.返工下载附件内容变更 3.生产/库存入库生产日期添加 4.仓库导入导出字段优化
---
src/main/java/com/ruoyi/production/pojo/ProductOrder.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 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 c729ea9..1d80c53 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -14,7 +13,7 @@
@Data
@TableName("product_order")
-public class ProductOrder implements Serializable {
+public class ProductOrder implements Serializable {
private static final long serialVersionUID = 1L;
@@ -31,10 +30,16 @@
* 閿�鍞彴璐︿骇鍝乮d(sales_ledger_product)
*/
@ApiModelProperty(value = "閿�鍞彴璐︿骇鍝乮d")
+ private Long saleLedgerProductId;
+
+ /**
+ * 浜у搧瑙勬牸id
+ */
+ @ApiModelProperty(value = "浜у搧瑙勬牸id")
private Long productModelId;
/**
- * 宸ヨ壓璺嚎id
+ * 妯＄増鐨勫伐鑹鸿矾绾縤d
*/
@ApiModelProperty(value = "宸ヨ壓璺嚎id")
private Long routeId;
@@ -95,6 +100,33 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
+ /**
+ * 棰勮鏃ョ▼
+ */
+ private BigDecimal expectedSchedule;
+ /**
+ * 鍒堕�犵彮缁�
+ */
+ private String manufacturingTeam;
+ /**
+ * 鎵瑰彿
+ */
+ @ApiModelProperty(value = "鎵瑰彿")
+ private String batchNo;
+
+ private Boolean isEnd;
+
+ /**
+ * 娓呭満璁板綍
+ */
+ @ApiModelProperty(value = "娓呭満璁板綍")
+ private String cleanRecord;
+
+ /**
+ * 棰嗘枡璁板綍
+ */
+ @ApiModelProperty(value = "棰嗘枡璁板綍")
+ private String drawMaterials;
}
--
Gitblit v1.9.3