From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2
---
igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
index 9d9eda4..9479b46 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
@@ -85,7 +85,6 @@
data.setUpdateTime(new Date());
data.setUpdateUser(ContextUtil.getLoginUserCName());
-
try {
if (null == data.getId()) {
IUser user = ContextUtil.getLoginUser();
@@ -102,9 +101,8 @@
if (data.getSubmitTime().before(curDate)) {
data.setSubmitTime(curDate);
}
- String id = createId(data.getSubmitTime(), data.getCompanyId(), data.getHwdm());
+ String id = createId(data.getSubmitTime(), data.getCompanyId(), data.getType());
// String id = addInoutDataByLossOver(data);
-
data.setId(id);
session.save(data);
@@ -199,7 +197,7 @@
return this.query(hql, args);
}
- public String createId(Date date, String companyId, String freightId) {
+ public String createId(Date date, String companyId, String type) {
// 鏃堕棿鎴虫爣绛�
String timeKey = DateFormatUtils.format(date, "yyyyMMdd");
@@ -209,17 +207,16 @@
String cacheId = (String) redisUtil.get(cacheKey);
- if (null != cacheId && cacheId.indexOf(freightId + timeKey) >= 0) {
+ if (null != cacheId && cacheId.indexOf(timeKey) >= 0) {
String temp = cacheId.substring(cacheId.length() - 3);
Integer i = Integer.valueOf(temp);
- cacheId = freightId + timeKey + String.format("%03d", ++i);
+ cacheId = timeKey + String.format("%03d", ++i);
} else {
Map<String, Object> args = new HashMap<>();
- args.put("timeKey", freightId + timeKey + "%");
+ args.put("timeKey", timeKey + "%");
List<InoutLossOver> result = getMaxId(args);
-
if (null == result || result.size() == 0) {
- cacheId = freightId + timeKey + "001";
+ cacheId = timeKey + "001";
} else {
int max = 0;
int num;
@@ -227,7 +224,7 @@
num = Integer.parseInt(inoutLossOver.getId().substring(inoutLossOver.getId().length() - 3));
max = Math.max(max, num);
}
- cacheId = freightId + timeKey + String.format("%03d", ++max);
+ cacheId = timeKey + String.format("%03d", ++max);
}
}
// 鏇存柊缂撳瓨
--
Gitblit v1.9.3