From 9f926486fbd2bd3635e7a19351238bb6b3c8f433 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 16 六月 2020 09:29:33 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/pakStore/locMove.js | 63 +++++++++++++++++++++++++------ src/main/java/com/zy/asrs/controller/WorkController.java | 15 ++++++- 2 files changed, 62 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java index 51fb1b3..a55964a 100644 --- a/src/main/java/com/zy/asrs/controller/WorkController.java +++ b/src/main/java/com/zy/asrs/controller/WorkController.java @@ -46,22 +46,31 @@ @RequestMapping("/full/store/put/start") @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱") public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) { - return R.ok("鍏ュ簱鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId())); + return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId())); } @RequestMapping("/empty/plate/in/start") @ManagerAuth(memo = "绌烘澘鍏ュ簱") public R emptyPlateInStart(@RequestParam Integer sourceStaNo) { - return R.ok("鍏ュ簱鎴愬姛").add(workService.emptyPlateIn(sourceStaNo, getUserId())); + return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.emptyPlateIn(sourceStaNo, getUserId())); } @RequestMapping("/empty/plate/out/start") @ManagerAuth(memo = "绌烘澘鍑哄簱") public R emptyPlateOutStart(EmptyPlateOutParam param) { workService.emptyPlateOut(param, getUserId()); - return R.ok("鍑哄簱鎴愬姛"); + return R.ok("鍑哄簱鍚姩鎴愬姛"); } + @RequestMapping("/loc/move/start") + @ManagerAuth(memo = "搴撲綅绉昏浆") + public R locMoveStart(@RequestParam String sourceLocNo, + @RequestParam String targetLocNo) { +// workService.emptyPlateOut(param, getUserId()); + return R.ok("绉诲簱鍚姩鎴愬姛"); + } + + @RequestMapping("/hand/control/wrkMast") @ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�") public R handControlWrkMast(@RequestParam String workNo, diff --git a/src/main/webapp/static/js/pakStore/locMove.js b/src/main/webapp/static/js/pakStore/locMove.js index e6a1860..2516b44 100644 --- a/src/main/webapp/static/js/pakStore/locMove.js +++ b/src/main/webapp/static/js/pakStore/locMove.js @@ -87,21 +87,58 @@ } function locMove() { - layer.open({ - title: "搴撲綅绉昏浆", - closeBtn: 0, - skin: 'layui-layer-lan', - offset: '180px', - type: 1, - shadeClose: true, - content: $('#locMoveWindow'), - area: ['40rem', '18rem'], - btn: ['纭畾', '鍏抽棴'], - success: function (layero, index) { + var sourceLocNo = $("#sourceLocNo").val(); + var targetLocNo = $("#targetLocNo").val(); + if (sourceLocNo === null || sourceLocNo === ""){ + $("#sourceLocNo").css("border-color", "red"); + setTimeout(function () { + $("#sourceLocNo").css("border-color", "#b8b8b8"); + }, 2000); + layer.msg("璇疯緭鍏ュ簱浣�"); + return; + } + if (targetLocNo === null || targetLocNo === "") { + $("#targetLocNo").css("border-color", "red"); + setTimeout(function () { + $("#targetLocNo").css("border-color", "#b8b8b8"); + }, 2000); + layer.msg("璇疯緭鍏ュ簱浣�"); + return; + } + $.ajax({ + url: baseUrl + "/loc/move/start", + headers: {'token': localStorage.getItem('token')}, + dataType: 'json', + data: { + sourceLocNo: sourceLocNo, + targetLocNo: targetLocNo + }, + method: 'POST', + success: function (res) { + if (res.code === 200) { + } else if (res.code === 403) { + top.location.href = baseUrl + "/"; + } else { + layer.msg(res.msg); + } } - }) + // layer.open({ + // title: "搴撲綅绉昏浆", + // closeBtn: 0, + // skin: 'layui-layer-lan', + // offset: '180px', + // type: 1, + // shadeClose: true, + // content: $('#locMoveWindow'), + // area: ['40rem', '18rem'], + // btn: ['纭畾', '鍏抽棴'], + // success: function (layero, index) { + // + // } + // + // }) } var tips; @@ -121,7 +158,7 @@ if (res.data != null) { status = res.data.locType$; } else { - status = "鏈壘鍒�"; + status = "鏈壘鍒板簱浣�"; } tips = layer.tips( "<span style='color:#333;'>"+status+"</span>", -- Gitblit v1.9.1