From 2afe456a6b22dd5d1f7f3d13b419b3f6c1be8deb Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 15 八月 2025 14:55:49 +0800
Subject: [PATCH] #申请入库时总任务数量上限(入库、出库)
---
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index efbd735..6073321 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -351,6 +351,10 @@
return null;
}
+ public long getWrkSts(){
+ return (long)this.wrkSts;
+ }
+
public String getIoType$(){
BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
BasWrkIotype basWrkIotype = service.selectById(this.ioType);
@@ -459,7 +463,10 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
+ if(Cools.isEmpty(user.getNickname())){
+ return String.valueOf(user.getUsername());
+ }
+ return String.valueOf(user.getNickname());
}
return null;
}
--
Gitblit v1.9.1