From 585e878b169bdeb2bc8cc452b9d2e640d00caa6d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 04 七月 2023 09:00:35 +0800
Subject: [PATCH] 质检报告
---
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 75 ++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 34 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 864fa2a..e56e76a 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);
@@ -153,9 +152,18 @@
data.setUserName("");
}
- inoutMapper.insertData(data);
+ InoutData newData;
+ if (EntityUtils.isEntity(data)) {
+ newData = new InoutData();
+ BeanUtils.copyProperties(data, newData, new String[]{"checkItems", "files"});
+ }else{
+ newData = data;
+ }
- updateInoutCache(data);
+ inoutMapper.insertData(newData);
+
+
+ updateInoutCache(newData);
} catch (Exception e) {
log.error("------------鍑哄叆搴撴墽琛屼繚瀛樺嚭閿�---{}", e);
@@ -208,7 +216,7 @@
//鏇存柊缂撳瓨
updateInoutCache(newData);
-
+
return null;
}
@@ -237,6 +245,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);
@@ -281,12 +293,15 @@
@Override
public String toComplete(InoutParam param) throws Exception {
+ param.setUpdateTime(new Date());
+
if (null == param.getCompanyId()) {
param.setCompanyId(ContextUtil.getDefaultCompanyId());
}
// 娓呴櫎缂撳瓨
this.delFromCache(param.getDeptId(), param.getType(), param.getId());
+
inoutMapper.toComplete(param);
@@ -296,7 +311,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());
@@ -307,7 +322,6 @@
if (null == data.getEmptyWeightTime()) {
data.setEmptyWeightTime(new Date());
}
-
//璋冩暣鏃堕棿宸�
if (InoutConstant.TYPE_IN.equals(data.getType())) {
@@ -336,15 +350,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;
@@ -365,8 +374,6 @@
} else {
setInoutCache(data.getDeptId(), data);
}
- //鎺ㄩ�佸ぇ灞�
- notifyToScreen(data.getCompanyId(), data.getDeptId(), data.getProgress());
}
@@ -487,7 +494,7 @@
public String addInoutDataByLossOver(InoutData data) {
// 鑾峰彇涓婁竴杞︾殑娴佹按鏁版嵁
- // InoutData inoutData = this.getLastRecord(data.getCompanyId(), data.getDepotId());
+ // InoutData inoutData = this.getLastRecord(data.getCompanyId(), data.getDepotId());
// // 璁剧疆娴佹按鐨勫簱瀛�
// if (InoutConstant.TYPE_IN.equals(inoutData.getType())) {
@@ -718,7 +725,8 @@
data.setCompanyId(ContextUtil.subDeptId(null));
}
- int num = inoutCheckMapper.updateSampleData(data);
+ inoutCheckMapper.updateSampleData(data);
+
return null;
}
@@ -748,24 +756,23 @@
}
@Override
- public String updateCheckData(InoutCheckData data) {
- if (StringUtils.isEmpty(data.getCompanyId())) {
- data.setCompanyId(ContextUtil.getCompanyId());
- }
- if (StringUtils.isEmpty(data.getDeptId())) {
- data.setCompanyId(ContextUtil.subDeptId(null));
- }
+ public String updateCheckData(InoutData data) {
+ data.setUpdateTime(new Date());
- int num = inoutCheckMapper.updateCheckData(data);
+ inoutCheckMapper.updateCheckData(data);
+
+ //鏇存柊缂撳瓨
+ updateInoutCache(data);
+
return null;
}
@Override
public List<InoutPrice> getPrice(InoutCheckParam param) {
- if(null == param.getStart()){
+ if (null == param.getStart()) {
param.setStart(new Date());
}
- if(null == param.getEnd()){
+ if (null == param.getEnd()) {
param.setEnd(new Date());
}
return inoutCheckMapper.getPrice(param);
--
Gitblit v1.9.3