From fd827141a7f5004bb17e44b04cadecadb0099d60 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 29 六月 2023 18:17:36 +0800
Subject: [PATCH] 合同管理调整
---
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
index b89eccf..ed3e4e3 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
@@ -15,7 +15,6 @@
import com.ld.igds.inout.mapper.InoutCheckMapper;
import com.ld.igds.inout.mapper.InoutRecordMapper;
import com.ld.igds.inout.service.InoutService;
-import com.ld.igds.models.Depot;
import com.ld.igds.models.InoutPrice;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
@@ -57,8 +56,6 @@
if (null != result) {
return result;
}
-
-
List<InoutData> list = inoutMapper.inoutProgressQuery(param);
if (null == list || list.size() == 0)
return null;
@@ -106,16 +103,18 @@
}
@Override
- public String inoutStop(InoutParam param) {
+ public String inoutStop(InoutParam param) throws Exception {
if (StringUtils.isEmpty(param.getCompanyId())) {
- param.setCompanyId(ContextUtil.getCompanyId());
+ param.setCompanyId(ContextUtil.getDefaultCompanyId());
}
+
+
+ param.setProgress(InoutConstant.PROGRESS_RECORD);
+ param.setRecordStatus(InoutConstant.RECORD_STATUS_DEL);
+
// 缂撳瓨涓垹闄�
delFromCache(param.getDeptId(), param.getType(), param.getId());
-
- param.setProgress(InoutConstant.PROGRESS_RECORD);
- param.setRecordStatus(InoutConstant.RECORD_STATUS_ERROR);
inoutMapper.inoutStop(param);
@@ -238,6 +237,10 @@
if (null != param.getUserId()) {
param.setUserId("%" + param.getUserId() + "%");
}
+
+ if(null != param.getRecordStatus() && InoutConstant.RECORD_STATUS_NORMAL.equals(param.getRecordStatus())){
+ param.setRecordStatus(null);
+ }
List<InoutData> records = inoutMapper.pageRecordData(page, param);
//鍒ゆ柇鍏ュ簱閲嶉噺鏄惁涓虹┖锛屼负绌哄垯璧嬪�肩粨绠楅噸閲�
@@ -299,7 +302,7 @@
@Override
public String quickComplete(InoutData data) throws Exception {
if (null == data.getCompanyId()) {
- data.setCompanyId(ContextUtil.getCompanyId());
+ data.setCompanyId(ContextUtil.getDefaultCompanyId());
}
if (null == data.getCompleteTime()) {
data.setCompleteTime(new Date());
@@ -310,7 +313,6 @@
if (null == data.getEmptyWeightTime()) {
data.setEmptyWeightTime(new Date());
}
-
//璋冩暣鏃堕棿宸�
if (InoutConstant.TYPE_IN.equals(data.getType())) {
@@ -339,15 +341,10 @@
// 璁剧疆娴佺▼缁撴潫
data.setProgress(InoutConstant.PROGRESS_RECORD);
-
- if (null == data.getFoodType()) {
- // 鏍规嵁浠撳簱淇℃伅鑾峰彇缂撳瓨
- Depot depot = commonService.getCacheDepot(data.getCompanyId(), data.getDepotId());
- data.setFoodType(depot.getFoodType());
- }
-
+ //鎵ц鏇存柊
inoutMapper.updateData(data);
+ //鏇存柊缂撳瓨
updateInoutCache(data);
return null;
@@ -368,8 +365,6 @@
} else {
setInoutCache(data.getDeptId(), data);
}
-
-
}
@@ -721,7 +716,7 @@
data.setCompanyId(ContextUtil.subDeptId(null));
}
- int num = inoutCheckMapper.updateSampleData(data);
+ inoutCheckMapper.updateSampleData(data);
return null;
}
@@ -754,7 +749,8 @@
@Override
public String updateCheckData(InoutData data) {
data.setUpdateTime(new Date());
- int num = inoutCheckMapper.updateCheckData(data);
+
+ inoutCheckMapper.updateCheckData(data);
//鏇存柊缂撳瓨
updateInoutCache(data);
--
Gitblit v1.9.3