From 7f5ecaf7dbd07e218fbda575e45d8264a560a1e6 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 05 六月 2023 13:50:59 +0800
Subject: [PATCH] 出入库优化-称重页面逻辑优化完成
---
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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 72a7b16..c5d050f 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
@@ -1,6 +1,5 @@
package com.ld.igds.inout.controller;
-import ch.qos.logback.classic.pattern.ClassNameOnlyAbbreviator;
import com.bstek.bdf2.core.business.IUser;
import com.bstek.bdf2.core.model.DefaultDept;
import com.ld.igds.check.dto.CheckItemData;
@@ -322,6 +321,7 @@
/**
* 鍑哄簱鐧昏
+ *
* @param sort 琛ㄧず浣跨敤鐨勫嚭鍏ュ簱璁惧閰嶅鍙凤紝涓嶄紶閫掗粯璁や负1
* @return
*/
@@ -449,7 +449,7 @@
view.addObject("type", InoutConstant.TYPE_OUT);
// 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<SimpleDepot> listDepot = commonManager.getCacheDeptOut(user.getCompanyId(),deptId);
+ List<SimpleDepot> listDepot = commonManager.getCacheDeptOut(user.getCompanyId(), deptId);
view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
//鍑哄簱娴佺▼
@@ -486,15 +486,15 @@
IUser user = ContextUtil.getLoginUser();
- String deptId = ContextUtil.subDeptId(user);
+ String deptId = ContextUtil.subDeptId(user);
view.addObject(Constant.MODEL_KEY_LOGIN_USER, user);
view.addObject("bizType", BizType.INOUT_OUT.getCode());
- view.addObject("deptId",deptId);
+ view.addObject("deptId", deptId);
view.addObject("type", InoutConstant.TYPE_OUT);
// 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<SimpleDepot> listDepot = commonManager.getCacheDeptOut(user.getCompanyId(),deptId);
+ List<SimpleDepot> listDepot = commonManager.getCacheDeptOut(user.getCompanyId(), deptId);
view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
@@ -528,7 +528,7 @@
*/
@RequestMapping("/inout-query")
public PageResponse<InoutData> inoutQuery(@RequestBody InoutParam param) {
- if(null == param.getCompanyId()) param.setCompanyId(ContextUtil.getCompanyId());
+ if (null == param.getCompanyId()) param.setCompanyId(ContextUtil.getCompanyId());
return inoutManager.inoutQuery(param);
}
@@ -604,6 +604,25 @@
}
/**
+ * 鍑哄叆搴撶О閲嶇幆鑺傛彁浜�
+ *
+ * @param data
+ * @return
+ */
+ @RequestMapping("/submit-weight")
+ @Transactional
+ public PageResponse<InoutData> submitWeight(@RequestBody InoutData data) throws Exception {
+
+ if(null == data.getJjlx()) data.setJjlx("0");
+
+ if (InoutConstant.TYPE_IN.equals(data.getType())) {
+ return inoutManager.submitWeightIn(data);
+ } else {
+ return inoutManager.submitWeightOut(data);
+ }
+ }
+
+ /**
* 鍗″洖鏀堕〉闈㈡彁浜わ紝濡傛灉鏄甯告祦绋嬪崱鍥炴敹鍒欒蛋姝ｅ父瀹屾垚娴佺▼锛屽惁鍒欐墽琛屽垹闄ら�昏緫骞跺洖鏀跺崱
*
* @param data
--
Gitblit v1.9.3