From 08cea428e888b6fdd2a3c3783e87e4f828385783 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 08 六月 2023 08:55:47 +0800
Subject: [PATCH] 出入库优化-提交优化
---
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 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 c5d050f..e71e477 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
@@ -238,7 +238,12 @@
* @return
*/
@RequestMapping("/in-handle")
- public ModelAndView inHandle() {
+ public ModelAndView inHandle(HttpServletRequest httpRequest, @RequestParam(value = "sort", required = false) String sort) {
+
+ //濡傛灉娌℃湁鎸囧畾鍦扮锛屼粠鐢ㄦ埛涓婁竴涓�夋嫨涓幏鍙�
+ if (StringUtils.isEmpty(sort)) {
+ sort = commonManager.getInoutWeightByClient(httpRequest);
+ }
ModelAndView view = new ModelAndView();
@@ -262,15 +267,13 @@
// 褰撳墠娴佺▼鑺傜偣
view.addObject("progress", InoutConstant.PROGRESS_HANDLE);
- // 绮鍝佺涓嬫媺妗�
- List<DicTrigger> listFoodVariety = inoutCommonManager.getDicTrigger(
- Constant.TRIGGER_PARENT_FOOD_VARIETY, user.getCompanyId());
- view.addObject("listFoodVariety", listFoodVariety);
+ // 杩滅▼鏅烘収鍗�
+ // 鑾峰彇鍑哄叆搴撹澶囬厤缃俊鎭�
+ List<InoutConf> listInoutConf = inoutCommonManager.getListInoutConf(user.getCompanyId(), deptId);
+ InoutConf conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_80, InoutConstant.PROGRESS_WEIGHT_TAG, 1);
+ if (null != conf) conf.setSort(sort);
+ view.addObject("cardDto", conf);
- // 绮绛夌骇涓嬫媺妗�
- List<DicTrigger> listFoodLevel = inoutCommonManager.getDicTrigger(
- Constant.TRIGGER_PARENT_FOOD_LEVEL, user.getCompanyId());
- view.addObject("listFoodLevel", listFoodLevel);
view.setViewName("admin/inout/in-handle");
return view;
@@ -613,13 +616,26 @@
@Transactional
public PageResponse<InoutData> submitWeight(@RequestBody InoutData data) throws Exception {
- if(null == data.getJjlx()) data.setJjlx("0");
+ if (null == data.getJjlx()) data.setJjlx("0");
if (InoutConstant.TYPE_IN.equals(data.getType())) {
return inoutManager.submitWeightIn(data);
} else {
return inoutManager.submitWeightOut(data);
}
+ }
+
+ /**
+ * 鍑哄叆搴撶О閲嶇幆鑺傛彁浜わ紝璇锋敞鎰忥細鍊间粨鎸戞彁浜ょ殑鏁版嵁闈炲嚭鍏ュ簱娴佹按瀹屾暣淇℃伅锛屼笉鑳界洿鎺ヨ皟鐢╱pdate鏂规硶
+ *
+ * @param data
+ * @return
+ */
+ @RequestMapping("/submit-handle")
+ @Transactional
+ public PageResponse<InoutData> submitHandle(@RequestBody InoutData data) throws Exception {
+
+ return inoutManager.submitHandle(data);
}
/**
@@ -836,7 +852,7 @@
*/
@RequestMapping("/get-check-item")
public PageResponse<List<CheckItemData>> getCheckItem(@RequestBody InoutCheckParam param) {
- return inoutManager.getCheckItemData(param);
+ return inoutManager.getCheckItemData(param);
}
/**
--
Gitblit v1.9.3