From 2495e9ab75e6c45af1d6e14414711d8cc79fe2ca Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 30 五月 2023 16:13:13 +0800
Subject: [PATCH] 出入库优化-登记2
---
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 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 8a56e13..06ab024 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
@@ -227,13 +227,13 @@
InoutConstant.PROGRESS_WEIGHT_TAG, 3);
view.addObject("snapDto3", conf);
- conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_70,
+ conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_70,
InoutConstant.PROGRESS_WEIGHT_TAG, 1);
view.addObject("gateDto", conf);
// 鏅烘収鍗�
conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_80, InoutConstant.PROGRESS_WEIGHT_TAG, 1);
- if(null != conf) conf.setSort(sort);
+ if (null != conf) conf.setSort(sort);
view.addObject("cardDto", conf);
@@ -556,6 +556,14 @@
@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 {
@@ -570,6 +578,31 @@
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
"鍚庡彴寮傚父锛�" + e.getMessage());
}
+ }
+
+ /**
+ * 鍑哄叆搴撴暟鎹繚瀛橈紝鐧昏鎻愪氦
+ *
+ * @param data
+ * @return
+ */
+ @RequestMapping("/submit-register")
+ @Transactional
+ public PageResponse<InoutData> submitRegister(@RequestBody InoutData data) throws Exception {
+ IUser user = ContextUtil.getLoginUser();
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(user.getCompanyId());
+ }
+ if (StringUtils.isEmpty(data.getDeptId())) {
+ data.setDeptId(ContextUtil.subDeptId(user));
+ }
+
+ //濡傛灉娉ㄥ唽鏃跺�欐病鏈変娇鐢ㄦ櫤鎱у崱锛岄粯璁や娇鐢ㄨ韩浠借瘉鍙蜂綔涓烘櫤鎱у崱鍙�
+ if (StringUtils.isEmpty(data.getIntelCard())) {
+ data.setIntelCard(data.getUserId());
+ }
+
+ return inoutManager.submitRegisterInout(data);
}
/**
@@ -658,6 +691,7 @@
return null;
}
+
/**
* 鏇存柊鐢ㄦ埛閫夋嫨鍦扮锛屾牴鎹敤鎴稩P淇濆瓨鏈熼�夋嫨
*
--
Gitblit v1.9.3