#

luxiaotao1123

2020-06-16 9f926486fbd2bd3635e7a19351238bb6b3c8f433

#

 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,

 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>",