From db67639449287bcec461916a7dca6003ee5dd03c Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 05 十二月 2025 16:27:18 +0800
Subject: [PATCH] 出入库详单及补单页面及逻辑

---
 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/inout/InoutController.java |   83 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 73 insertions(+), 10 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 2da89b8..18b51d2 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
@@ -4,10 +4,7 @@
 import com.fzzy.common.dto.BaseParam;
 import com.fzzy.igds.constant.Constant;
 import com.fzzy.igds.constant.RespCodeEnum;
-import com.fzzy.igds.data.IgdsBaseParam;
-import com.fzzy.igds.data.InoutParam;
-import com.fzzy.igds.data.NoticeParam;
-import com.fzzy.igds.data.PageResponse;
+import com.fzzy.igds.data.*;
 import com.fzzy.igds.domain.*;
 import com.fzzy.igds.utils.ContextUtil;
 import com.fzzy.igds.utils.DateUtil;
@@ -144,6 +141,61 @@
     }
 
     /**
+     * 鍑哄叆搴撳�间粨
+     * @param httpRequest
+     * @param sort
+     * @param type
+     * @param view
+     * @return
+     */
+    @RequestMapping("/handle")
+    public String handle(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("deptId", deptId);
+
+        // 褰撳墠娴佺▼鏍囩
+        view.put("progress", Constant.PROGRESS_HANDLE);
+
+        //鍏ュ簱娴佺▼閰嶇疆
+        String inoutProgress = inoutManager.getInoutProgressConf(user.getCompanyId(), deptId, type);
+        view.put("inoutProgress", inoutProgress);
+
+        // 绫诲瀷
+        List<SysDictData> listInoutType = commonManager.getInoutType();
+        view.put("listInoutType", listInoutType);
+
+        // 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
+        List<Depot> listDepot = commonManager.listDepotByDeptId(deptId);
+        view.put(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
+
+        // 绮鍝佺涓嬫媺妗�
+        List<SysDictData> listFoodVariety = commonManager.getDicTrigger(Constant.TRIGGER_PARENT_FOOD_VARIETY, user.getCompanyId());
+        view.put("listFoodVariety", listFoodVariety);
+
+        return prefix + "/handle";
+    }
+
+    /**
      * 鍏ュ簱绉伴噸鎿嶄綔锛屽寘鎷┖杞︾О閲嶅拰婊¤溅绉伴噸锛屽叡鐢ㄤ竴涓〉闈�
      *
      * @param sort 琛ㄧず浣跨敤鐨勫嚭鍏ュ簱璁惧閰嶅鍙凤紝涓嶄紶閫掗粯璁や负1
@@ -265,15 +317,26 @@
     }
 
     /**
-     * 鍑哄叆搴撴暟鎹煡璇紝鏍规嵁鏉′欢鏌ヨ鏁版嵁锛屽嚭鍏ュ簱鏁版嵁淇℃伅
+     * 鑾峰彇寰呭�间粨鐨勬暟鎹�
      *
+     * @param param
+     * @return
+     */
+    @RequestMapping("/list-handle-data")
+    @ResponseBody
+    public PageResponse<List<InoutRecord>> listHandleData(@RequestBody InoutParam param) {
+        return inoutManager.listHandleData(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);
     }
 
@@ -286,7 +349,7 @@
      */
     @RequestMapping("/submit-register")
     @ResponseBody
-    public PageResponse<InoutRecord> submitRegister(@RequestBody InoutRecord data) {
+    public PageResponse<InoutData> submitRegister(@RequestBody InoutData data) {
 
         return inoutManager.submitRegister(data);
     }
@@ -298,7 +361,7 @@
      */
     @RequestMapping("/submit-check")
     @ResponseBody
-    public PageResponse<InoutRecord> submitCheck(@RequestBody InoutRecord data) {
+    public PageResponse<InoutData> submitCheck(@RequestBody InoutData data) {
 
         return inoutManager.submitCheck(data);
     }
@@ -310,7 +373,7 @@
      */
     @RequestMapping("/submit-weight")
     @ResponseBody
-    public PageResponse<InoutRecord> submitWeight(@RequestBody InoutRecord data) {
+    public PageResponse<InoutData> submitWeight(@RequestBody InoutData data) {
 
         return inoutManager.submitWeight(data);
     }
@@ -325,7 +388,7 @@
     @RequestMapping("/submit-handle")
     @Transactional
     @ResponseBody
-    public PageResponse<InoutRecord> submitHandle(@RequestBody InoutRecord data) {
+    public PageResponse<InoutData> submitHandle(@RequestBody InoutData data) {
 
         log.debug("-------------submitHandle------------------");
         return inoutManager.submitHandle(data);

--
Gitblit v1.9.3