From ac79dfd8d661dbe166553ff80fbdbfee64e8134e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 28 四月 2026 16:02:20 +0800
Subject: [PATCH] feat(production): 添加工序ID字段支持
---
src/main/java/com/ruoyi/production/pojo/ProductOrder.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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..699110e 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -31,10 +31,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;
@@ -43,7 +49,6 @@
* 鐢熶骇璁㈠崟鍙�
*/
@ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
- @Excel(name = "鐢熶骇璁㈠崟鍙�")
private String npsNo;
/**
@@ -58,7 +63,6 @@
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
//淇敼鏃堕棿
@@ -73,28 +77,39 @@
* 闇�姹傛暟閲�
*/
@ApiModelProperty(value = "闇�姹傛暟閲�")
- @Excel(name = "闇�姹傛暟閲�")
+ @Excel(name = "鍗板埛鏁伴噺",sort = 6)
private BigDecimal quantity;
/**
* 瀹屾垚鏁伴噺
*/
@ApiModelProperty(value = "瀹屾垚鏁伴噺")
- @Excel(name = "瀹屾垚鏁伴噺")
private BigDecimal completeQuantity;
- @Excel(name = "寮�濮嬫椂闂�")
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
- @Excel(name = "缁撴潫鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ /**
+ * 澶囨敞
+ */
+ @TableField(value = "remark")
+ @Excel(name = "澶囨敞",sort = 12)
+ private String remark;
+
}
--
Gitblit v1.9.3