From 407a9d87ba0bd58e7795ff5387b0cb005d630bed Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 16:45:30 +0800
Subject: [PATCH] 生产入库逻辑修改，只有最后一道工序的报工才会入库，只有成品检验和原材料检验入库
---
src/main/java/com/ruoyi/production/pojo/ProductOrder.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
index 50de3a0..699110e 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -49,7 +49,6 @@
* 鐢熶骇璁㈠崟鍙�
*/
@ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
- @Excel(name = "鐢熶骇璁㈠崟鍙�")
private String npsNo;
/**
@@ -64,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;
//淇敼鏃堕棿
@@ -79,24 +77,21 @@
* 闇�姹傛暟閲�
*/
@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;
@@ -114,6 +109,7 @@
* 澶囨敞
*/
@TableField(value = "remark")
+ @Excel(name = "澶囨敞",sort = 12)
private String remark;
}
--
Gitblit v1.9.3