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/manager/InoutManager.java | 67 ++++++++++++++++-----------------
1 files changed, 32 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 5ed72b9..9373ae5 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
@@ -199,9 +199,12 @@
* @param data
* @return
*/
- private InoutData updateCheckItems(InoutData data) throws Exception {
+ private InoutData updateCheckItems(InoutData data, boolean toSave) throws Exception {
if (null == data.getCheckItems()) return data;
+
+ //璁剧疆娌℃湁璐ㄦID锛屽彇娑堟墽琛屾寔涔呭寲
+ if (!toSave) data.setCheckId(null);
// 鏇存柊妫�楠岄」鏁版嵁
CheckUpdateResult checkUpdateResult = checkStandardManager.updateCheckItems(data.getCheckId(), data.getCompanyId(), data.getCheckItems());
@@ -321,7 +324,7 @@
param.setIntelCard(data.getIntelCard());
param.setUserId(data.getCompleteUser());
param.setDepotId(data.getDepotId());
- param.setCompleteTime(data.getCompleteTime());
+ param.setCompleteTime(new Date());
param.setProgress(InoutConstant.PROGRESS_RECORD);
String msg = inoutService.toComplete(param);
@@ -383,7 +386,7 @@
public String addInoutData(InoutData data) throws Exception {
if (data.getSettleWeight() <= 0.0) {
- return "琛ュ崟鏁版嵁瑕佹眰缁撶畻閲嶉噺蹇呴』澶т簬0";
+ return "绯荤粺锛氳ˉ鍗曟暟鎹姹傜粨绠楅噸閲忓繀椤诲ぇ浜�0";
}
// 琛ュ崟鏁版嵁鐩存帴鍒扮粨鏋滅姸鎬�
@@ -415,40 +418,34 @@
data.setCheckUser(loginUser);
}
- // 淇濆瓨妫�娴嬮」鐩�
- if (InoutConstant.TYPE_IN.equals(data.getType())) {
+ if (InoutConstant.TYPE_IN.equals(data.getType())) {
if (null == data.getFullWeightTime()) {
data.setFullWeightTime(DateUtil.getNewByMinute(new Date(), -50));
}
if (null == data.getEmptyWeightTime()) {
- data.setEmptyWeightTime(DateUtil
- .getNewByMinute(new Date(), -10));
+ data.setEmptyWeightTime(DateUtil.getNewByMinute(new Date(), -10));
}
- // 鍏堟墽琛屽寲楠屼俊鎭繚瀛�
- CheckUpdateResult checkResult = checkStandardManager
- .updateCheckItems(data.getCheckId(), data.getCompanyId(),
- data.getCheckItems());
- if (null != checkResult) {
- // if (null == data.getWet())data.setWet(checkResult.getWet());
- // if (null ==
- // data.getImpurity())data.setImpurity(checkResult.getImpurity());
- }
+ data = this.updateCheckItems(data, false);
} else {
if (null == data.getEmptyWeightTime()) {
- data.setEmptyWeightTime(DateUtil
- .getNewByMinute(new Date(), -50));
+ data.setEmptyWeightTime(DateUtil.getNewByMinute(new Date(), -50));
}
if (null == data.getFullWeightTime()) {
data.setFullWeightTime(DateUtil.getNewByMinute(new Date(), -10));
}
}
- // 娣诲姞琛ュ崟鏁版嵁
- String msg = inoutService.insertData(data);
- return msg;
+ //鍏堜繚瀛樹富琛紝鍚庢墽琛屽瓙琛�
+ inoutService.insertData(data);
+
+ if (InoutConstant.TYPE_IN.equals(data.getType())) {
+ this.updateCheckItems(data, true);
+ }
+
+ return null;
}
/**
@@ -472,9 +469,9 @@
// 淇濆瓨妫�娴嬮」鐩�
if (InoutConstant.TYPE_IN.equals(data.getType())) {
- data = updateCheckItems(data);
+ data = updateCheckItems(data, true);
}
-
+
return inoutService.updateData(data);
}
@@ -634,7 +631,7 @@
data = updateBasicInfo(data, curProgress, nextProgress);
// 鍏ュ簱绉伴噸鍙兘璋冩暣璐ㄦ鍗�
- data = updateCheckItems(data);
+ data = updateCheckItems(data, true);
// 鎵ц鏁版嵁鏇存柊
String msg = inoutService.updateData(data);
@@ -698,8 +695,7 @@
}
// 鑾峰彇绯荤粺鍙傛暟閰嶇疆
- InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(
- data.getCompanyId(), data.getDeptId());
+ InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
if (null == inoutSysConf) {
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
"鎻愮ず锛氬綋鍓嶇郴缁熶腑娴佺▼閰嶇疆寮傚父锛岃鑱旂郴绠＄悊鍛�", data);
@@ -707,24 +703,20 @@
// 鑾峰彇涓嬩竴涓祦绋嬬姸鎬�
String curProgress = data.getProgress();
- String nextProgress = getNextProgress(curProgress, data.getType(),
- inoutSysConf);
+ String nextProgress = getNextProgress(curProgress, data.getType(), inoutSysConf);
data = updateBasicInfo(data, curProgress, nextProgress);
// 鎵ц鏁版嵁鏇存柊
String msg = inoutService.updateDataByHandle(data);
if (null != msg) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg,
- data);
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg, data);
}
// 鎵ц闄勪欢淇℃伅
- fileService.saveInoutFiles(data.getFiles(), data.getCompanyId(),
- data.getId(), curProgress);
+ fileService.saveInoutFiles(data.getFiles(), data.getCompanyId(), data.getId(), curProgress);
- return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛",
- data);
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛", data);
}
/**
@@ -856,6 +848,11 @@
curData.setProgress(curData.getProgress());
curData.setType(curData.getType());
+ curData.setFoodLevel(data.getFoodLevel());
+ curData.setFoodVariety(data.getFoodVariety());
+ curData.setPrice(data.getPrice());
+ curData.setRemarks(data.getRemarks());
+ curData.setCheckItems(data.getCheckItems());
if (StringUtils.isEmpty(data.getCheckUser())) {
curData.setCheckUser(ContextUtil.getLoginUserCName());
@@ -911,7 +908,7 @@
try {
List<CheckItemData> result = checkStandardManager.listCheckItem(
- param.getCheckId(), param.getCompanyId(),
+ param.getCompanyId(),param.getCheckId(),
param.getFoodVariety());
return new PageResponse<>(RespCodeEnum.CODE_0000, result);
--
Gitblit v1.9.3