From dfd793f14e51c48c3322f1b36f543179043bd45d Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期日, 22 十月 2023 18:25:27 +0800
Subject: [PATCH] 更新仓内抓拍
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 73 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 35 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 c62bd2b..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
@@ -20,7 +20,6 @@
import com.ld.igds.models.InoutSysConf;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
-import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
@@ -37,7 +36,6 @@
*
* @author
*/
-@Slf4j
@Component
public class InoutManager {
@@ -211,23 +209,6 @@
}
if (data.getAddCheck() == 0) {
data.setAddCheck(checkUpdateResult.getAddSum());
- }
-
- 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());
- fileData.setCreateTime(new Date());
- coreFileService.addRecord(fileData);
}
return data;
@@ -425,7 +406,7 @@
data.setCompleteTime(new Date());
}
// 娉ㄥ唽鏃堕棿姣斿畬鎴愭椂闂存棭涓�涓皬鏃�
- data.setRegisterTime(DateUtil.getNewByMinute(new Date(), -60));
+ data.setRegisterTime(DateUtils.addMinutes(new Date(), -80));
if (StringUtils.isEmpty(data.getUserId())) {
data.setUserId(InoutConstant.DEFAULT_ID_CARD);
@@ -440,19 +421,38 @@
if (InoutConstant.TYPE_IN.equals(data.getType())) {
if (null == data.getFullWeightTime()) {
- data.setFullWeightTime(DateUtil.getNewByMinute(new Date(), -50));
+ data.setFullWeightTime(DateUtils.addMinutes(new Date(), -50));
}
if (null == data.getEmptyWeightTime()) {
- data.setEmptyWeightTime(DateUtil.getNewByMinute(new Date(), -10));
+ data.setEmptyWeightTime(DateUtils.addMinutes(new Date(), -10));
+ }
+
+ if (data.getCompleteTime().before(data.getEmptyWeightTime())) {
+ data.setEmptyWeightTime(DateUtils.addMinutes(data.getCompleteTime(), -10));
+ }
+ if (data.getEmptyWeightTime().before(data.getFullWeightTime())) {
+ data.setFullWeightTime(DateUtils.addMinutes(data.getEmptyWeightTime(), -40));
+ }
+ if (data.getFullWeightTime().before(data.getRegisterTime())) {
+ data.setRegisterTime(DateUtils.addMinutes(data.getFullWeightTime(), -30));
}
data = this.updateCheckItems(data, false);
} else {
if (null == data.getEmptyWeightTime()) {
- data.setEmptyWeightTime(DateUtil.getNewByMinute(new Date(), -50));
+ data.setEmptyWeightTime(DateUtils.addMinutes(new Date(), -50));
}
if (null == data.getFullWeightTime()) {
- data.setFullWeightTime(DateUtil.getNewByMinute(new Date(), -10));
+ data.setFullWeightTime(DateUtils.addMinutes(new Date(), -10));
+ }
+ if (data.getCompleteTime().before(data.getFullWeightTime())) {
+ data.setFullWeightTime(DateUtils.addMinutes(data.getCompleteTime(), -10));
+ }
+ if (data.getFullWeightTime().before(data.getEmptyWeightTime())) {
+ data.setEmptyWeightTime(DateUtils.addMinutes(data.getEmptyWeightTime(), -40));
+ }
+ if (data.getEmptyWeightTime().before(data.getRegisterTime())) {
+ data.setRegisterTime(DateUtils.addMinutes(data.getFullWeightTime(), -30));
}
}
@@ -463,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;
}
@@ -512,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 "褰撳墠淇℃伅宸插仛寮傚父澶勭悊锛屼笉鏀寔閲嶅鎵ц锛�";
}
@@ -615,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(),
@@ -629,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);
@@ -647,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(),
@@ -665,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