#

luxiaotao1123

2022-03-28 89c7b3a61b7e182cb420a8ae0bee8b983f1311c6

#

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

@@ -92,7 +92,7 @@
                }
            }
            if (issued > 0) {
                LocDto locDto = new LocDto("缺货", orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                locDto.setLack(Boolean.TRUE);
                locDtos.add(locDto);
            }

 src/main/java/com/zy/common/model/LocDto.java

@@ -57,4 +57,9 @@
        return this.matnr + "（" + this.maktx + "）";
    }

    public void setLack(boolean lack) {
        this.lack = lack;
        this.locNo = "缺货";
    }

}

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

@@ -151,7 +151,7 @@
                            table.render({
                                elem: '#stoPreTab',
                                data: res.data,
                                height: 432,
                                height: 450,
                                page: false,
                                limit: Number.MAX_VALUE,
                                cellMinWidth: 100,
@@ -161,14 +161,16 @@
                                    {field: 'title', title: '商品', align: 'center', width: 350},
                                    {field: 'batch', title: '批号', merge: ['title'], align: 'center'},
                                    // {field: 'anfme', title: '总数量', merge: ['title'], align: 'center', style: 'font-weight: bold', width: 90},
                                    {field: 'locNo', title: '货位', align: 'center', width: 90},
                                    {field: 'anfme', title: '数量', align: 'center', width: 90, style: 'font-weight: bold'},
                                    {field: 'locNo', title: '货位', align: 'center', width: 100, templet: '#locNoTpl'},
                                    {field: 'staNo', align: 'center', title: '出库站', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
                                    // {field: 'remQty', title: '余量', align: 'center', width: 80},
                                    // {field: 'total', title: '总量', align: 'center', width: 90},
                                ]],
                                done: function () {
                                done: function (res) {
                                    tableMerge.render(this);
                                    $('.layui-table-body.layui-table-main').css("overflow", "auto")
                                    $('.layui-table-body.layui-table-main').css("overflow", "auto");

                                }
                            });

@@ -183,6 +185,10 @@
                            //return false 开启该代码可禁止点击该按钮关闭
                        }
                    });
                    form.on('select(tbBasicTbStaNos)', function (data) {
                        alert("ajax请求：" + JSON.stringify(data))
                        return false;
                    });
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                } else {

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

@@ -21,6 +21,31 @@
            margin: 0 !important;
        }

        .layui-table-view .layui-table-cell .layui-select-title .layui-input {
            height: 28px;
            line-height: 28px;
        }

        .layui-table-view [lay-size="lg"] .layui-table-cell .layui-select-title .layui-input {
            height: 40px;
            line-height: 40px;
        }

        .layui-table-view [lay-size="lg"] .layui-table-cell .layui-select-title .layui-input {
            height: 40px;
            line-height: 40px;
        }

        .layui-table-view [lay-size="sm"] .layui-table-cell .layui-select-title .layui-input {
            height: 20px;
            line-height: 20px;
        }

        .layui-table-view [lay-size="sm"] .layui-table-cell .layui-btn-xs {
            height: 18px;
            line-height: 18px;
        }

        /* 权限控制 */
        #btn-pakoutPreview {
            display: none;
@@ -137,6 +162,27 @@
    </div>
</script>

<script type="text/html" id="tbBasicTbStaNos">
    <div class="ew-select-fixed">
        <select lay-filter="tbBasicTbStaNos">
            {{#if (d.staNos!=null) {}}
                {{# for(let i=0; i<d.staNos.length; i++) { }}
                    <option value="{{d.staNos[i]}}">{{d.staNos[i]}}</option>
                {{# } }}
            {{# } }}
        </select>
    </div>
</script>

<script type="text/html" id="locNoTpl">
    <span name="locNo"
    {{# if( d.lack === false){ }}
    class="layui-badge layui-badge-green" >{{d.locNo}}</span>
        {{# } else { }}
        class="layui-badge layui-badge-red" >缺货</span>
    {{# } }}
</script>

<!-- 行样式 -->
<script type="text/html" id="orderNoTpl">
    <span name="orderNo" class="layui-badge layui-badge-gray">{{d.orderNo}}</span>
@@ -232,6 +278,7 @@
        </div>
    </form>
</script>

</body>
</html>