From 7a7f25589201118fe75e0503c3529f964c6b9c21 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 31 五月 2023 20:44:34 +0800
Subject: [PATCH] 扦样提交3
---
igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java b/igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java
index d147fda..003eb33 100644
--- a/igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java
+++ b/igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java
@@ -3,7 +3,6 @@
import com.bstek.bdf2.core.model.DefaultCompany;
import com.bstek.dorado.annotation.Expose;
import com.ld.igds.common.CoreCommonService;
-import com.ld.igds.constant.Constant;
import com.ld.igds.constant.DepotStatus;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutData;
@@ -139,11 +138,11 @@
//鍙湁鍑哄叆搴撶姸鎬佺殑浠撳簱鎵嶈繘琛岀粺璁★紝鍏朵粬鐘舵�佽〃绀哄嚭鍏ュ簱浣滀笟瀹屾垚锛屼笉鍦ㄦ墽琛岀粺璁�
- if (DepotStatus.STATUS_03.getCode().equals(lastStore.getDepotStatus()) ||
- DepotStatus.STATUS_04.getCode().equals(lastStore.getDepotStatus())) {
+ if (DepotStatus.STATUS_2.getCode().equals(lastStore.getDepotStatus()) ||
+ DepotStatus.STATUS_4.getCode().equals(lastStore.getDepotStatus())) {
param = new InoutParam();
- param.setStart(lastStore.getCreateDate());
+ //param.setStart(lastStore.getCreateDate());
param.setEnd(new Date());
param.setDeptId(data.getDeptId());
param.setDepotId(data.getDepotId());
@@ -158,7 +157,7 @@
lastStore.setId(ContextUtil.getUUID());
lastStore.setUpdateUser(null);
lastStore.setUpdateDate(new Date());
- lastStore.setCreateDate(new Date());
+ // lastStore.setCreateDate(new Date());
if (InoutConstant.TYPE_IN.equals(data.getType())) {
lastStore.setStorageReal(lastStore.getStorageReal() + sumRecordWeight);
@@ -208,16 +207,12 @@
for (InoutSysConf inoutSysConf : inoutSysConfList) {
// 鍒ゆ柇鍏ュ簱閫氱煡鍗曟槸鍚﹀惎鐢�
- if (Constant.YN_Y.equals(inoutSysConf.getNoticeTagIn())) {
- //鏇存柊鍏ュ簱閫氱煡鍗曞畬鎴愰噺
- inoutCommonService.updateSumNoticeIn(inoutSysConf.getDeptId(), noticeInList);
- }
+ //鏇存柊鍏ュ簱閫氱煡鍗曞畬鎴愰噺
+ inoutCommonService.updateSumNoticeIn(inoutSysConf.getDeptId(), noticeInList);
// 鍒ゆ柇鍑哄簱閫氱煡鍗曟槸鍚﹀惎鐢�
- if (Constant.YN_Y.equals(inoutSysConf.getNoticeTagOut())) {
- //鏇存柊鍑哄簱閫氱煡鍗曞畬鎴愰噺
- inoutCommonService.updateSumNoticeOut(inoutSysConf.getDeptId(), noticeOutList);
- }
+ //鏇存柊鍑哄簱閫氱煡鍗曞畬鎴愰噺
+ inoutCommonService.updateSumNoticeOut(inoutSysConf.getDeptId(), noticeOutList);
}
}
--
Gitblit v1.9.3