Merge branch 'zwc'

zhaowc

2024-08-29 25df87113f92a1ad32e8e5f3b0dc9252e38575c9

 Pda/View/AsnSetting/productEnterQuantity.html

@@ -86,7 +86,7 @@
            <table border="" cellspacing="" cellpadding="">
                <tr>
                    <td class="img-back"><a href="../index.html"><img src="/assets/back.jpg"></a></td>
                    <td class="title-text" lang>托盘绑定</td>
                    <td class="title-text" lang>组托收货</td>
                    <td class="title-menu-icon"><img id="menuImg" src="/assets/menu.jpg"></td>
                </tr>
            </table>
@@ -297,8 +297,9 @@
                        <div id="" class="layui-form-item layout-input">
                            <label class="layui-form-label" lang>物料数量：</label>
                            <div class="layui-input-block">
                                <input id="SkuQty" type="number" lay-verify="stock" lang langholder placeholder="请输入物料数量"
                                    autocomplete="off" class="layui-input" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
                                <input id="SkuQty" type="number" lay-verify="stock" lang langholder
                                    placeholder="请输入物料数量" autocomplete="off" class="layui-input"
                                    oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
                            </div>
                        </div>

@@ -855,8 +856,8 @@
                    $("#Standard").val("");
                    $("#ImportFactQuantity").val("");
                    $("#BoxQty").val("");
                    $("#STOCKCODE").val("");
                    $("#BOXCODE").val("");
                    // $("#STOCKCODE").val("");
                    // $("#BOXCODE").val("");

                    var param = {
                        Id: parseInt($("#goodSelect").val())
@@ -898,7 +899,6 @@
            /* 绑定入库单物料及批次 */
            function updateGoodList(skuNo) {
                if (xianshiyemian == 0) {
                    console.log("aaaa");
                    var input = $('select[id="goodSelect"]').next().find('.layui-select-title input')
                    var val = input.val()

@@ -1258,6 +1258,68 @@
                sendData(IP + "/PdaAsn/GetBindBoxInfos", param, 'post', function (res) {
                    BoxLevelVal = "0";
                    if (res.code == 0) { //成功
                        //判断是否为零箱BitBoxMark
                        if (res.data[0].BitBoxMark == '1') {
                            getFMBoxinfo();
                        } else {
                            var bl = false;
                            if (res.data.length == 0) {
                                layer.msg("未查询到此箱物料信息，请核实!", {
                                    icon: 2,
                                    time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                });
                                return;
                            }
                        
                            if (res.data[0].ASNNo != '' && res.data[0].ASNNo != null) {
                                $("#bar").empty()
                                $("#bar").append('<option value =>' + '</option>');
                                form.render('select');

                                $("#bar").append('<option value =' + res.data[0].ASNNo + ' selected>' + res.data[0].ASNNo + '</option>');

                                updateGoodList(res.data[0].SkuNo)
                                setOrderGoods();
                            } else {
                                if (asnDetails == '') {
                                    layer.msg("请先选择入库单据!", {
                                        icon: 2,
                                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                    });
                                    return;
                                }
                            }
                            asnDetails.forEach(element => {
                                console.log(element);

                                if (element.SkuNo == res.data[0].SkuNo && element.LotNo == res.data[0].LotNo) {
                                    var sel = 'dd[lay-value=' + element.id + ']';
                                    $('#goodSelect').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this');
                                    bl = true;
                                }
                            });
                            if (!bl) {
                                layer.msg("此箱物料不符合该入库单，请核实!", {
                                    icon: 2,
                                    time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                });
                            } else {
                                $("#BoxQty").val(res.data[0].Qty);
                            }
                        }
                    } else { //不成功
                        //箱码不存在，调用赋码接口获取箱信息
                        getFMBoxinfo();
                    }
                });

            }
            function getFMBoxinfo(){
                var param = {
                    "BoxNo": $("#BOXCODE").val(),
                }
                sendData(IP + "/UpApi/GetFMBindBoxInfos", param, 'post', function (res) {
                    if (res.code == 0) { //成功//根据对接接口定义各字段判断条件
                        var bl = false;
                        if (res.data.length == 0) {
                            layer.msg("未查询到此箱物料信息，请核实!", {
@@ -1302,15 +1364,13 @@
                        } else {
                            $("#BoxQty").val(res.data[0].Qty);
                        }

                    } else { //不成功
                    } else {
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                    }
                });

                })
            }