From 46adcbf7494340a495539708210bb39110bdc33b Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 29 十一月 2025 17:35:03 +0800
Subject: [PATCH] 快速登记、化验及称重作业页面提交1
---
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/inout/InoutController.java | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 236 insertions(+), 0 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
new file mode 100644
index 0000000..6c51134
--- /dev/null
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/inout/InoutController.java
@@ -0,0 +1,236 @@
+package com.fzzy.sys.controller.inout;
+
+import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.domain.Depot;
+import com.fzzy.igds.domain.InoutConf;
+import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.igds.utils.DateUtil;
+import com.fzzy.sys.manager.common.CommonManager;
+import com.fzzy.sys.manager.inout.InoutManager;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description 鍑哄叆搴撴帶鍒跺眰
+ * @Author CZT
+ * @Date 2025/11/29 10:56
+ */
+@Slf4j
+@Controller
+@RequestMapping("basic/inout")
+public class InoutController {
+
+ private static final String prefix = "inout";
+
+ @Resource
+ private InoutManager inoutManager;
+ @Resource
+ private CommonManager commonManager;
+
+ /**
+ * 鍑哄叆搴撳揩閫熺櫥璁�
+ *
+ * @param httpRequest
+ * @param sort 閰嶅鍙�
+ * @param type 涓氬姟绫诲瀷锛欼N-鍏ュ簱锛孫UT-鍑哄簱
+ * @param view
+ * @return
+ */
+ @RequestMapping("/register")
+ public String register(HttpServletRequest httpRequest,
+ @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);
+
+ String deptId = ContextUtil.subDeptId(user);
+ view.put("deptId", deptId);
+
+ if (StringUtils.isEmpty(sort)) {
+ sort = "1";
+ }
+ if (StringUtils.isEmpty(sort)) {
+ sort = inoutManager.getInoutWeightByClient(httpRequest);
+ }
+
+ if (StringUtils.isEmpty(type)) {
+ //榛樿鍏ュ簱
+ type = Constant.TYPE_IN;
+ }
+ view.put("type", type);
+
+ //绉伴噸鏄惁鍙紪杈戞爣绛�
+ String weightEditTag = inoutManager.getWeightEditTag(user.getCompanyId(), deptId);
+ view.put("weightEditTag", weightEditTag);
+
+ //鍑哄叆搴撴祦绋�
+ String inoutProgress = inoutManager.getInoutProgressConf(user.getCompanyId(), ContextUtil.subDeptId(user), type);
+ view.put("inoutProgress", inoutProgress);
+ // 褰撳墠娴佺▼鑺傜偣
+ view.put("progress", Constant.PROGRESS_REGISTER);
+
+ // 鑾峰彇鍑哄叆搴撻厤缃俊鎭�
+ List<InoutConf> listInoutConf = inoutManager.getListInoutConf(user.getCompanyId(), deptId);
+
+ //鏍规嵁鍑哄叆搴撹澶囦俊鎭瓫閫夊湴纾呴厤缃俊鎭紝鎵�鏈夊湴纾咃紝鏀寔鐢ㄦ埛鎵嬪姩閫夋嫨
+ List<InoutConf> listWeight = inoutManager.getInoutConf(listInoutConf, Constant.CONF_TYPE_30);
+ view.put("listWeight", listWeight);
+
+ // 鑾峰彇褰撳墠鍦扮
+ 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);
+
+ return prefix + "/inout-register";
+ }
+
+ /**
+ * 璐ㄦ椤甸潰
+ * @return
+ */
+ @RequestMapping("/check")
+ public String check(HttpServletRequest httpRequest, ModelMap view) {
+
+ SysUser user = ContextUtil.getLoginUser();
+ view.put(Constant.MODEL_KEY_LOGIN_USER, user);
+
+ String deptId = ContextUtil.subDeptId(user);
+
+ view.put("type", Constant.TYPE_IN);
+ view.put("deptId", deptId);
+
+ // 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
+ List<Depot> listDepot = commonManager.listDepotByDeptId(deptId);
+ view.put(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
+
+ //鍏ュ簱娴佺▼
+ String inoutProgress = inoutManager.getInoutProgressConf(user.getCompanyId(), deptId, Constant.TYPE_IN);
+ view.put("inoutProgress", inoutProgress);
+
+ // 褰撳墠娴佺▼鑺傜偣
+ view.put("progress", Constant.PROGRESS_CHECK);
+
+ // 绮鍝佺涓嬫媺妗�
+ 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);
+
+ view.put("endTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
+ view.put("startTime", DateFormatUtils.format(DateUtil.getNewByDay(null, -30), "yyyy-MM-dd"));
+
+ return prefix + "/inout-check";
+ }
+
+
+ /**
+ * 鍏ュ簱绉伴噸鎿嶄綔锛屽寘鎷┖杞︾О閲嶅拰婊¤溅绉伴噸锛屽叡鐢ㄤ竴涓〉闈�
+ *
+ * @param sort 琛ㄧず浣跨敤鐨勫嚭鍏ュ簱璁惧閰嶅鍙凤紝涓嶄紶閫掗粯璁や负1
+ * @return
+ */
+ @RequestMapping("/weight")
+ public String weight(HttpServletRequest httpRequest,
+ @RequestParam(value = "sort", required = false) String sort,
+ @RequestParam(value = "type", required = false) String type,
+ ModelMap view) {
+
+ //濡傛灉娌℃湁鎸囧畾鍦扮锛屼粠鐢ㄦ埛涓婁竴涓�夋嫨涓幏鍙�
+ if (StringUtils.isEmpty(sort)) {
+ sort = "1";
+ }
+ if (StringUtils.isEmpty(sort)) {
+ sort = inoutManager.getInoutWeightByClient(httpRequest);
+ }
+
+ if (StringUtils.isEmpty(type)) {
+ //榛樿鍏ュ簱
+ type = Constant.TYPE_IN;
+ }
+ view.put("type", type);
+
+ SysUser user = ContextUtil.getLoginUser();
+ view.put(Constant.MODEL_KEY_LOGIN_USER, user);
+
+ String deptId = ContextUtil.subDeptId(user);
+ view.put("type", type);
+ view.put("deptId", deptId);
+
+ // 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
+ List<Depot> listDepot = commonManager.listDepotByDeptId(deptId);
+ view.put(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
+
+ // 褰撳墠娴佺▼鏍囩
+ view.put("progress", Constant.PROGRESS_WEIGHT_TAG);
+
+ //鍏ュ簱娴佺▼閰嶇疆
+ String inoutProgress = inoutManager.getInoutProgressConf(user.getCompanyId(), deptId, Constant.TYPE_IN);
+ view.put("inoutProgress", inoutProgress);
+
+ //绉伴噸鏄惁鍙紪杈戞爣绛�
+ String weightEditTag = inoutManager.getWeightEditTag(user.getCompanyId(), deptId);
+ view.put("weightEditTag", weightEditTag);
+
+ // 绮鍝佺涓嬫媺妗�
+ List<SysDictData> listFoodVariety = commonManager.getDicTrigger(Constant.TRIGGER_PARENT_FOOD_VARIETY, user.getCompanyId());
+ view.put("listFoodVariety", listFoodVariety);
+
+ // 鑾峰彇鍑哄叆搴撹澶囬厤缃俊鎭�
+ List<InoutConf> listInoutConf = inoutManager.getListInoutConf(user.getCompanyId(), deptId);
+
+ //鏍规嵁鍑哄叆搴撹澶囦俊鎭瓫閫夊湴纾呴厤缃俊鎭紝鎵�鏈夊湴纾咃紝鏀寔鐢ㄦ埛鎵嬪姩閫夋嫨
+ List<InoutConf> listWeight = inoutManager.getInoutConf(listInoutConf, Constant.CONF_TYPE_30);
+ view.put("listWeight", listWeight);
+
+ // 鑾峰彇褰撳墠鍦扮
+ 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);
+
+ return prefix + "/inout-weight";
+ }
+
+}
--
Gitblit v1.9.3