#

luxiaotao1123

2022-10-18 b5130c2e6d60c7f23e37f7c620375bc4e253caa3

#

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

@@ -8,6 +8,7 @@
import com.zy.asrs.service.*;
import com.zy.common.model.LocDto;
import com.zy.common.model.OrderDto;
import com.zy.common.model.OrderMergeVo;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -167,4 +168,42 @@
        return R.ok().add(orderService.mergePreview(orderIds));
    }

    @PostMapping("/out/pakout/preview/merge/auth")
    @ManagerAuth
    public R pakoutPreviewMerge(@RequestBody List<OrderMergeVo> list) {
        if (Cools.isEmpty(list)) {
            return R.parse(BaseRes.PARAM);
        }
        List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
        List<LocDto> locDtos = new ArrayList<>();

        Set<String> exist = new HashSet<>();

        for (OrderDetl orderDetl : orderDetls) {
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
            if (issued <= 0.0D) { continue; }
            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
            for (LocDetl locDetl : locDetls) {
                if (issued > 0) {
                    LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                            issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                    List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                    locDto.setStaNos(staNos);
                    locDtos.add(locDto);
                    exist.add(locDetl.getLocNo());
                    // 剩余待出数量递减
                    issued = issued - locDetl.getAnfme();
                } else {
                    break;
                }
            }
            if (issued > 0) {
                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                locDto.setLack(Boolean.TRUE);
                locDtos.add(locDto);
            }
        }
        return R.ok().add(locDtos);
    }

}

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

@@ -362,7 +362,6 @@
            },
            success: function (res) {
                layer.close(loadIndex);
                var mergeTabCache;
                if (res.code === 200){
                    layer.open({
                        type: 1
@@ -394,7 +393,6 @@
                                ]],
                                done: function (res) {
                                    $('.layui-table-body.layui-table-main').css("overflow", "auto");
                                    mergeTabCache = tableData = table.cache.orderMergeTab;
                                }
                            });
                        }
