From 5e5d65b9d45513a05fdd8a579a99192aaec073eb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 16 六月 2020 09:41:02 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/WorkService.java          |    4 ++++
 src/main/webapp/static/js/pakStore/locMove.js               |    7 ++++++-
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   14 ++++++++++++++
 src/main/java/com/zy/asrs/controller/WorkController.java    |    3 +--
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index a55964a..78bfc8a 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -66,10 +66,9 @@
     @ManagerAuth(memo = "搴撲綅绉昏浆")
     public R locMoveStart(@RequestParam String sourceLocNo,
                           @RequestParam String targetLocNo) {
-//        workService.emptyPlateOut(param, getUserId());
+        workService.locMove(sourceLocNo, targetLocNo, getUserId());
         return R.ok("绉诲簱鍚姩鎴愬姛");
     }
-
 
     @RequestMapping("/hand/control/wrkMast")
     @ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index be73411..d6f38b7 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -22,6 +22,10 @@
      */
     void emptyPlateOut(EmptyPlateOutParam param, Long userId);
 
+    /**
+     * 搴撲綅绉昏浆
+     */
+    void locMove(String sourceLocNo, String locNo, Long userId);
 
     /**
      * 鎵嬪姩瀹屾垚宸ヤ綔妗�
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index fba29fb..13b9619 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -225,6 +225,20 @@
 
     @Override
     @Transactional
+    public void locMove(String sourceLocNo, String locNo, Long userId) {
+        LocMast sourceLoc = locMastService.selectById(sourceLocNo);
+        if (Cools.isEmpty(sourceLoc)){
+            throw new CoolException("鏈壘鍒板簱浣�");
+        }
+        LocMast loc = locMastService.selectById(locNo);
+        if (Cools.isEmpty(loc)){
+            throw new CoolException("鏈壘鍒板簱浣�");
+        }
+
+    }
+
+    @Override
+    @Transactional
     public void completeWrkMast(String workNo, Long userId) {
         WrkMast wrkMast = wrkMastService.selectById(workNo);
         if (Cools.isEmpty(wrkMast)){
diff --git a/src/main/webapp/static/js/pakStore/locMove.js b/src/main/webapp/static/js/pakStore/locMove.js
index 2516b44..1d5d9e2 100644
--- a/src/main/webapp/static/js/pakStore/locMove.js
+++ b/src/main/webapp/static/js/pakStore/locMove.js
@@ -86,6 +86,7 @@
     });
 }
 
+// 绉诲簱鍚姩
 function locMove() {
     var sourceLocNo = $("#sourceLocNo").val();
     var targetLocNo = $("#targetLocNo").val();
@@ -116,7 +117,10 @@
         method: 'POST',
         success: function (res) {
             if (res.code === 200) {
-
+                $("#sourceLocNo").val("");
+                $("#targetLocNo").val("");
+                layer.closeAll();
+                layer.msg(res.msg);
             } else if (res.code === 403) {
                 top.location.href = baseUrl + "/";
             } else {
@@ -141,6 +145,7 @@
     // })
 }
 
+// 搴撲綅鐘舵�佽幏鍙�
 var tips;
 function locStatus(el) {
     let val = el.value;

--
Gitblit v1.9.1