From cf9f043713908fb5e6c330a23a76b41aeeffde17 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 13 九月 2023 19:28:00 +0800
Subject: [PATCH] 优化补单文件时间保存
---
igds-core/src/main/java/com/ld/igds/file/impl/CoreFileServiceImpl.java | 4 +++-
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 32 +-------------------------------
2 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/file/impl/CoreFileServiceImpl.java b/igds-core/src/main/java/com/ld/igds/file/impl/CoreFileServiceImpl.java
index cb4a302..802235a 100644
--- a/igds-core/src/main/java/com/ld/igds/file/impl/CoreFileServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/file/impl/CoreFileServiceImpl.java
@@ -86,7 +86,9 @@
}
data.setCreateTime(new Date());
data.setBizId(bizId);
- data.setBizTag(bizTag);
+ if(StringUtils.isNotEmpty(bizTag)){
+ data.setBizTag(bizTag);
+ }
data.setCompanyId(companyId);
data.setFileId(ContextUtil.getUUID());
fileServiceMapper.addFile(data);
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 ebba267..c51c6a2 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
@@ -214,35 +214,6 @@
return data;
}
- private InoutData updateFiles(InoutData data) throws Exception {
- List<FileData> files = data.getFiles();
- if (null == files) {
- return data;
- }
-
- for (FileData fileData : files) {
- fileData.setFileId(ContextUtil.getUUID());
- fileData.setCompanyId(data.getCompanyId());
- fileData.setBizId(data.getId());
- if ("HANDLE".equals(fileData.getBizTag())) {
- if (data.getEmptyWeightTime().before(data.getFullWeightTime())) {
- fileData.setCreateTime(DateUtils.addMinutes(data.getFullWeightTime(), -20));
- } else {
- fileData.setCreateTime(DateUtils.addMinutes(data.getEmptyWeightTime(), -20));
- }
- }
- if ("WEIGHT_EMPTY".equals(fileData.getBizTag())) {
- fileData.setCreateTime(data.getEmptyWeightTime());
- }
- if ("WEIGHT_FULL".equals(fileData.getBizTag())) {
- fileData.setCreateTime(data.getFullWeightTime());
- }
- coreFileService.addRecord(fileData);
- }
-
- return data;
- }
-
/**
* 浠庣紦瀛樹腑鑾峰彇涓嬩竴娴佺▼
*
@@ -492,8 +463,7 @@
if (InoutConstant.TYPE_IN.equals(data.getType())) {
this.updateCheckItems(data, true);
}
- this.updateFiles(data);
-
+ fileService.saveInoutFiles(data.getFiles(), data.getCompanyId(), data.getId(), null);
return null;
}
--
Gitblit v1.9.3