From 5d2d9dbe286f6e079232e68d30bbd0530ccecaef Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期五, 28 八月 2020 17:59:57 +0800
Subject: [PATCH] #v2.0

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

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 4f3b62b..5ba3f32 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();
+    }
+
     /**
      *  鏍规嵁搴撲綅鍙锋煡鎵惧簱瀛樻槑缁�
      */
@@ -56,7 +67,7 @@
                         @RequestParam(required = false)String matNo){
         if (!Cools.isEmpty(locNo)) {
             LocMast locMast = locMastService.selectById(locNo);
-            if (null == locMast || !"F".equals(locMast.getLocType())) {
+            if (null == locMast || !"F".equals(locMast.getLocSts())) {
                 return R.parse(BaseRes.EMPTY);
             }
             List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()

--
Gitblit v1.9.1