From 730b8f59c9d54ab30d343fce6f96fd1e96eefdd4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 13 七月 2020 11:08:55 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index b538a16..9e8be25 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -47,6 +47,17 @@
         return R.ok();
     }
 
+
+    /**
+     * 缁勬墭
+     */
+    @RequestMapping("/comb/form")
+    @ManagerAuth(memo = "缁勬墭")
+    public R combForm(@RequestParam CombParam combParam){
+        mobileService.comb(combParam, getUserId());
+        return R.ok();
+    }
+
     /**
      *  鏍规嵁搴撲綅鍙锋煡鎵惧簱瀛樻槑缁�
      */
@@ -65,8 +76,8 @@
             locDetls.forEach(locDetl -> {
                 MobileLocDetlVo vo = new MobileLocDetlVo();
                 vo.setLocNo(locDetl.getLocNo());
-                vo.setMatNo(locDetl.getMatnr());
-                vo.setMatName(locDetl.getMaktx());
+                vo.setMatnr(locDetl.getMatnr());
+                vo.setMaktx(locDetl.getMaktx());
                 vo.setCount(locDetl.getAnfme());
                 res.add(vo);
             });
@@ -79,8 +90,8 @@
             locDetls.forEach(locDetl -> {
                 MobileLocDetlVo vo = new MobileLocDetlVo();
                 vo.setLocNo(locDetl.getLocNo());
-                vo.setMatNo(locDetl.getMatnr());
-                vo.setMatName(locDetl.getMaktx());
+                vo.setMatnr(locDetl.getMatnr());
+                vo.setMaktx(locDetl.getMaktx());
                 vo.setCount(locDetl.getAnfme());
                 res.add(vo);
             });

--
Gitblit v1.9.1