From da2d0647babd92e8929a09d4bfaaf413b980fe24 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 02 十二月 2025 20:19:58 +0800
Subject: [PATCH] 登记及称重页面调整，及相关流程逻辑
---
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/inout/InoutController.java | 206 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 205 insertions(+), 1 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/inout/InoutController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/inout/InoutController.java
index 6c51134..4ad68b4 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/inout/InoutController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/inout/InoutController.java
@@ -1,8 +1,12 @@
package com.fzzy.sys.controller.inout;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.data.InoutParam;
+import com.fzzy.igds.data.PageResponse;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.InoutConf;
+import com.fzzy.igds.domain.InoutRecord;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
import com.fzzy.sys.manager.common.CommonManager;
@@ -13,10 +17,12 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
-
+import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
@@ -233,4 +239,202 @@
return prefix + "/inout-weight";
}
+ /**
+ * 鍑哄簱鐧昏
+ *
+ * @param sort 琛ㄧず浣跨敤鐨勫嚭鍏ュ簱璁惧閰嶅鍙凤紝涓嶄紶閫掗粯璁や负1
+ * @return
+ */
+ @RequestMapping("/out-register")
+ public String outRegister(HttpServletRequest httpRequest,
+ @RequestParam(value = "sort", required = false) String sort,
+ ModelMap view) {
+
+ SysUser user = ContextUtil.getLoginUser();
+ view.put(Constant.MODEL_KEY_LOGIN_USER, user);
+
+ if (StringUtils.isEmpty(sort)) {
+ sort = inoutManager.getInoutWeightByClient(httpRequest);
+ }
+
+ if (StringUtils.isEmpty(sort)) {
+ sort = "1";
+ }
+
+ String deptId = ContextUtil.subDeptId(user);
+ view.put("type", Constant.TYPE_OUT);
+ view.put("deptId", deptId);
+
+ // 绫诲瀷
+ List<SysDictData> listInoutType = commonManager.getInoutType();
+ view.put("listInoutType", listInoutType);
+
+ //鍏ュ簱娴佺▼
+ String inoutProgress = inoutManager.getInoutProgressConf(user.getCompanyId(), ContextUtil.subDeptId(user), Constant.TYPE_OUT);
+ view.put("inoutProgress", inoutProgress);
+ // 褰撳墠娴佺▼鑺傜偣
+ view.put("progress", Constant.PROGRESS_REGISTER);
+
+ // 鑾峰彇鍑哄叆搴撻厤缃俊鎭�
+ List<InoutConf> listInoutConf = inoutManager.getListInoutConf(user.getCompanyId(), deptId);
+
+ // 杞︾墝璇嗗埆鍙傛暟灏佽
+ InoutConf conf = inoutManager.getInoutConf(listInoutConf, sort, Constant.CONF_TYPE_10, Constant.PROGRESS_REGISTER, 1);
+ view.put("lprDto", conf);
+
+ return prefix + "/out-register";
+ }
+
+ /**
+ * 鍑哄簱绠�鏄撴搷浣滈〉闈�
+ *
+ * @param sort 琛ㄧず浣跨敤鐨勫嚭鍏ュ簱璁惧閰嶅鍙凤紝涓嶄紶閫掗粯璁や负1
+ * @return
+ */
+ @RequestMapping("/out-easy")
+ public String outEasy(@RequestParam(value = "sort", required = false) String sort,
+ @RequestParam(value = "type", required = false) String type,
+ ModelMap view) {
+
+ SysUser user = ContextUtil.getLoginUser();
+ view.put(Constant.MODEL_KEY_LOGIN_USER, user);
+
+ view.put("type", Constant.TYPE_OUT);
+ String deptId = ContextUtil.subDeptId(user);
+ view.put("deptId", deptId);
+
+ // 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
+ List<Depot> listDepot = commonManager.listDepotByDeptId(deptId);
+ view.put(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
+
+ //鍏ュ簱娴佺▼
+ String inoutProgress = inoutManager.getInoutProgressConf(user.getCompanyId(),
+ ContextUtil.subDeptId(user), Constant.TYPE_IN);
+ view.put("inoutProgress", inoutProgress);
+
+
+ // 绮鍝佺涓嬫媺妗�
+ List<SysDictData> listFoodVariety = commonManager.getDicTrigger(Constant.TRIGGER_PARENT_FOOD_VARIETY, user.getCompanyId());
+ view.put("listFoodVariety", listFoodVariety);
+
+ // 绮鎬ц川涓嬫媺妗�
+ List<SysDictData> listFoodType = commonManager.getDicTrigger(Constant.TRIGGER_PARENT_FOOD_TYPE, user.getCompanyId());
+ view.put("listFoodType", listFoodType);
+
+ // 绮绛夌骇涓嬫媺妗�
+ List<SysDictData> listFoodLevel = commonManager.getDicTrigger(Constant.TRIGGER_PARENT_FOOD_LEVEL, user.getCompanyId());
+ view.put("listFoodLevel", listFoodLevel);
+
+ // 绫诲瀷
+ List<SysDictData> listInoutType = commonManager.getInoutType();
+ view.put("listInoutType", listInoutType);
+
+ // 褰撳墠娴佺▼鏍囩
+ view.put("progress", Constant.PROGRESS_WEIGHT_TAG);
+
+ // 鑾峰彇鍑哄叆搴撻厤缃俊鎭�
+ List<InoutConf> listInoutConf = inoutManager.getListInoutConf(user.getCompanyId(), deptId);
+
+ // 鑾峰彇鍦扮淇℃伅
+ InoutConf weightDto = inoutManager.getInoutConf(listInoutConf, sort, Constant.CONF_TYPE_30);
+ view.put("weightDto", weightDto);
+
+ // 杩囩▼鎽勫儚澶�1
+ InoutConf conf = inoutManager.getInoutConf(listInoutConf, sort, Constant.CONF_TYPE_60, Constant.PROGRESS_WEIGHT_TAG, 1);
+ view.put("snapDto1", conf);
+
+ // 杩囩▼鎽勫儚澶�2
+ conf = inoutManager.getInoutConf(listInoutConf, sort, Constant.CONF_TYPE_60, Constant.PROGRESS_WEIGHT_TAG, 2);
+ view.put("snapDto2", conf);
+
+ // 杩囩▼鎽勫儚澶�3
+ conf = inoutManager.getInoutConf(listInoutConf, sort, Constant.CONF_TYPE_60, Constant.PROGRESS_WEIGHT_TAG, 3);
+ view.put("snapDto3", conf);
+
+ //榛樿鏌ヨ鏃堕棿
+ view.put("endTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
+ view.put("startTime", DateFormatUtils.format(DateUtil.getNewByDay(null, -30), "yyyy-MM-dd"));
+
+ return prefix + "/out-easy";
+ }
+
+ /**
+ * 鍒嗛〉鑾峰彇娴佺▼鏈畬鎴愮殑鏁版嵁
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/page-inout-data")
+ @ResponseBody
+ public PageResponse<Page<InoutRecord>> pageInoutData(@RequestBody InoutParam param) {
+ return inoutManager.pageInoutData(param);
+ }
+
+ /**
+ * 鍑哄叆搴撴暟鎹煡璇紝鏍规嵁鏉′欢鏌ヨ鏁版嵁锛屽嚭鍏ュ簱鏁版嵁淇℃伅
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/inout-query")
+ @ResponseBody
+ public PageResponse<InoutRecord> inoutQuery(@RequestBody InoutParam param) {
+ if (null == param.getCompanyId()) param.setCompanyId(ContextUtil.getCompanyId());
+ return inoutManager.inoutQuery(param);
+ }
+
+
+ /**
+ * 鍑哄叆搴撶櫥璁版彁浜�
+ *
+ * @param data
+ * @return
+ */
+ @RequestMapping("/submit-register")
+ @ResponseBody
+ public PageResponse<InoutRecord> submitRegister(@RequestBody InoutRecord data) {
+
+ return inoutManager.submitRegister(data);
+ }
+
+ /**
+ * 鍑哄叆搴撳寲楠屼俊鎭彁浜�
+ * @param data
+ * @return
+ */
+ @RequestMapping("/submit-check")
+ @ResponseBody
+ public PageResponse<InoutRecord> submitCheck(@RequestBody InoutRecord data) {
+
+ return inoutManager.submitCheck(data);
+ }
+
+ /**
+ * 鍑哄叆搴撶О閲嶇幆鑺傛彁浜�
+ * @param data
+ * @return
+ */
+ @RequestMapping("/submit-weight")
+ @ResponseBody
+ public PageResponse<InoutRecord> submitWeight(@RequestBody InoutRecord data) {
+
+ return inoutManager.submitWeight(data);
+ }
+
+
+ /**
+ * 鍑哄叆搴撶О閲嶇幆鑺傛彁浜わ紝璇锋敞鎰忥細鍊间粨鎸戞彁浜ょ殑鏁版嵁闈炲嚭鍏ュ簱娴佹按瀹屾暣淇℃伅锛屼笉鑳界洿鎺ヨ皟鐢╱pdate鏂规硶
+ *
+ * @param data
+ * @return
+ */
+ @RequestMapping("/submit-handle")
+ @Transactional
+ @ResponseBody
+ public PageResponse<InoutRecord> submitHandle(@RequestBody InoutRecord data) {
+
+ log.debug("-------------submitHandle------------------");
+ return inoutManager.submitHandle(data);
+ }
+
}
--
Gitblit v1.9.3