#

luxiaotao1123

2022-03-29 d4f964fe7071b3eb59957fb89b3e89d042da26e0

#

 src/main/java/com/zy/asrs/controller/OutController.java

@@ -113,7 +113,7 @@

    @PostMapping("/out/pakout/auth")
    @ManagerAuth(memo = "订单出库")
    public synchronized R pakout(@RequestBody List<LocDto> locDtos) {
    public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
        if (Cools.isEmpty(locDtos)) {
            return R.parse(BaseRes.PARAM);
        }
@@ -126,6 +126,9 @@
        if (refuse) {
            return R.error("库存不足");
        }

        Thread.sleep(500L);

        List<TaskDto> taskDtos = new ArrayList<>();
        // 根据 （库位 & 出库站） 分组； 理想状态：一组为一次出库任务
        for (LocDto locDto : locDtos) {

 src/main/webapp/static/js/order/out.js

@@ -115,10 +115,6 @@
            case 'pakoutPreview':
                pakoutPreview([data.id])
                break;
            // 编辑
            case 'edit':
                showEditModel(data);
                break;
        }
    });

@@ -199,7 +195,7 @@

    function pakout(tableCache, layerIndex) {
        // let loadIndex = layer.load(2);
        notice.msg('正在生成出库任务......', {icon: 4, position: "top"});
        notice.msg('正在生成出库任务......', {icon: 4});
        $.ajax({
            url: baseUrl + "/out/pakout/auth",
            headers: {'token': localStorage.getItem('token')},
@@ -222,84 +218,6 @@
        });
    }


    /* 显示表单弹窗 */
    function showEditModel(mData) {
        admin.open({
            type: 1,
            area: '900px',
            title: (mData ? '修改' : '添加') + '设备',
            content: $('#editDialog').html(),
            success: function (layero, dIndex) {
                // 回显表单数据
                form.val('detail', mData);
                // 地图定位回显
                if (mData) {
                    setTimeout(function () {
                        $("#mapIframe")[0].contentWindow.position(mData.lon, mData.lat);
                    }, 500)
                }
                // 表单提交事件
                form.on('submit(editSubmit)', function (data) {
                    data.field.sensorModel = insXmSel.getValue('valueStr');
                    if (isEmpty(data.field.hostId)) {
                        layer.msg('请选择所属项目', {icon: 2});
                        return false;
                    }
                    data.field.lon = $("#mapIframe").contents().find("#lon").val();
                    data.field.lat = $("#mapIframe").contents().find("#lat").val();
                    data.field.city = $("#mapIframe").contents().find("#city").val();
                    if (isEmpty(data.field.lon) || isEmpty(data.field.lat)) {
                        layer.msg('设备不在定位', {icon: 2});
                        return false;
                    }
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/sensor/"+(mData?'update':'add')+"/auth?sensorType="+sensorType,
                        headers: {'token': localStorage.getItem('token')},
                        data: data.field,
                        method: 'POST',
                        success: function (res) {
                            layer.close(loadIndex);
                            if (res.code === 200){
                                layer.close(dIndex);
                                layer.msg(res.msg, {icon: 1});
                                $(".layui-laypage-btn")[0].click();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                    })
                    return false;
                });
                // 渲染下拉树
                var insXmSel = xmSelect.render({
                    el: '#modelSel',
                    height: '250px',
                    data: modelTb.options.data,
                    initValue: mData&&mData.sensorModel ? [mData.sensorModel] : [],
                    model: {label: {type: 'text'}},
                    prop: {
                        name: 'name',
                        value: 'id'
                    },
                    radio: true,
                    clickClose: true,
                    tree: {
                        show: true,
                        indent: 15,
                        strict: false,
                        expandedKeys: true
                    }
                });
                // 弹窗不出现滚动条
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                layui.form.render('select');
            }
        });
    }


    /* 删除订单 */