From 7e2a72d1a9c73320b0f4b7e7a580372f7af55e04 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 16 八月 2023 10:28:24 +0800
Subject: [PATCH] 损益管理页面优化
---
igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 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 559f11f..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
@@ -84,9 +84,6 @@
Session session = this.getSessionFactory().openSession();
data.setUpdateTime(new Date());
data.setUpdateUser(ContextUtil.getLoginUserCName());
- if ("OVER".equals(data.getType())) {
- data.setAmount(0 - data.getAmount());
- }
try {
if (null == data.getId()) {
@@ -104,14 +101,12 @@
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.setCzbz("i");
data.setId(id);
session.save(data);
} else {
- data.setCzbz("u");
session.update(data);
}
} catch (Exception e) {
@@ -202,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");
@@ -212,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;
@@ -230,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