From 7b5c179e17c9a106dcce3b2b0574af833cf97132 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 23 六月 2023 23:41:55 +0800
Subject: [PATCH] 测试入库流程质检 提交
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 153 ++++++++++++++++++++++++++-------------------------
1 files changed, 78 insertions(+), 75 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 f9426de..31d0276 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
@@ -968,6 +968,84 @@
return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛");
}
+ public PageResponse<InoutCheckData> submitCheck(InoutCheckData data) throws Exception {
+
+ // 鑾峰彇绯荤粺鍙傛暟閰嶇疆
+ InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
+ if (null == inoutSysConf) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "鎻愮ず锛氬綋鍓嶅簱鍖烘湭閰嶇疆鍑哄叆搴撴祦绋嬩俊鎭紝璇疯仈绯荤鐞嗗憳", data);
+ }
+
+ // 鑾峰彇涓氬姟鏁版嵁淇℃伅
+ InoutParam param = new InoutParam();
+ param.setCompanyId(data.getCompanyId());
+ param.setId(data.getId());
+ InoutData curData = inoutService.inoutProgressQuery(param);
+
+ if (null == curData) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "娌℃湁鑾峰彇鍒板叆搴撲笟鍔℃暟鎹俊鎭紝鏇存柊澶辫触", data);
+ }
+
+ if (InoutConstant.PROGRESS_RECORD.equals(curData.getProgress())) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼");
+ }
+
+
+ // 鏇存柊鍖栭獙椤逛俊鎭�
+ CheckUpdateResult checkResult = checkStandardManager.updateCheckItems(data.getCheckId(), data.getCompanyId(), data.getCheckItems());
+ if (StringUtils.isNotEmpty(checkResult.getMsg())) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "鍚庡彴鎵ц寮傚父锛�" + checkResult.getMsg(), data);
+ }
+
+ // 璁剧疆鍖栭獙淇℃伅
+ if (checkResult.getDeSum() > 0) {
+ curData.setDeCheck(checkResult.getDeSum());
+ data.setDeCheck(checkResult.getDeSum());
+ }
+ if (checkResult.getAddSum() > 0) {
+ curData.setAddCheck(checkResult.getAddSum());
+ data.setAddCheck(checkResult.getAddSum());
+ }
+ if (null == data.getCheckTime()) {
+ curData.setCheckTime(new Date());
+ data.setCheckTime(new Date());
+ }
+ curData.setCheckStatus(data.getCheckStatus());
+
+
+ // 鑾峰彇涓嬩竴涓祦绋嬬姸鎬�
+ String curProgress = curData.getProgress();
+ String nextProgress = getNextProgress(curProgress, curData.getType(), inoutSysConf);
+ curData = updateBasicInfo(curData, curProgress, nextProgress);
+
+ // 鑻ュ寲楠岀粨鏋滀笉鍚堟牸锛屽垽鏂厤缃悗缁祦绋�
+ if (InoutConstant.STATUS_UNPASS.equals(curData.getCheckStatus())) {
+ curData = checkNoPass(curData);
+ }
+
+ curData.setProgress(curData.getProgress());
+ curData.setType(curData.getType());
+
+ if (StringUtils.isEmpty(data.getCheckUser())) {
+ curData.setCheckUser(ContextUtil.getLoginUserCName());
+ }
+ if (null == data.getCheckTime()) {
+ curData.setCheckTime(new Date());
+ }
+
+ String msg = inoutService.updateCheckData(curData);
+
+ if (null != msg) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
+ }
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛");
+ }
+
/**
* @param param
* @return
@@ -1016,83 +1094,8 @@
}
}
- @Transactional(rollbackFor = Exception.class)
- public PageResponse<InoutCheckData> updateCheckData(InoutCheckData data) {
- try {
- // 鑾峰彇涓氬姟鏁版嵁淇℃伅
- InoutParam param = new InoutParam();
- param.setCompanyId(data.getCompanyId());
- param.setId(data.getId());
- InoutData curData = inoutService.inoutProgressQuery(param);
- if (null == curData) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "娌℃湁鑾峰彇鍒板叆搴撲笟鍔℃暟鎹俊鎭紝鏇存柊澶辫触", data);
- }
- if (InoutConstant.PROGRESS_RECORD.equals(curData.getProgress())) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼");
- }
- // 鏇存柊鍖栭獙椤逛俊鎭�
- CheckUpdateResult checkResult = checkStandardManager
- .updateCheckItems(data.getCheckId(), data.getCompanyId(),
- data.getCheckItems());
- if (StringUtils.isNotEmpty(checkResult.getMsg())) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "鍚庡彴鎵ц寮傚父锛�" + checkResult.getMsg(), data);
- }
-
- // 璁剧疆鍖栭獙淇℃伅
- if (checkResult.getDeSum() > 0) {
- data.setDeCheck(checkResult.getDeSum());
- }
- if (checkResult.getAddSum() > 0) {
- data.setAddCheck(checkResult.getAddSum());
- }
- if (null == data.getCheckTime()) {
- 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, inoutSysConf);
- // 鑻ュ寲楠岀粨鏋滀笉鍚堟牸锛屽垽鏂厤缃悗缁祦绋�
- if (InoutConstant.STATUS_UNPASS
- .equals(curData.getCheckStatus())) {
- curData = checkNoPass(curData);
- }
- }
-
- // 鍖栭獙浜恒�佸寲楠屾椂闂�
- data.setCheckStatus(curData.getCheckStatus());
- data.setProgress(curData.getProgress());
- if (StringUtils.isEmpty(data.getCheckUser())) {
- data.setCheckUser(ContextUtil.getLoginUserCName());
- }
- if (null == data.getCheckTime()) {
- data.setCheckTime(new Date());
- }
-
- String msg = inoutService.updateCheckData(data);
- if (null != msg) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
- }
-
- return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛");
- } catch (Exception e) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "鍚庡彴寮傚父锛�"
- + e.getMessage(), null);
- }
- }
/**
* 鑾峰彇鍗曚环淇℃伅
--
Gitblit v1.9.3