From b04a7e554c7d7c5ffb6305915bb142ed26d0cabf Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 01 十一月 2023 14:24:47 +0800
Subject: [PATCH] 药剂Id生成--日期+三位顺序号
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 7b88614..e4a9896 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -256,7 +256,9 @@
}
if (InoutConstant.PROGRESS_CHECK.equals(data.getProgress())) {
- data.setCheckUser(ContextUtil.getLoginUserCName());
+ if (StringUtils.isEmpty(data.getCheckUser())) {
+ data.setCheckUser(ContextUtil.getLoginUserCName());
+ }
data.setProgress(nextProgress);
return data;
}
@@ -875,6 +877,7 @@
curData.setCheckTime(new Date());
data.setCheckTime(new Date());
}
+ curData.setCheckUser(data.getCheckUser());
curData.setCheckStatus(data.getCheckStatus());
curData.setFoodYear(data.getFoodYear());
--
Gitblit v1.9.3