From 486aa057f88f74b8ff6717c9d909f8fed1146341 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 20 六月 2023 15:00:07 +0800
Subject: [PATCH] 工单列表
---
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 272 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 175 insertions(+), 97 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 f3f1ee1..af8e291 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,7 @@
package com.ld.igds.inout.controller;
import com.bstek.bdf2.core.business.IUser;
+import com.bstek.bdf2.core.model.DefaultDept;
import com.ld.igds.check.dto.CheckItemData;
import com.ld.igds.common.manager.CommonManager;
import com.ld.igds.constant.BizType;
@@ -9,14 +10,15 @@
import com.ld.igds.data.BaseParam;
import com.ld.igds.data.Page;
import com.ld.igds.data.PageResponse;
+import com.ld.igds.data.SimpleDepot;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.*;
import com.ld.igds.inout.manager.InoutCommonManager;
import com.ld.igds.inout.manager.InoutManager;
-import com.ld.igds.io.dto.WeightDto;
import com.ld.igds.models.Depot;
import com.ld.igds.models.DicTrigger;
import com.ld.igds.models.InoutConf;
+import com.ld.igds.models.InoutPrice;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import lombok.extern.slf4j.Slf4j;
@@ -171,7 +173,6 @@
}
ModelAndView view = new ModelAndView();
-
IUser user = ContextUtil.getLoginUser();
view.addObject(Constant.MODEL_KEY_LOGIN_USER, user);
@@ -181,59 +182,52 @@
view.addObject("deptId", deptId);
// 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<Depot> listDepot = commonManager.listInDepot();
+ List<SimpleDepot> listDepot = commonManager.getCacheDeptIn(user.getCompanyId(), deptId);
view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
// 褰撳墠娴佺▼鏍囩
view.addObject("progress", InoutConstant.PROGRESS_WEIGHT_TAG);
- //鍏ュ簱娴佺▼
+ //鍏ュ簱娴佺▼閰嶇疆
String inoutProgress = inoutCommonManager.getInoutProgressConf(user.getCompanyId(), deptId, InoutConstant.TYPE_IN);
view.addObject("inoutProgress", inoutProgress);
- //绉伴噸缁撴灉鏄惁鍙慨鏀�
- String weightEditTag = inoutCommonManager.getWeightEditTag(user.getCompanyId(), ContextUtil.subDeptId(user));
+ //绉伴噸鏄惁鍙紪杈戞爣绛�
+ String weightEditTag = inoutCommonManager.getWeightEditTag(user.getCompanyId(), deptId);
view.addObject("weightEditTag", weightEditTag);
// 绮鍝佺涓嬫媺妗�
List<DicTrigger> listFoodVariety = inoutCommonManager.getDicTrigger(Constant.TRIGGER_PARENT_FOOD_VARIETY, user.getCompanyId());
view.addObject("listFoodVariety", listFoodVariety);
- // 鑾峰彇鍑哄叆搴撻厤缃俊鎭�
+ // 鑾峰彇鍑哄叆搴撹澶囬厤缃俊鎭�
List<InoutConf> listInoutConf = inoutCommonManager.getListInoutConf(user.getCompanyId(), deptId);
- //鑾峰彇鎵�鏈夌殑鍦扮鍒楄〃鐢ㄤ簬椤甸潰鐢ㄦ埛閫夋嫨
- List<WeightDto> listWeight = inoutCommonManager.getInoutWeightAll(listInoutConf, InoutConstant.CONF_TYPE_30);
+ //鏍规嵁鍑哄叆搴撹澶囦俊鎭瓫閫夊湴纾呴厤缃俊鎭紝鎵�鏈夊湴纾咃紝鏀寔鐢ㄦ埛鎵嬪姩閫夋嫨
+ List<InoutConf> listWeight = inoutCommonManager.getInoutConf(listInoutConf, InoutConstant.CONF_TYPE_30);
view.addObject("listWeight", listWeight);
- // 鑾峰彇褰撳墠鍦扮淇℃伅
- WeightDto weightDto = inoutCommonManager.getInoutCurWeight(listWeight, sort);
+ // 鑾峰彇褰撳墠鍦扮
+ InoutConf weightDto = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_30);
view.addObject("weightDto", weightDto);
// 杩囩▼鎽勫儚澶�1
- InoutConf conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_60,
- InoutConstant.PROGRESS_WEIGHT_TAG, 1);
+ InoutConf conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_60, InoutConstant.PROGRESS_WEIGHT_TAG, 1);
view.addObject("snapDto1", conf);
// 杩囩▼鎽勫儚澶�2
- conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_60,
- InoutConstant.PROGRESS_WEIGHT_TAG, 2);
+ conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_60, InoutConstant.PROGRESS_WEIGHT_TAG, 2);
view.addObject("snapDto2", conf);
// 杩囩▼鎽勫儚澶�3
- conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_60,
- InoutConstant.PROGRESS_WEIGHT_TAG, 3);
+ conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_60, InoutConstant.PROGRESS_WEIGHT_TAG, 3);
view.addObject("snapDto3", conf);
- 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);
-
view.addObject("cardDto", conf);
+
view.setViewName("admin/inout/in-weight");
return view;
@@ -245,19 +239,25 @@
* @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();
IUser user = ContextUtil.getLoginUser();
view.addObject(Constant.MODEL_KEY_LOGIN_USER, user);
+ String deptId = ContextUtil.subDeptId(user);
view.addObject("bizType", BizType.INOUT_IN.getCode());
- view.addObject("deptId", ContextUtil.subDeptId(user));
+ view.addObject("deptId", deptId);
view.addObject("type", InoutConstant.TYPE_IN);
// 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<Depot> listDepot = commonManager.listInDepot();
+ List<SimpleDepot> listDepot = commonManager.getCacheDeptIn(user.getCompanyId(), deptId);
view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
//鍏ュ簱娴佺▼
@@ -268,15 +268,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;
@@ -294,12 +292,13 @@
IUser user = ContextUtil.getLoginUser();
view.addObject(Constant.MODEL_KEY_LOGIN_USER, user);
+ String deptId = ContextUtil.subDeptId(user);
view.addObject("bizType", BizType.INOUT_IN.getCode());
- view.addObject("deptId", ContextUtil.subDeptId(user));
+ view.addObject("deptId", deptId);
view.addObject("type", InoutConstant.TYPE_IN);
// 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<Depot> listDepot = commonManager.listInDepot();
+ List<SimpleDepot> listDepot = commonManager.getCacheDeptIn(user.getCompanyId(), deptId);
view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
//鍏ュ簱娴佺▼
@@ -387,7 +386,7 @@
view.addObject("deptId", deptId);
// 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<Depot> listDepot = commonManager.listInDepot();
+ List<SimpleDepot> listDepot = commonManager.getCacheDeptOut(user.getCompanyId(), deptId);
view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
// 褰撳墠娴佺▼鏍囩
@@ -409,11 +408,11 @@
List<InoutConf> listInoutConf = inoutCommonManager.getListInoutConf(user.getCompanyId(), deptId);
//鑾峰彇鎵�鏈夌殑鍦扮鍒楄〃鐢ㄤ簬椤甸潰鐢ㄦ埛閫夋嫨
- List<WeightDto> listWeight = inoutCommonManager.getInoutWeightAll(listInoutConf, InoutConstant.CONF_TYPE_30);
+ List<InoutConf> listWeight = inoutCommonManager.getInoutConf(listInoutConf, InoutConstant.CONF_TYPE_30);
view.addObject("listWeight", listWeight);
// 鑾峰彇褰撳墠鍦扮淇℃伅
- WeightDto weightDto = inoutCommonManager.getInoutCurWeight(listWeight, sort);
+ InoutConf weightDto = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_30);
view.addObject("weightDto", weightDto);
// 杩囩▼鎽勫儚澶�1
@@ -454,7 +453,7 @@
view.addObject("type", InoutConstant.TYPE_OUT);
// 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<Depot> listDepot = commonManager.listOutDepot();
+ List<SimpleDepot> listDepot = commonManager.getCacheDeptOut(user.getCompanyId(), deptId);
view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
//鍑哄簱娴佺▼
@@ -489,15 +488,19 @@
ModelAndView view = new ModelAndView();
- // 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<Depot> listDepot = commonManager.listOutDepot();
- view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
-
IUser user = ContextUtil.getLoginUser();
+
+ String deptId = ContextUtil.subDeptId(user);
view.addObject(Constant.MODEL_KEY_LOGIN_USER, user);
view.addObject("bizType", BizType.INOUT_OUT.getCode());
- view.addObject("deptId", ContextUtil.subDeptId(user));
+ view.addObject("deptId", deptId);
view.addObject("type", InoutConstant.TYPE_OUT);
+
+
+ // 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
+ List<SimpleDepot> listDepot = commonManager.getCacheDeptOut(user.getCompanyId(), deptId);
+ view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
+
//鍑哄簱娴佺▼
String inoutProgress = inoutCommonManager.getInoutProgressConf(user.getCompanyId(),
@@ -529,6 +532,7 @@
*/
@RequestMapping("/inout-query")
public PageResponse<InoutData> inoutQuery(@RequestBody InoutParam param) {
+ if (null == param.getCompanyId()) param.setCompanyId(ContextUtil.getCompanyId());
return inoutManager.inoutQuery(param);
}
@@ -604,6 +608,38 @@
}
/**
+ * 鍑哄叆搴撶О閲嶇幆鑺傛彁浜�
+ *
+ * @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);
+ }
+ }
+
+ /**
+ * 鍑哄叆搴撶О閲嶇幆鑺傛彁浜わ紝璇锋敞鎰忥細鍊间粨鎸戞彁浜ょ殑鏁版嵁闈炲嚭鍏ュ簱娴佹按瀹屾暣淇℃伅锛屼笉鑳界洿鎺ヨ皟鐢╱pdate鏂规硶
+ *
+ * @param data
+ * @return
+ */
+ @RequestMapping("/submit-handle")
+ @Transactional
+ public PageResponse<InoutData> submitHandle(@RequestBody InoutData data) throws Exception {
+
+ return inoutManager.submitHandle(data);
+ }
+
+ /**
* 鍗″洖鏀堕〉闈㈡彁浜わ紝濡傛灉鏄甯告祦绋嬪崱鍥炴敹鍒欒蛋姝ｅ父瀹屾垚娴佺▼锛屽惁鍒欐墽琛屽垹闄ら�昏緫骞跺洖鏀跺崱
*
* @param data
@@ -614,22 +650,22 @@
return inoutManager.inoutBack(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);
- }
- }
+// /**
+// * 鍖栭獙椤甸潰鏁版嵁鎻愪氦
+// *
+// * @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);
+// }
+// }
/**
* 鏍规嵁鍗″彿鍜岀被鍨嬶紝鐩存帴瀹屾垚褰撳墠娴佺▼
@@ -648,34 +684,34 @@
}
}
- /**
- * 鏍规嵁鍏ュ簱鏁版嵁淇℃伅锛岃幏鍙栨鏌ラ」淇℃伅锛屽鏋滃綋鍓嶆暟鎹凡缁忔娴嬪畬鎴愶紝鏌ヨ妫�娴嬬粨鏋滐紝濡傛灉娌℃湁妫�娴嬪畬鎴愬垯鏍规嵁妫�娴嬮」閰嶇疆鑾峰彇闇�瑕佹娴嬬殑椤圭洰淇℃伅
- *
- * @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 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("/page-check-data")
+// public PageResponse<Page<InoutData>> pageCheckData(
+// @RequestBody InoutParam param) {
+// return inoutManager.pageCheckData(param);
+// }
/**
* 閬撻椄鎺у埗
@@ -740,6 +776,8 @@
view.addObject("bizType", BizType.INOUT_IN.getCode());
view.addObject("type", InoutConstant.TYPE_IN);
view.addObject("deptId", deptId);
+ DefaultDept dept = commonManager.getSubDept(user, deptId);
+ view.addObject("deptName", dept.getName());
//鍏ュ簱娴佺▼
String inoutProgress = inoutCommonManager.getInoutProgressConf(user.getCompanyId(), deptId, InoutConstant.TYPE_IN);
@@ -774,7 +812,7 @@
}
/**
- * 鍒嗛〉鑾峰彇鎵︽牱璁板綍淇℃伅
+ * 鍒嗛〉鑾峰彇鎵︽牱鏁版嵁
*
* @param param
* @return
@@ -785,19 +823,59 @@
}
/**
- * 鎵︽牱椤甸潰鎻愪氦
+ * 鎵︽牱椤甸潰鎻愪氦鏇存柊
*
* @param data
* @return
*/
@RequestMapping("/update-sample")
public PageResponse<InoutCheckData> updateSample(@RequestBody InoutCheckData data) {
- try {
- return inoutManager.updateSampleData(data);
- } catch (Exception e) {
- log.error("鍚庡彴寮傚父:{}", e);
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "鍚庡彴寮傚父锛�" + e.getMessage(), null);
- }
+
+ return inoutManager.updateSampleData(data);
+ }
+
+ /**
+ * 鍒嗛〉鑾峰彇鍖栭獙鏁版嵁
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/page-check-data")
+ public PageResponse<Page<InoutCheckData>> pageCheckData(@RequestBody InoutCheckParam param) {
+ return inoutManager.pageCheckData(param);
+ }
+
+ /**
+ * 鑾峰彇鍖栭獙椤逛俊鎭�
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/get-check-item")
+ public PageResponse<List<CheckItemData>> getCheckItem(@RequestBody InoutCheckParam param) {
+ return inoutManager.getCheckItemData(param);
+ }
+
+ /**
+ * 鍖栭獙椤甸潰鎻愪氦鏇存柊
+ *
+ * @param data
+ * @return
+ */
+ @RequestMapping("/update-check")
+ public PageResponse<InoutCheckData> updateCheck1(@RequestBody InoutCheckData data) {
+
+ return inoutManager.updateCheckData(data);
+ }
+
+ /**
+ * 鏍规嵁绮绛夌骇鍙婄伯椋熷搧绉嶈幏鍙栫伯椋熷畾浠�
+ * @param param
+ * @return
+ */
+ @RequestMapping("/get-price")
+ public PageResponse<InoutPrice> getPrice(@RequestBody InoutCheckParam param) {
+
+ return inoutManager.getPrice(param);
}
}
\ No newline at end of file
--
Gitblit v1.9.3