订单出库显示明细是否完成修复

Administrator

2025-09-02 756fa60cebfb82ba824e87d080d44fc9ec34ecc8

 src/main/webapp/views/pda/stockIn.html

@@ -12,9 +12,6 @@
    <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
    <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
    <style>
        main {
            height: 145px;
        }
        .site-list {
            padding: 2px 0;
            height: 22px;
@@ -75,10 +72,17 @@
<header>
    <div class="layui-input-inline">
        <label class="layui-form-label">条码</label>
        <input class="layui-input" type="text" id="code" placeholder="扫码 / 输入" autocomplete="off">
        <input class="layui-input" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="扫码 / 输入" autocomplete="off">
    </div>
    <div style="margin: 5px 5px">
        <button type="button" class="layui-btn layui-btn-normal  layui-btn-xs" onclick="getMat()"><i class="layui-icon">+</i>提取</button>
    <div style="margin: 5px 5px" class="layui-form">
        <button id="mat-btn" type="button" class="layui-btn layui-btn-normal" onclick="getMat()"><i class="layui-icon">+</i>提取</button>
        <!-- 入库口 -->
        <div class="layui-inline" style="width: 120px; margin-left: 15px">
            <select id="putSiteSelect">
                <option value="">入库口</option>
            </select>
        </div>

    </div>
</header>

@@ -88,14 +92,10 @@
</main>
<!-- 尾部 -->
<footer>
    <!-- 入库口 -->
    <div class="site-list">
        <span style="display: inline-block; margin:0 0 0 10px; font-size: 12px">入库口：</span>
    </div>
    <div class="layui-btn-container">
        <button type="button" class="layui-btn layui-btn-xs layui-btn-primary" onclick="reset()">重置</button>
        <button type="button" class="layui-btn layui-btn-normal  layui-btn-xs" onclick="pakIn()" style="margin-left: 20px">入库</button>
        <span id="tips"></span>
        <button type="button" class="layui-btn layui-btn-primary" onclick="reset()">重置</button>
        <button id="empty-pakin" type="button" class="layui-btn layui-btn-normal" onclick="emptyPakIn()" style="margin-left: 15px">空板入库</button>
        <button id="pakin" type="button" class="layui-btn layui-btn-normal" onclick="pakIn()" style="margin-left: 15px">入库</button>
    </div>
</footer>
</body>
@@ -105,6 +105,7 @@
        document.getElementById("code").focus();
        getInBound();
    }


    layui.use(['table','laydate', 'form'], function() {
        var table = layui.table;
@@ -118,15 +119,23 @@
            limit: 500,
            cellMinWidth: 50,
            cols: [[
                {fixed: 'left', align: 'center', field: 'count', title: '量', style:'color: blue', width:20},
                {field: 'matNo', align: 'center', title: '物料编码'},
                {field: 'matName', align: 'center', title: '物料名称'}
                {fixed: 'left', align: 'center', field: 'count', title: '数量', style:'color: blue', width:50},
                {field: 'matnr', align: 'center', title: '规格'},
                {field: 'maktx', align: 'center', title: '商品名称'}
            ]],
            done: function (res, curr, count) {

            }
        });

    });

    function findCode(el) {
        if (el.value.length === 8) {
            $('#mat-btn').focus();
            getMat();
        }
    }

    // 获取入库口
    function getInBound(){
@@ -137,10 +146,11 @@
            async: false,
            success: function (res) {
                if (res.code === 200){
                    var tpl = $("#inSitesTemplate").html();
                    var tpl = $("#putSiteSelectTemplate").html();
                    var template = Handlebars.compile(tpl);
                    var html = template(res);
                    $('.site-list').append(html);
                    $('#putSiteSelect').append(html);
                    layui.form.render('select');
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/pda";
                }else {
@@ -157,11 +167,13 @@
            type: 2,
            title: '物料',
            shade: [0.3,'#000'],
            area: ['90%', '90%'],
            area: ['90%', '80%'],
            content: 'matQuery.html',
            success: function(layero, index){
                $('.layui-layer-title').css('height', '20px').css('line-height', '20px').css('font-size', '12px').css('padding-left', '10px')
                $('.layui-layer-setwin').css("top", '2px').css('right', '3px')
                $('.layui-layer-title').css('font-size', '16px');
            },
            end: function () {
                $('#mat-btn').focus();
            }
        });
    }
