#

luxiaotao1123

2022-03-31 2599591aaa8678a3908ece272ed8dfdc805cb12c

#

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -456,12 +456,9 @@
        // 获取库位明细
        List<LocDetlDto> locDetlDtos = new ArrayList<>();
        for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr())) {
                LocDetl sqlParam = new LocDetl();
                sqlParam.setLocNo(paramLocDetl.getLocNo());
                sqlParam.setMatnr(paramLocDetl.getMatnr());
                LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
                if (null != one) locDetlDtos.add(new LocDetlDto(one, one.getAnfme()));
            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
                LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
                if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
            }
        }
        if (!locDetlDtos.isEmpty()) {

 src/main/webapp/static/js/pakStore/locCheckOut.js

@@ -36,25 +36,19 @@

    // 监听头工具栏事件
    table.on('toolbar(chooseData)', function (obj) {
        var data = locDetlData;
        switch (obj.event) {
            case 'outbound':
                if (data.length === 0){
                    layer.msg('请先添加库位物料');
                if (locDetlData.length === 0){
                    layer.msg('请先添加盘点库存', {icon: 2});
                } else {
                    var staNo = $("#staNoSelect").val();
                    if (staNo === "" || staNo === null){
                        layer.msg("请选择出库口");
                        layer.msg("请选择盘点站", {icon: 2});
                        return;
                    }
                    var locDetls = [];
                    data.forEach(function(elem) {
                        // locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count}); // todo
                        locDetls.push({locNo: elem.locNo, matnr: elem.matnr});
                    });
                    let param = {
                        outSite: staNo,
                        locDetls: locDetls
                        locDetls: locDetlData
                    }
                    $.ajax({
                        url: baseUrl+"/locCheck/out/start",
@@ -65,12 +59,12 @@
                        success: function (res) {
                            if (res.code === 200){
                                locDetlData = [];
                                tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}});
                                layer.msg(res.msg);
                                tableIns.reload({data: locDetlData});
                                layer.msg(res.msg, {icon: 1});
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(res.msg, {icon: 2})
                            }
                        }
                    });
@@ -122,10 +116,10 @@

// 添加表格数据
function addTableData(data) {
    for (var i=0;i<data.length;i++){
    for (let i=0;i<data.length;i++){
        let pass = false;
        for (var j=0;j<locDetlData.length;j++){
            if (data[i].matnr === locDetlData[j].matnr && data[i].locNo$ === locDetlData[j].locNo$) {
        for (let j=0;j<locDetlData.length;j++){
            if (data[i].matnr === locDetlData[j].matnr && data[i].batch === locDetlData[j].batch && data[i].locNo$ === locDetlData[j].locNo$) {
                pass = true;
                break;
            }

 src/main/webapp/views/pakStore/locDetlCheckQuery.html

@@ -158,10 +158,10 @@
            switch(obj.event) {
                case 'confirm':
                    if (data.length === 0){
                        layer.msg("请选择数据");
                        layer.msg("请选择数据", {icon: 2});
                        return;
                    }
                    var locNos = [];
                    let locNos = [];
                    data.forEach(function(elem) {
                        locNos.push(elem.locNo);
                    });