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/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
index e022468..61442c4 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
@@ -19,29 +19,32 @@
          * 鍖哄煙鍚嶇О
          */
         @ApiModelProperty("鍖哄煙鍚嶇О")
-        @Excel(name = "鍖哄煙鍚嶇О")
         private String areaName;
 
         /**
          * 鍖哄煙绫诲瀷
          */
         @ApiModelProperty("鍖哄煙绫诲瀷")
-        @Excel(name = "鍖哄煙绫诲瀷")
         private String areaType;
         /**
          * 鎺掑簭
          */
-        @TableField(fill = FieldFill.INSERT)
         private Long sort;
 
         /**
          * 鐖剁被id
          */
-        @TableField(fill = FieldFill.INSERT)
         private Long fuId;
         /**
          * 绉熸埛id
          */
         @TableField(fill = FieldFill.INSERT)
         private Long tenantId;
+    @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
+
 }

--
Gitblit v1.9.3