From d9e1a4fe6e51958c4571efe2ced4d4172ed385db Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 12 六月 2023 21:49:53 +0800
Subject: [PATCH] 称重页面调整-增加化验信息
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 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 dd68d6f..6041858 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
@@ -16,6 +16,7 @@
import com.ld.igds.m.service.InoutCommonService;
import com.ld.igds.models.Depot;
import com.ld.igds.models.InoutConf;
+import com.ld.igds.models.InoutPrice;
import com.ld.igds.models.InoutSysConf;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
@@ -450,12 +451,18 @@
data.setProgress(nextProgress);
}
+ if (InoutConstant.PROGRESS_CHECK.equals(data.getProgress())) {
+ data.setCheckUser(ContextUtil.getLoginUserCName());
+ data.setProgress(nextProgress);
+ return data;
+ }
+
if (InoutConstant.PROGRESS_WEIGHT_EMPTY.equals(curProgress)) {
data.setEmptyWeightTime(new Date());
data.setEmptyWeightUser(ContextUtil.getLoginUserCName());
data.setProgress(nextProgress);
-
}
+
if (InoutConstant.PROGRESS_WEIGHT_FULL.equals(curProgress)) {
data.setFullWeightTime(new Date());
data.setFullWeightUser(ContextUtil.getLoginUserCName());
@@ -469,14 +476,12 @@
data.setProgress(nextProgress);
}
-
//濡傛灉涓嬩竴涓暟鎹姸鎬�=娴佺▼缁撴潫锛岀洿鎺ヨˉ鍏呭畬鏁翠俊鎭�
if (InoutConstant.PROGRESS_RECORD.equals(nextProgress)) {
data.setCompleteTime(DateUtils.addMinutes(new Date(), 2));
data.setCompleteUser(ContextUtil.getLoginUserCName());
data.setProgress(nextProgress);
}
-
return data;
}
@@ -498,6 +503,14 @@
return data;
}
+
+ if (InoutConstant.PROGRESS_CHECK.equals(data.getProgress())) {
+ data.setCheckUser(ContextUtil.getLoginUserCName());
+ data.setProgress(getNextProgress(data.getProgress(),
+ data.getType(), sysConf));
+ return data;
+ }
+
if (InoutConstant.PROGRESS_WEIGHT_EMPTY.equals(data.getProgress())) {
data.setEmptyWeightTime(new Date());
data.setEmptyWeightUser(ContextUtil.getLoginUserCName());
@@ -1217,7 +1230,7 @@
//鏇存柊鍖栭獙椤逛俊鎭�
CheckUpdateResult checkResult = checkStandardManager.updateCheckItems(data.getCheckId(), data.getCompanyId(), data.getCheckItems());
- if (null == checkResult || null != checkResult.getMsg()) {
+ if (StringUtils.isNotEmpty(checkResult.getMsg())) {
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
"鍚庡彴鎵ц寮傚父锛�" + checkResult.getMsg(), data);
}
@@ -1233,17 +1246,25 @@
data.setCheckTime(new Date());
}
curData.setCheckStatus(data.getCheckStatus());
+
+ //鑾峰彇绯荤粺鍙傛暟閰嶇疆
+ InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
+ if (null == inoutSysConf) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "鎻愮ず锛氬綋鍓嶅簱鍖烘湭閰嶇疆鍑哄叆搴撴祦绋嬩俊鎭紝璇疯仈绯荤鐞嗗憳", data);
+ }
//鏇存柊涓嬩竴娴佺▼鐘舵��
if (InoutConstant.PROGRESS_CHECK.equals(curData.getProgress())) {
- curData = updateBasicInfo(curData, null);
+ curData = updateBasicInfo(curData, inoutSysConf);
// 鑻ュ寲楠岀粨鏋滀笉鍚堟牸锛屽垽鏂厤缃悗缁祦绋�
if (InoutConstant.STATUS_UNPASS.equals(curData.getCheckStatus())) {
curData = checkNoPass(curData);
}
}
- data.setCheckStatus(curData.getCheckStatus());
//鍖栭獙浜恒�佸寲楠屾椂闂�
+ data.setCheckStatus(curData.getCheckStatus());
+ data.setProgress(curData.getProgress());
if (StringUtils.isEmpty(data.getCheckUser())) {
data.setCheckUser(ContextUtil.getLoginUserCName());
}
@@ -1262,4 +1283,25 @@
"鍚庡彴寮傚父锛�" + e.getMessage(), null);
}
}
+
+ /**
+ * 鑾峰彇鍗曚环淇℃伅
+ *
+ * @param param
+ * @return
+ */
+ public PageResponse<InoutPrice> getPrice(InoutCheckParam param) {
+ try {
+
+ List<InoutPrice> price = inoutService.getPrice(param);
+ if(null == price || price.isEmpty()){
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "鏈幏鍙栧埌绮瀹氫环閰嶇疆淇℃伅");
+ }
+ return new PageResponse<>(RespCodeEnum.CODE_0000, price.get(0));
+
+ } catch (Exception e) {
+ return new PageResponse<>(
+ RespCodeEnum.CODE_1111.getCode(), "鍚庡彴寮傚父锛�" + e.getMessage(), null);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3