From 69f11b34307678ae29e35646eb57883bfe5ce984 Mon Sep 17 00:00:00 2001
From: 陈战涛 <chenzhantao7055@sina.com>
Date: 星期二, 30 五月 2023 20:42:13 +0800
Subject: [PATCH] 扦样化验优化1-新增扦样信息

---
 igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java |   90 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 87 insertions(+), 3 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 06ab024..f3f1ee1 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
@@ -10,9 +10,7 @@
 import com.ld.igds.data.Page;
 import com.ld.igds.data.PageResponse;
 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;
@@ -716,4 +714,90 @@
                     "鍚庡彴寮傚父锛�" + 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);
+
+        //鍏ュ簱娴佺▼
+        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) {
+        try {
+            return inoutManager.updateSampleData(data);
+        } catch (Exception e) {
+            log.error("鍚庡彴寮傚父:{}", e);
+            return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+                    "鍚庡彴寮傚父锛�" + e.getMessage(), null);
+        }
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3