From 785ce007ce4b7b2119a99aacc95cefe9da09e32e Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 04 七月 2023 16:49:09 +0800
Subject: [PATCH] 优化出入库逻辑，调整节点事件
---
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 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 8c1031d..dfdc749 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
@@ -93,14 +93,14 @@
InoutConf conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_10, InoutConstant.PROGRESS_REGISTER, 1);
view.addObject("lprDto", conf);
- //鍒濆鍖栬溅鐗岃瘑鍒�
- inoutManager.initLpr(conf);
+ //鐧昏鍒濆鍖�
+ inoutManager.initInoutRegister(conf);
view.setViewName("admin/inout/in-register");
return view;
}
-
-
+
+
/**
* 鎵︽牱椤甸潰
*
@@ -405,7 +405,7 @@
view.addObject("lprDto", conf);
//鍒濆鍖栬溅鐗岃瘑鍒�
- inoutManager.initLpr(conf);
+ inoutManager.initInoutRegister(conf);
view.setViewName("admin/inout/out-register");
return view;
@@ -663,6 +663,8 @@
@RequestMapping("/submit-handle")
@Transactional
public PageResponse<InoutData> submitHandle(@RequestBody InoutData data) throws Exception {
+
+ log.debug("-------------submitHandle------------------");
return inoutManager.submitHandle(data);
}
@@ -688,6 +690,19 @@
@Transactional
public PageResponse<InoutData> submitComplete(@RequestBody InoutData data) throws Exception {
return inoutManager.submitComplete(data);
+ }
+
+
+ /**
+ * 璐ㄦ椤甸潰鎻愪氦
+ *
+ * @param data
+ * @return
+ */
+ @RequestMapping("/submit-check")
+ @Transactional
+ public PageResponse<InoutCheckData> submitCheck(@RequestBody InoutCheckData data) throws Exception {
+ return inoutManager.submitCheck(data);
}
/**
@@ -716,8 +731,6 @@
}
-
-
/**
* 鍒嗛〉鑾峰彇鎵︽牱鏁版嵁
*
@@ -728,7 +741,6 @@
public PageResponse<Page<InoutCheckData>> pageSampleData(@RequestBody InoutCheckParam param) {
return inoutManager.pageSampleData(param);
}
-
/**
@@ -753,17 +765,6 @@
return inoutManager.getCheckItemData(param);
}
- /**
- * 鍖栭獙椤甸潰鎻愪氦鏇存柊
- *
- * @param data
- * @return
- */
- @RequestMapping("/update-check")
- public PageResponse<InoutCheckData> updateCheck1(@RequestBody InoutCheckData data) {
-
- return inoutManager.updateCheckData(data);
- }
/**
* 鏍规嵁绮绛夌骇鍙婄伯椋熷搧绉嶈幏鍙栫伯椋熷畾浠�
--
Gitblit v1.9.3