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 | 305 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 236 insertions(+), 69 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 f0e7cc3..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,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,13 +10,11 @@
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.InoutData;
-import com.ld.igds.inout.dto.InoutGateDto;
-import com.ld.igds.inout.dto.InoutParam;
+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;
@@ -89,10 +88,9 @@
// 鑾峰彇鍑哄叆搴撻厤缃俊鎭�
List<InoutConf> listInoutConf = inoutCommonManager.getListInoutConf(user.getCompanyId(), deptId);
+
// 杞︾墝璇嗗埆鍙傛暟灏佽
InoutConf conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_10, InoutConstant.PROGRESS_REGISTER, 1);
- if(null != conf) conf.setSort(sort);
-
view.addObject("lprDto", conf);
//鍒濆鍖栬溅鐗岃瘑鍒�
@@ -174,7 +172,6 @@
}
ModelAndView view = new ModelAndView();
-
IUser user = ContextUtil.getLoginUser();
view.addObject(Constant.MODEL_KEY_LOGIN_USER, user);
@@ -184,59 +181,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);
-
+ if (null != conf) conf.setSort(sort);
view.addObject("cardDto", conf);
+
view.setViewName("admin/inout/in-weight");
return view;
@@ -255,12 +245,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);
//鍏ュ簱娴佺▼
@@ -297,12 +288,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);
//鍏ュ簱娴佺▼
@@ -390,7 +382,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);
// 褰撳墠娴佺▼鏍囩
@@ -412,11 +404,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
@@ -457,7 +449,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);
//鍑哄簱娴佺▼
@@ -492,15 +484,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(),
@@ -532,6 +528,7 @@
*/
@RequestMapping("/inout-query")
public PageResponse<InoutData> inoutQuery(@RequestBody InoutParam param) {
+ if (null == param.getCompanyId()) param.setCompanyId(ContextUtil.getCompanyId());
return inoutManager.inoutQuery(param);
}
@@ -557,6 +554,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 +575,50 @@
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);
+ }
+
+ /**
+ * 鍑哄叆搴撶О閲嶇幆鑺傛彁浜�
+ *
+ * @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);
}
}
@@ -618,34 +667,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);
+// }
/**
* 閬撻椄鎺у埗
@@ -659,6 +708,7 @@
return null;
}
+
/**
* 鏇存柊鐢ㄦ埛閫夋嫨鍦扮锛屾牴鎹敤鎴稩P淇濆瓨鏈熼�夋嫨
*
@@ -683,4 +733,121 @@
"鍚庡彴寮傚父锛�" + e.getMessage());
}
}
+
+
+ /**
+ * 鎵︽牱椤甸潰
+ *
+ * @param sort 琛ㄧず浣跨敤鐨勫嚭鍏ュ簱璁惧閰嶅鍙凤紝涓嶄紶閫掗粯璁や负1
+ * @return
+ */
+ @RequestMapping("/in-sample")
+ public ModelAndView inSample(HttpServletRequest httpRequest, @RequestParam(value = "sort", required = false) String sort) {
+ if (StringUtils.isEmpty(sort)) {
+ sort = commonManager.getInoutWeightByClient(httpRequest);
+ }
+ ModelAndView view = new ModelAndView();
+ // 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
+ List<Depot> listDepot = commonManager.listDepot(true);
+ view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
+
+ 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("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);
+ view.addObject("inoutProgress", inoutProgress);
+
+ // 褰撳墠娴佺▼鑺傜偣
+ view.addObject("progress", InoutConstant.PROGRESS_CHECK);
+
+ // 绮鍝佺涓嬫媺妗�
+ List<DicTrigger> listFoodVariety = inoutCommonManager.getDicTrigger(
+ Constant.TRIGGER_PARENT_FOOD_VARIETY, user.getCompanyId());
+ view.addObject("listFoodVariety", listFoodVariety);
+
+ // 绮绛夌骇涓嬫媺妗�
+ List<DicTrigger> listFoodLevel = inoutCommonManager.getDicTrigger(
+ Constant.TRIGGER_PARENT_FOOD_LEVEL, user.getCompanyId());
+ view.addObject("listFoodLevel", listFoodLevel);
+
+ view.addObject("endTime",
+ DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
+ view.addObject("startTime", DateFormatUtils.format(
+ DateUtil.getNewByDay(null, -10), "yyyy-MM-dd"));
+
+ // 鑾峰彇鍑哄叆搴撻厤缃俊鎭�
+ List<InoutConf> listInoutConf = inoutCommonManager.getListInoutConf(user.getCompanyId(), deptId);
+
+ // 鑾峰彇鎵︽牱鏈轰俊鎭�
+ InoutConf conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_20, InoutConstant.PROGRESS_CHECK, 1);
+ view.addObject("checkDto", conf);
+ view.setViewName("admin/inout/in-sample");
+ return view;
+ }
+
+ /**
+ * 鍒嗛〉鑾峰彇鎵︽牱鏁版嵁
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/page-sample-data")
+ public PageResponse<Page<InoutCheckData>> pageSampleData(@RequestBody InoutCheckParam param) {
+ return inoutManager.pageSampleData(param);
+ }
+
+ /**
+ * 鎵︽牱椤甸潰鎻愪氦鏇存柊
+ *
+ * @param data
+ * @return
+ */
+ @RequestMapping("/update-sample")
+ public PageResponse<InoutCheckData> updateSample(@RequestBody InoutCheckData data) {
+
+ 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-check1")
+ public PageResponse<InoutCheckData> updateCheck1(@RequestBody InoutCheckData data) {
+
+ return inoutManager.updateCheckData(data);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3