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/common/config/MybatisHandler.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/common/config/MybatisHandler.java b/src/main/java/com/ruoyi/common/config/MybatisHandler.java
index 2acd7ba..8125a35 100644
--- a/src/main/java/com/ruoyi/common/config/MybatisHandler.java
+++ b/src/main/java/com/ruoyi/common/config/MybatisHandler.java
@@ -14,17 +14,24 @@
     public void insertFill(MetaObject metaObject) {
         Integer userId = null;
         Long tenantId = null;
+        String userName = null;
+        Long deptId = null;
         try {
             userId = SecurityUtils.getUserId().intValue();
             tenantId = SecurityUtils.getLoginUser().getTenantId();
+            userName = SecurityUtils.getUsername();
+            deptId = SecurityUtils.getLoginUser().getCurrentDeptId();
         } catch (Exception ignored) {
         }
         this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now());
         this.strictInsertFill(metaObject, "updateTime",  LocalDateTime.class, LocalDateTime.now());
         this.strictInsertFill(metaObject, "createUser", Integer.class, userId);
         this.strictInsertFill(metaObject, "updateUser", Integer.class, userId);
-        this.strictInsertFill(metaObject, "createUser", Long.class, Optional.ofNullable(userId).orElse(0).longValue());
-        this.strictInsertFill(metaObject, "updateUser", Long.class, Optional.ofNullable(userId).orElse(0).longValue());
+        this.strictInsertFill(metaObject, "createUser", Long.class, userId == null ? 0 : userId.longValue());
+        this.strictInsertFill(metaObject, "updateUser", Long.class, userId == null ? 0 : userId.longValue());
+        this.strictInsertFill(metaObject, "createUserName", String.class, userName);
+        this.strictInsertFill(metaObject, "updateUserName", String.class, userName);
+        this.strictInsertFill(metaObject, "deptId", Long.class, deptId);
         this.strictInsertFill(metaObject, "tenantId", Long.class, tenantId);
     }
 

--
Gitblit v1.9.3