From 6fbd63022d55e31cffd60b4e390d608e474e99c0 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 21 十月 2023 16:15:36 +0800
Subject: [PATCH] 账面库存
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 55 ++++++++++++++-----------------------------------------
1 files changed, 14 insertions(+), 41 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 f60c2a3..200a5de 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,36 +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());
- }
- fileData.setCreateTime(new Date());
- coreFileService.addRecord(fileData);
- }
-
- return data;
- }
-
/**
* 浠庣紦瀛樹腑鑾峰彇涓嬩竴娴佺▼
*
@@ -493,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;
}
@@ -542,9 +511,9 @@
data = inoutService.inoutQueryById(param);
- if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
- return "娴佺▼缁撴潫鐨勬暟鎹笉鏀寔寮傚父澶勭悊锛�";
- }
+// if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
+// return "娴佺▼缁撴潫鐨勬暟鎹笉鏀寔寮傚父澶勭悊锛�";
+// }
if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
return "褰撳墠淇℃伅宸插仛寮傚父澶勭悊锛屼笉鏀寔閲嶅鎵ц锛�";
}
@@ -645,7 +614,7 @@
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
"鎻愮ず锛氬綋鍓嶅簱鍖烘湭閰嶇疆鍑哄叆搴撴祦绋嬩俊鎭紝璇疯仈绯荤鐞嗗憳", data);
}
-
+ List<FileData> files = data.getFiles();
// 鑾峰彇涓嬩竴涓祦绋嬬姸鎬�
String curProgress = data.getProgress();
String nextProgress = getNextProgress(curProgress, data.getType(),
@@ -659,8 +628,10 @@
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg, data);
}
- // 鎵ц闄勪欢淇℃伅
- fileService.saveInoutFiles(data.getFiles(), data.getCompanyId(), data.getId(), curProgress);
+ if(null != files && files.size()>0){
+ // 鎵ц闄勪欢淇℃伅
+ fileService.saveInoutFiles(files, data.getCompanyId(), data.getId(), curProgress);
+ }
//鐧昏瀹屾垚浜嬩欢
inoutEventControl.onInoutRegister(data);
@@ -677,7 +648,7 @@
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
"鎻愮ず锛氬綋鍓嶇郴缁熶腑娴佺▼閰嶇疆寮傚父锛岃鑱旂郴绠＄悊鍛�", data);
}
-
+ List<FileData> files = data.getFiles();
// 鑾峰彇涓嬩竴涓祦绋嬬姸鎬�
String curProgress = data.getProgress();
String nextProgress = getNextProgress(curProgress, data.getType(),
@@ -695,8 +666,10 @@
data);
}
- // 鎵ц闄勪欢淇℃伅
- fileService.saveInoutFiles(data.getFiles(), data.getCompanyId(), data.getId(), curProgress);
+ if(null != files && files.size()>0){
+ // 鎵ц闄勪欢淇℃伅
+ fileService.saveInoutFiles(files, data.getCompanyId(), data.getId(), curProgress);
+ }
// 绉伴噸瀹屾垚浜嬩欢
inoutEventControl.onInoutWeight(data, curProgress, nextProgress);
--
Gitblit v1.9.3