@@ -405,12 +403,25 @@
                                layer.msg("请至少选择一条数据", {icon: 7});
                                return false;
                            }
                            console.log(checkStatus);
                            console.log(checkStatus.map(function (d) {
                                return d.matnr;
                            }));

                            // pakoutPreviewDialog(data)
                            let loadIndex = layer.load(2);
                            $.ajax({
                                url: baseUrl + "/out/pakout/preview/merge/auth",
                                headers: {'token': localStorage.getItem('token')},
                                contentType: 'application/json;charset=UTF-8',
                                data: JSON.stringify(checkStatus),
                                method: 'POST',
                                success: function (res) {
                                    layer.close(loadIndex);
                                    if (res.code === 200){
                                        console.log(res.data)
                                        // pakoutPreviewMergeDialog(res.data)
                                    } else if (res.code === 403){
                                        top.location.href = baseUrl+"/";
                                    } else {
                                        layer.msg(res.msg, {icon: 2})
                                    }
                                }
                            })
                        }
                        , btn2: function (index, layero) {
                            //按钮【取消】的回调
@@ -427,6 +438,132 @@
        })
    }

    function pakoutPreviewMergeDialog(data) {
        var mergeTabCache;
        layer.open({
            type: 1
            ,title: false
            ,closeBtn: false
            ,offset: '50px'
            ,area: ['1200px', '700px']
            ,shade: 0.5
            ,shadeClose: false
            ,btn: ['立即出库', '稍后处理']
            ,btnAlign: 'c'
            ,moveType: 1 //拖拽模式，0或者1
            ,content: $('#pakoutPreviewMergeBox').html()
            ,success: function(layero, index){
                stoPreTabIdx = table.render({
                    elem: '#stoPreTabMerge',
                    data: data,
                    height: 520,
                    page: false,
                    limit: Number.MAX_VALUE,
                    cellMinWidth: 100,
                    cols: [[
                        // {type: 'checkbox', merge: ['orderNo']},
                        {field: 'orderNo', title: '单据编号', merge: true, align: 'center'},
                        {field: 'title', title: '商品', merge: true, align: 'center', width: 350},
                        {field: 'batch', title: '序列码', align: 'center'},
                        {field: 'anfme', title: '数量', align: 'center', width: 90, style: 'font-weight: bold'},
                        {field: 'locNo', title: '货位', align: 'center', width: 100, templet: '#locNoTpl'},
                        {field: 'staNos', align: 'center', title: '出库站', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
                        // {type: 'checkbox', merge: ['locNo']},
                    ]],
                    done: function (res) {
                        tableMerge.render(this);
                        $('.layui-table-body.layui-table-main').css("overflow", "auto");
                        mergeTabCache = table.cache.stoPreTabMerge;
                    }
                });
                // 修改出库站
                form.on('select(tbBasicTbStaNos)', function (obj) {
                    let index  = obj.othis.parents('tr').attr("data-index");
                    let data = tableCache[index];
                    for (let i = 0; i<tableCache.length; i++) {
                        if (tableCache[i].locNo === data.locNo) {
                            tableCache[i]['staNo'] = Number(obj.elem.value);
                        }
                    }
                    obj.othis.children().find("input").css("color", "blue");
                    return false;
                });
                // 批量修改出库站
                form.on('submit(batchModifySta)', function () {
                    modifySta();
                });
                // 批量修改出库站 - 站点选择
                function modifySta() {
                    // 出库站取交集
                    let staBatchSelectVal = [];
                    for(let i = 0; i<tableCache.length; i++) {
                        let staNos = tableCache[i].staNos;
                        if (staNos !== null) {
                            if (staBatchSelectVal.length === 0) {
                                staBatchSelectVal = staNos;
                            } else {
                                staBatchSelectVal = staBatchSelectVal.filter(val =>
                                    {
                                        return new Set(staNos).has(val)
                                    }
                                )
                            }
                        }
                    }
                    if (staBatchSelectVal.length === 0) {
                        layer.msg("出库站没有交集，无法批量修改", {icon: 2});
                        return;
                    }
                    admin.open({
                        type: 1,
                        area: '300px',
                        offset: 'auto',
                        title: '请选择站点',
                        content: $('#staBatchSelectDialog').html(),
                        success: function (layero, ddIndex) {
                            // 渲染下拉框
                            let template = Handlebars.compile($('#batchStaSelectTpl').html());
                            $('#batchSelectStaBox').html(template({list: staBatchSelectVal}));
                            // 确认
                            form.on('submit(staBatchSelectConfirm)', function (obj) {
                                let loadIdx = layer.load(2);
                                let batchSta = Number(obj.field.batchSta);
                                let arr = [];
                                for (let i = 0; i<tableCache.length; i++) {
                                    tableCache[i]['staNo'] = batchSta;
                                    arr.push(i);
                                }
                                stoPreTabIdx.reload({data: tableCache});
                                arr.forEach(item => {
                                    $('div[lay-id=stoPreTab] tr[data-index="' + item + '"] .order-sta-select').val(batchSta);
                                });
                                layui.form.render('select');
                                arr.forEach(item => {
                                    $('div[lay-id=stoPreTab] tr[data-index="' + item + '"] .layui-select-title').find("input").css("color", "blue");
                                });
                                layer.close(loadIdx); layer.close(ddIndex);
                                return false;
                            });
                            // 弹窗不出现滚动条
                            $(layero).children('.layui-layer-content').css('overflow', 'visible');
                            layui.form.render('select');
                        },
                    })
                }

            }
            ,yes: function(index, layero){
                //按钮【立即出库】的回调
                pakout(tableCache, index);
            }
            ,btn2: function(index, layero){
                //按钮【稍后处理】的回调
                layer.close(index)
                //return false 开启该代码可禁止点击该按钮关闭
            }
        });
    }


});


 src/main/webapp/views/order/out.html

@@ -180,6 +180,21 @@
    </div>
</script>

<!-- 出库预览 【合并】 -->
<script type="text/html" id="pakoutPreviewMergeBox" style="display: none">
    <div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">
        <span style="font-size: large; font-weight: bold">出库预览</span>
    </div>
    <div class="layui-card">
        <div class="layui-card-body" style="padding: 10px">
            <table id="stoPreTabMerge" lay-filter="stoPreTabMerge"></table>
        </div>
        <button class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" lay-filter="batchModifySta" lay-submit style="display: block;float: right;margin-right: 1rem">
            批量修改
        </button>
    </div>
</script>

<script type="text/html" id="tbBasicTbStaNos">
    <div class="ew-select-fixed">
        <select class="order-sta-select" lay-filter="tbBasicTbStaNos">