From d320b9ae40b3dfc1942ea484c8893ba1404c73ec Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 21 六月 2023 23:36:19 +0800
Subject: [PATCH] 调整卡回收页面操作逻辑
---
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 120 ++++++------------------------------------------------------
1 files changed, 12 insertions(+), 108 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
index e37641b..759bdcc 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
@@ -537,7 +537,7 @@
}
/**
- * 鍗″洖鏀舵暟鎹煡璇紝娌℃湁娴佺▼鐘舵�佺殑鏁版嵁鐩存帴杩斿洖
+ * 鍑哄簱鏀跺崱淇℃伅鏌ヨ
*
* @param param
* @return
@@ -545,41 +545,7 @@
@RequestMapping("/inout-query-back")
public PageResponse<InoutData> inoutQueryBack(@RequestBody InoutParam param) {
param.setProgress(null);
- return inoutManager.inoutQuery(param);
- }
-
- /**
- * 鍑哄叆搴撴暟鎹洿鏂帮紝鎻愪氦鍒颁笅涓祦绋�
- *
- * @param data
- * @return
- */
- @RequestMapping("/inout-next-step")
- @Transactional
- public PageResponse<InoutData> inoutNextStep(@RequestBody InoutData data) {
- try {
- IUser user = ContextUtil.getLoginUser();
- if (StringUtils.isEmpty(data.getCompanyId())) {
- data.setCompanyId(user.getCompanyId());
- }
- if (StringUtils.isEmpty(data.getDeptId())) {
- data.setDeptId(ContextUtil.subDeptId(user));
- }
-
- if (InoutConstant.TYPE_IN.equals(data.getType())) {
- return inoutManager.inNextStep(data);
- } else {
- return inoutManager.outNextStep(data);
- }
- } catch (Exception e) {
- log.error("鍚庡彴寮傚父:{}", e);
-
- //鎵嬪姩鍥炴粴
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "鍚庡彴寮傚父锛�" + e.getMessage());
- }
+ return inoutManager.inoutQueryBack(param);
}
/**
@@ -639,32 +605,16 @@
}
/**
- * 鍗″洖鏀堕〉闈㈡彁浜わ紝濡傛灉鏄甯告祦绋嬪崱鍥炴敹鍒欒蛋姝ｅ父瀹屾垚娴佺▼锛屽惁鍒欐墽琛屽垹闄ら�昏緫骞跺洖鏀跺崱
+ * 鍑哄叆搴撳崱鍥炴敹鎻愪氦锛屽鏋滄暟鎹凡缁忔槸瀹屾垚锛岀洿鎺ヤ笉鍋氭洿鏂帮紝濡傛灉鏈畬鎴愬垯鎵ц瀹屾垚
*
* @param data
* @return
*/
- @RequestMapping("/inout-back-submit")
- public PageResponse<InoutData> inoutBackSubmit(@RequestBody InoutData data) {
- return inoutManager.inoutBack(data);
+ @RequestMapping("/submit-card-back")
+ @Transactional
+ public PageResponse<InoutData> submitCardBack(@RequestBody InoutData data) throws Exception {
+ return inoutManager.submitCardBack(data);
}
-
-// /**
-// * 鍖栭獙椤甸潰鏁版嵁鎻愪氦
-// *
-// * @param data
-// * @return
-// */
-// @RequestMapping("/update-check")
-// public PageResponse<InoutData> updateCheck(@RequestBody InoutData data) {
-// try {
-// return inoutManager.updateCheck(data);
-// } catch (Exception e) {
-// log.error("鍚庡彴寮傚父:{}", e);
-// return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
-// "鍚庡彴寮傚父锛�" + e.getMessage(), null);
-// }
-// }
/**
* 鏍规嵁鍗″彿鍜岀被鍨嬶紝鐩存帴瀹屾垚褰撳墠娴佺▼
@@ -672,57 +622,10 @@
* @param data
* @return
*/
- @RequestMapping("/inout-to-complete")
- public PageResponse<InoutData> inoutComplete(@RequestBody InoutData data) {
- try {
- return inoutManager.inoutComplete(data);
- } catch (Exception e) {
- log.error("鍚庡彴寮傚父:{}", e);
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "鍚庡彴寮傚父锛�" + e.getMessage(), data);
- }
- }
-
-// /**
-// * 鏍规嵁鍏ュ簱鏁版嵁淇℃伅锛岃幏鍙栨鏌ラ」淇℃伅锛屽鏋滃綋鍓嶆暟鎹凡缁忔娴嬪畬鎴愶紝鏌ヨ妫�娴嬬粨鏋滐紝濡傛灉娌℃湁妫�娴嬪畬鎴愬垯鏍规嵁妫�娴嬮」閰嶇疆鑾峰彇闇�瑕佹娴嬬殑椤圭洰淇℃伅
-// *
-// * @param data
-// * @return
-// */
-// @RequestMapping("/get-check-item")
-// public PageResponse<List<CheckItemData>> getCheckItem(@RequestBody InoutData data) {
-// try {
-// return inoutManager.getCheckItem(data);
-// } catch (Exception e) {
-// log.error("鍚庡彴寮傚父:{}", e);
-// return new PageResponse<List<CheckItemData>>(
-// RespCodeEnum.CODE_1111.getCode(), "鍚庡彴寮傚父锛�" + e.getMessage());
-// }
-// }
-
-// /**
-// * 鍒嗛〉鑾峰彇鏁版嵁淇℃伅
-// *
-// * @param param
-// * @return
-// */
-// @RequestMapping("/page-check-data")
-// public PageResponse<Page<InoutData>> pageCheckData(
-// @RequestBody InoutParam param) {
-// return inoutManager.pageCheckData(param);
-// }
-
- /**
- * 閬撻椄鎺у埗
- *
- * @param param
- * @return
- */
- @RequestMapping("/gate-ctrl")
- public PageResponse<String> gateCtrl(
- @RequestBody InoutGateDto param) {
-
- return null;
+ @RequestMapping("/submit-complete")
+ @Transactional
+ public PageResponse<InoutData> submitComplete(@RequestBody InoutData data) throws Exception {
+ return inoutManager.submitComplete(data);
}
/**
@@ -869,6 +772,7 @@
/**
* 鏍规嵁绮绛夌骇鍙婄伯椋熷搧绉嶈幏鍙栫伯椋熷畾浠�
+ *
* @param param
* @return
*/
--
Gitblit v1.9.3