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/ProductProcess.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index 18fe087..199e862 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -55,16 +55,20 @@
@Excel(name = "澶囨敞")
private String remark;
+ @ApiModelProperty(value ="鎶ュ伐浜篿ds")
+ @TableField(value = "user_ids")
+ @Excel(name = "鎶ュ伐浜篿ds")
+ private String userIds;
/**
* 宸ヨ祫瀹氶
*/
- @Excel(name = "宸ヨ祫瀹氶")
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @Excel(name = "宸ヨ祫瀹氶" )
+// @TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal salaryQuota;
@ApiModelProperty("绫诲瀷 鍖哄垎鏄鏃惰繕鏄浠� 0 璁℃椂 1璁′欢")
- @Excel(name = "绫诲瀷 0 璁℃椂 1璁′欢")
+// @Excel(name = "绫诲瀷 0 璁℃椂 1璁′欢")
private Long type;
/**
@@ -98,4 +102,11 @@
@ApiModelProperty(value ="璁惧id")
@TableField(value = "device_id")
private Long deviceId;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
--
Gitblit v1.9.3