From dd93297e80ecad5b4fb7267f048d50ffb9f2c191 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 14 七月 2023 22:31:14 +0800
Subject: [PATCH] 补单上传照片

---
 igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java |   50 +++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 37 insertions(+), 13 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 a7629be..a9439d9 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
@@ -33,6 +33,8 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Array;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -93,14 +95,14 @@
         InoutConf conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_10, InoutConstant.PROGRESS_REGISTER, 1);
         view.addObject("lprDto", conf);
 
-        //鍒濆鍖栬溅鐗岃瘑鍒�
-        inoutManager.initLpr(conf);
+        //鐧昏鍒濆鍖�
+        inoutManager.initInoutRegister(conf);
 
         view.setViewName("admin/inout/in-register");
         return view;
     }
-    
-    
+
+
     /**
      * 鎵︽牱椤甸潰
      *
@@ -287,6 +289,8 @@
         if (null != conf) conf.setSort(sort);
         view.addObject("cardDto", conf);
 
+        //绉伴噸椤甸潰鍒濆鍖�
+        inoutManager.initInoutWeight(listInoutConf,sort);
 
         view.setViewName("admin/inout/in-weight");
         return view;
@@ -405,7 +409,7 @@
         view.addObject("lprDto", conf);
 
         //鍒濆鍖栬溅鐗岃瘑鍒�
-        inoutManager.initLpr(conf);
+        inoutManager.initInoutRegister(conf);
 
         view.setViewName("admin/inout/out-register");
         return view;
@@ -663,8 +667,8 @@
     @RequestMapping("/submit-handle")
     @Transactional
     public PageResponse<InoutData> submitHandle(@RequestBody InoutData data) throws Exception {
-    	
-    	log.debug("-------------submitHandle------------------");
+
+        log.debug("-------------submitHandle------------------");
         return inoutManager.submitHandle(data);
     }
 
@@ -692,16 +696,40 @@
         return inoutManager.submitComplete(data);
     }
 
+    /**
+     * 鏍规嵁璐ㄦ鍗曞彿鑾峰彇鍑哄叆搴撲俊鎭�
+     * @param param
+     * @return
+     */
+    @RequestMapping("/inout-check-scan-code")
+    public PageResponse<InoutCheckData> inoutDataByCheckId(@RequestBody InoutCheckParam param) {
+        if (null == param.getCompanyId()) {
+            param.setCompanyId(ContextUtil.getCompanyId());
+        }
+        return inoutManager.inoutDataByCheckId(param);
+    }
 
     /**
-     * 璐ㄦ椤甸潰鎻愪氦
+     * 璐ㄦ椤甸潰浠呮彁浜や繚瀛樺寲楠屼俊鎭�
+     *
+     * @param data
+     * @return
+     */
+    @RequestMapping("/submit-checkItem")
+    @Transactional
+    public PageResponse<InoutCheckData> submitCheckItem(@RequestBody InoutCheckData data)throws Exception {
+        return inoutManager.submitCheckData(data);
+    }
+
+    /**
+     * 璐ㄦ椤甸潰鎻愪氦涓嬩竴娴佺▼
      *
      * @param data
      * @return
      */
     @RequestMapping("/submit-check")
     @Transactional
-    public PageResponse<InoutCheckData> submitCheck(@RequestBody InoutCheckData data)throws Exception {
+    public PageResponse<InoutCheckData> submitCheck(@RequestBody InoutCheckData data) throws Exception {
         return inoutManager.submitCheck(data);
     }
 
@@ -731,8 +759,6 @@
     }
 
 
-   
-
     /**
      * 鍒嗛〉鑾峰彇鎵︽牱鏁版嵁
      *
@@ -743,7 +769,6 @@
     public PageResponse<Page<InoutCheckData>> pageSampleData(@RequestBody InoutCheckParam param) {
         return inoutManager.pageSampleData(param);
     }
-
 
 
     /**
@@ -767,7 +792,6 @@
     public PageResponse<List<CheckItemData>> getCheckItem(@RequestBody InoutCheckParam param) {
         return inoutManager.getCheckItemData(param);
     }
-
 
 
     /**

--
Gitblit v1.9.3