@@ -169,13 +181,13 @@
    // 添加表格数据
    var matData = [];
    function addTableData(data) {
        if (isEmpty(data.matName)){
            tips("提取失败");
        if (isEmpty(data.maktx)){
            tips("提取失败", true);
            return;
        }
        let toPush = true;
        for (var j=0;j<matData.length;j++){
            if (data.matNo === matData[j].matNo) {
            if (data.matnr === matData[j].matnr) {
                matData[j].count = Number(matData[j].count) + Number(data.count);
                toPush  = false;
            }
@@ -192,24 +204,29 @@
        $('#code').val("");
        matData = [];
        tableIns.reload({data: matData});
        $('input:radio[name="site"]').prop('checked',false);
        tips("");
        $('#putSiteSelect').val("");
        layui.form.render('select');
        // tips("");
    }

    // 入库
    function pakIn() {
        let barcode = $('#code').val();
        var barcode = $('#code').val();
        if (isEmpty(barcode)) {
            tips("托盘条码为空", true);
            document.getElementById("code").focus();
            return;
        }
        if (barcode.length !== 8) {
            tips("条码必须为8位", true);
            return;
        }
        if (matData.length === 0) {
            tips("请提取物料", true);
            return;
        }
        let site = $('input:radio[name="site"]:checked').next("span").html();
        if (null === site || undefined === site) {
        // var site = $('input:radio[name="site"]:checked').next("span").html();
        var site = $('#putSiteSelect').val();
        if (null === site || undefined === site || site === "") {
            tips("请选择入库口", true);
            return;
        }
@@ -227,7 +244,45 @@
            success: function (res) {
                if (res.code === 200) {
                    reset();
                    tips("启动入库成功")
                    tips("入库启动成功")
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/pda";
                } else {
                    tips(res.msg, true)
                }
            }
        })
    }

    // 空板入库
    function emptyPakIn() {
        var barcode = $('#code').val();
        if (isEmpty(barcode)) {
            tips("托盘条码为空", true);
            return;
        }
        if (barcode.length !== 8) {
            tips("条码必须为8位", true);
            return;
        }
        var site = $('#putSiteSelect').val();
        if (null === site || undefined === site || site === "") {
            tips("请选择入库口", true);
            return;
        }
        $.ajax({
            url: baseUrl+"/empty/plate/in/start",
            headers: {'token': localStorage.getItem('token')},
            data: {
                barcode: barcode,
                sourceStaNo: site
            },
            method: 'POST',
            async: false,
            success: function (res) {
                if (res.code === 200) {
                    reset();
                    tips("空板入库启动成功")
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/pda";
                } else {
@@ -243,14 +298,28 @@
     * @param warn true：红色字体
     */
    function tips(msg, warn) {
        let tips = $('#tips');
        tips.html(msg);
        tips.css("color", warn?"red":'#666');
        // let tips = $('#tips');
        // tips.html(msg);
        // tips.css("color", warn?"red":'#666');
        layer.msg(msg, {icon: warn?2:1})
    }

    document.onkeyup = function (e) {
        if (window.event)//如果window.event对象存在，就以此事件对象为准
            e = window.event;
        var key = e.charCode || e.keyCode;
        if (key === 115) {
            $("#pakin").focus();
            pakIn();
        } else if (key === 113) {
            $("#code").val("");
            $("#code").focus();
        }
    }
</script>
<script type="text/template" id="inSitesTemplate">
<script type="text/template" id="putSiteSelectTemplate">
    {{#each data}}
    <label><input class="cool-checkbox" type="radio" name="site"><span>{{this}}</span></label>
    <option value="{{this}}">{{this}}</option>
    {{/each}}
</script>
</html>
</html>