Merge branch 'master' into wxw

Administrator

2024-02-01 d5e7fc8d38fa867526c80d29c4e89792634ef690

Merge branch 'master' into wxw

 HTML/img/LiNuo.jpg

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -300,6 +300,10 @@
                                    html = `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del"> 
                                        <i class="layui-icon layui-icon-delete"></i>删除</a>`; 
                                }
                                if(d.Status == "0" || d.Status == "1"){ 
                                    html += `<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="Addlabel"> 
                                        <i class="layui-icon layui-icon-edit"></i>生成标签</a>`; 
                                }
                                return html;
                            } 
                        }}
@@ -638,7 +642,7 @@
                        {field: 'CreateTime',title: '创建时间',align: 'center',width: 160,templet: '#templetCreateTime2'},
                        {field: 'UpdateUserName',title: '修改人',align: 'center',width: 150,},
                        {field: 'UpdateTime',title: '修改时间',align: 'center',width: 150,templet: '#templetUpdateTime3'},  
                        {field: 'caozuo',title: '操作',fixed: 'right',width: 100,align: 'left',toolbar: '#toolbarDemoList', "disabled": true}
                        {field: 'caozuo',title: '操作',fixed: 'right',width: 150,align: 'left',toolbar: '#toolbarDemoList', "disabled": true}
                    ]];
            var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//将表头数据进行url编码
            //#endregion
@@ -1161,6 +1165,50 @@
                        });    

                        break;
                    case "Addlabel" :
                        layer.open({
                            type: 2,
                            title: '生成标签',
                            content: 'LabelPrintSelect.html',
                            maxmin: true,
                            area: ['460px', '460px'],
                            btn: ['确定','取消'],
                            yes: function(index, layero){
                                var iframeWindow = window['layui-layer-iframe'+ index]
                                ,submitID = 'layuiadmin-app-form-edit'
                                ,submit = layero.find('iframe').contents().find('#'+ submitID);
                                //监听提交
                                iframeWindow.layui.form.on('submit('+ submitID +')', function(data){
                                    var field = data.field; //获取提交的字段
                                    console.log(field);
                                    //提交 Ajax 成功后，静态更新表格中的数据
                                    var param = {
                                        Id: data.Id,
                                        Reset: field.reset, //重置批号
                                        Level: field.level,  //标签级别  1/2级
                                        Type:field.type,  //关系层级  有/无层级
                                        ArriveQty:field.arriveQty, //到货数量
                                        BoxType:field.boxType ,// 箱支类型  箱/支
                                        Qty:field.qty //箱/支数量
                                    };
                                    console.log(param);
                                    layer.open({
                                        type: 2,
                                        title: '生成标签',
                                        content: 'LabelPrint.html',
                                        maxmin: true,
                                        area: ['660px', '660px'],
                                        btn: ['取消'],
										

                                    });
                                });  
                                submit.trigger('click');
                            }

                        });

                        break;
                    default:break;
                }
            });

 HTML/views/ASNSetting/LabelBox.html

@@ -238,26 +238,22 @@
            table.on('toolbar(Box-list)', function (obj) {
                switch (obj.event) {
                    case 'add':    // 添加箱支关系
                        // 代码区域
                        var param = getBoxInforVlues();
                        if (param != "") {
                            console.log(param);
                            sendData(IP + "/BllAsn/AddBllBoxInfo", param, 'post', function (res) {
                                if (res.code == 0) { //成功
                                    layer.msg(res.msg, {
                                        icon: 1,
                                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                    }, function () {
                                        bindTable();
                        // layer.open({
                        //     type: 2,
                        //     title: '自定义列',
                        //     content: '../SystemSettings/HeaderSetting.html',
                        //     maxmin: false,
                        //     resize: false,
                        //     area: ['970px', '650px']
                        // });
                        layer.open({
                            type: 2,
                            title: '打印',
                            content: 'LabelPrint.html?',
                            maxmin: true,
                            area: ['600px', '670px'],
                            btn: ['取消']
                                    });
                                } else { //不成功
                                    layer.msg(res.msg, {
                                        icon: 2,
                                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                    }, function () { doing = true });
                                } 
                            });
                        }
                        break;
                    
                    default: break;

 HTML/views/ASNSetting/LabelPrint.html

New file
@@ -0,0 +1,349 @@
<!DOCTYPE html>
<html>

<head>
    <meta charset="utf-8">
    <title>标签打印</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport"
        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
    <style media="print">
        @page {
            size: auto;
            margin: 0 0 0 20px;
        }

        .layui-input {
            padding-left: 0px;
        }

        .layui-form-item {
            margin-bottom: 2px;
        }
    </style>
</head>

<body>
    <div style="width:100%;text-align: center;">
        <div class="layui-form" lay-filter="layuiadmin-app-form-list" id="print"
            style="width: 100%;height:100%; text-align: right;padding-top: 5px;margin-left: 0%;">
            <div>
                 
                <table border="1" id="table" style="width: 90%; height:480px; margin: 0 auto; text-align: center;border-collapse: collapse;table-layout: fixed;">
                     
                    <tr> 
                        <td colspan="2" id="Logo">
                            <img src="../../img/LiNuo.jpg" style="width: 90%; height: 30px;" />
                        </td>
                        <td colspan="2" style="padding: 1px 0px;">SMP-ST002-R08-01</td> 
                    </tr>
                    <tr> 
                        <td colspan="4" id="department">物料标签</td>
                    </tr>
                    <tr>
                        <td>品名</td>
                        <td colspan="3" id="goodName"></td>
                    </tr>
                    <tr>
                        <td>规格/型号</td>
                        <td  id="Standard"></td>
                        <td>包装规格</td>
                        <td id="PackageStandard"></td>
                    </tr>
                    <tr>
                        <td>进厂编号</td>
                        <td style="padding: 1px 0px;"></td>
                        <td>物料代码</td>
                        <td style="padding: 1px 0px;"> </td>
                    </tr>
                    <tr>
                        <td>原厂批号</td>
                        <td id="SupplierLot"></td> 
                        <td>数   量</td>
                        <td id="qty"></td> 
                    </tr>
                    <tr>
                        <td>有效期至</td>
                        <td id="ExpirationTime"></td>
                        <td>储存期至</td>
                        <td id="StoreTime"></td> 
                    </tr>
                    <tr> 
                        <td id="qty3" colspan="4">
                            <img id="imgBar" style="width: auto; height: auto;" />
                        </td> 
                    </tr>
                    
                </table> 
                 
            </div>
            <div style="page-break-after: always;"></div>
        </div>
        <hr>
        <div style="padding-top: 10px;text-align: left;" id="button">
            <div class="layui-inline" style="margin-right: 10px;">
                <span style="padding-right: 5px;">是否重置批次:</span>
                <span style="padding-right: 5px;">是</span><input type="radio" checked="true" name="isprint" value="1">
                <span style="padding-right: 5px;">否</span><input type="radio" name="isprint" value="0">
            </div>
            <div class="layui-inline">
                到货数量：<div class="layui-input-inline">
                    <input type="text"
                        oninput="value=value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d).*$/,'$1$2.$3')"
                        onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d).*$/,'$1$2.$3')"
                        name="skuNum" id="skuNum" lay-verify="skuNum" placeholder="" style="width: 100px;"
                        autocomplete="off" class="layui-input InputCss">
                </div>&nbsp;&nbsp;
            </div>
            <div class="layui-inline">
                箱标签数量：<div class="layui-input-inline">
                    <input type="text" onkeyup="this.value=this.value.replace(/^0{1,}/g,'')"
                        onafterpaste="this.value=this.value.replace(/^0{1,}/g,'')" name="bQNum" id="bQNum"
                        lay-verify="bQNum" placeholder="" style="width: 100px;" autocomplete="off"
                        class="layui-input InputCss">
                </div>&nbsp;&nbsp;
            </div>

            <div>
                <div class="layui-inline" style="padding-top: 5px">
                    一级标签必录参数：箱内数量：<div class="layui-input-inline">
                        <input type="text"
                            oninput="value=value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d).*$/,'$1$2.$3')"
                            onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d).*$/,'$1$2.$3')"
                            name="number" id="number" lay-verify="number" placeholder="" style="width: 70px;"
                            autocomplete="off" class="layui-input InputCss">
                    </div>&nbsp;&nbsp;
                </div>
                <div class="layui-inline">
                    <button id="btnPrint" class="layui-btn layui-btn-sm" lay-event="Add"><i
                            class="layui-icon">&#xe654;</i>打印</button>
                </div>
            </div>
        </div>

    </div>
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../../js/public.js"></script>
    <script src="../../js/jquery-3.5.1.min.js"></script>
    <script src="../../js/jquery.cookie.js"></script>
    <script src="../../js/jquery.print.js"></script>
    <script>
        var boxcode = "";
        layui.config({
            base: '../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'layer', 'laydate'], function () {

            var $ = layui.$,
                form = layui.form,
                layer = layui.layer;
            var laydate = layui.laydate;
            laydate.render({
                elem: '#ProductionDate'
                , format: 'yyyy-MM-dd' //可任意组合
            });
            laydate.render({
                elem: '#InspectTime'
                , format: 'yyyy-MM-dd' //可任意组合
            });
            laydate.render({
                elem: '#ExpirationTime'
                , format: 'yyyy-MM-dd' //可任意组合
            });
            var id = getQueryString('id');
            var xun = 0;

            $('#btnPrint').on('click', function () {
                var param = {
                    ImportId: id,
                };
                if ($("#ProductionDate").val() == "" || $("#ProductionDate").val() == undefined || $("#ProductionDate").val() == null) {
                    layer.msg("生产日期不能为空", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () { return; });
                }
                if ($("#SupplierName").val() == "" || $("#SupplierName").val() == undefined || $("#SupplierName").val() == null) {
                    layer.msg("生产厂家不能为空", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () { return; });
                }
                if ($("#SupplierLot").val() == "" || $("#SupplierLot").val() == undefined || $("#SupplierLot").val() == null) {
                    console.log($("#SupplierLot").val())
                    layer.msg("厂家批号不能为空", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () { return; });
                } 

                if ($('#number').val() > 0) {

                    if ($('#bQNum').val() > 0) {
                        div($('#number').val(), $('input[name="isprint"]:checked').val(), $('#bQNum').val());
                    } else {
                        div($('#number').val(), $('input[name="isprint"]:checked').val(), 0);
                    }

                }
                else {

                    if ($('#bQNum').val() >= 0) {
                        div(0, $('input[name="isprint"]:checked').val(), $('#bQNum').val());
                    } else {
                        div(0, $('input[name="isprint"]:checked').val(), 0);
                    }

                }
            });

            if (!id) {
                id = 0;
            }
            else {
                div(-1, 1, 0);
            }


            // 循环加载标签
            function div(number, isprint, bqNum) {
                GetImportId(number, isprint, bqNum);
            }

            // 标签变量赋值
            function GetImportId(i, isprint, bqNum) {

                var param1 = {
                    isprint: isprint,
                    ImportId: id,
                    CreateUser: $.cookie('userId'),
                    number2: i,
                    boxcode: "",
                    ProductionDate: $("input[name='ProductionDate']").val(),
                    SupplierName: $("input[name='SupplierName']").val(),
                    SupplierLot: $("input[name='SupplierLot']").val(),
                    InspectTime: $("input[name='InspectTime']").val(),
                    ExpirationTime: $("input[name='ExpirationTime']").val(),
                    bQNum: bqNum,
                    skuNum: $('#skuNum').val().toString()
                };

                synData(IP + "/LabelPrint/GetImport5Id", param1, 'post', function (res) {
                    if (res.code == 1) { //成功 

                        if (i == -1) {
                            $("input[name='SkuNo']").val(res.data[0].SkuNo);
                            $("input[name='SkuName']").val(res.data[0].SkuName);
                            $("input[name='SupplierName']").val(res.data[0].SupplierName);
                            $("input[name='ProductionDate']").val(res.data[0].ProductionDate);
                            $("input[name='SapSkuNo']").val(res.data[0].SapSkuNo);
                            $("input[name='Qty']").val(res.data[0].Qty);
                            $("input[name='Standard']").val(res.data[0].Standard);
                            $("input[name='SupplierLot']").val(res.data[0].SupplierLot);
                            $("input[name='LotNo']").val(res.data[0].LotNo);
                            $("input[name='InspectTime']").val(res.data[0].InspectTime);
                            $("input[name='ExpirationTime']").val(res.data[0].ExpirationTime);
                            $("input[name='QtyCount']").val(res.data[0].QtyCount);
                            $("input[name='QtyOrd']").val(res.data[0].QtyOrd);
                            $("input[name='ExpirationType']").val(res.data[0].ExpirationType);
                            $("input[name='BoxCode']").val(res.data[0].BoxCode);
                            $("#imgBar").attr("src", res.data[0].imageStr);
                        } else {
                            var labels = "";
                            for (var z = 0; z < res.data.length; z++) {
                                var idd = "";
                                if (z - 1 >= 0) {
                                    idd = (z - 1).toString();
                                }

                                $("#SkuNo" + idd).attr("id", "SkuNo" + z.toString());
                                $("#SkuNo" + z.toString()).attr("value", res.data[z].SkuNo);

                                $("#SkuName" + idd).attr("id", "SkuName" + z.toString());
                                $("#SkuName" + z.toString()).attr("value", res.data[z].SkuName);

                                var supplier = $("#SupplierName" + idd).val();
                                $("#SupplierName" + idd).attr("id", "SupplierName" + z.toString());
                                $("#SupplierName" + z.toString()).attr("value", supplier);

                                var time = $("#ProductionDate" + idd).val();
                                $("#ProductionDate" + idd).attr("id", "ProductionDate" + z.toString());
                                $("#ProductionDate" + z.toString()).attr("value", time);

                                $("#SapSkuNo" + idd).attr("id", "SapSkuNo" + z.toString());
                                $("#SapSkuNo" + z.toString()).attr("value", res.data[z].SapSkuNo);

                                $("#Qty" + idd).attr("id", "Qty" + z.toString());
                                $("#Qty" + z.toString()).attr("value", res.data[z].Qty);

                                $("#Standard" + idd).attr("id", "Standard" + z.toString());
                                $("#Standard" + z.toString()).attr("value", res.data[z].Standard);

                                $("#LotNo" + idd).attr("id", "LotNo" + z.toString());
                                $("#LotNo" + z.toString()).attr("value", res.data[z].LotNo);

                                var supplierLot = $("#SupplierLot" + idd).val();
                                $("#SupplierLot" + idd).attr("id", "SupplierLot" + z.toString());
                                $("#SupplierLot" + z.toString()).attr("value", supplierLot);

                                var insTime = $("#InspectTime" + idd).val();
                                $("#InspectTime" + idd).attr("id", "InspectTime" + z.toString());
                                $("#InspectTime" + z.toString()).attr("value", insTime);

                                var expTime = $("#ExpirationTime" + idd).val();
                                $("#ExpirationTime" + idd).attr("id", "ExpirationTime" + z.toString());
                                $("#ExpirationTime" + z.toString()).attr("value", expTime);

                                $("#QtyCount" + idd).attr("id", "QtyCount" + z.toString());
                                $("#QtyCount" + z.toString()).attr("value", res.data[z].QtyCount);

                                $("#QtyOrd" + idd).attr("id", "QtyOrd" + z.toString());
                                $("#QtyOrd" + z.toString()).attr("value", res.data[z].QtyOrd);

                                $("#ExpirationType" + idd).attr("id", "ExpirationType" + z.toString());
                                $("#ExpirationType" + z.toString()).attr("value", res.data[z].ExpirationType);

                                $("#BoxCode" + idd).attr("id", "BoxCode" + z.toString());
                                $("#BoxCode" + z.toString()).attr("value", res.data[z].BoxCode);

                                $("#imgBar" + idd).attr("id", "imgBar" + z.toString());
                                $("#imgBar" + z.toString()).attr("src", res.data[z].imageStr);

                                labels += $("#print").html();

                            }

                            // console.log(labels);
                            document.getElementById('print').innerHTML = "";
                            document.getElementById('print').innerHTML = labels;
                            // console.log($("#print").html());
                            $("#button").hide();
                            $("#print").print();
                            $("#button").show();
                        }
                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () { });
                    }
                });
            };

            // 获取传递参数
            function getQueryString(name) {
                var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
                var r = window.location.search.substr(1).match(reg);
                if (r != null) return unescape(r[2]);
                return null;
            }
        })

    </script>

</body>

</html>

 HTML/views/ASNSetting/LabelPrintSelect.html

New file
@@ -0,0 +1,142 @@
<!DOCTYPE html>
<html>
    <head>
        <meta charset="utf-8">
        <title>标签打印选择</title>
        <meta name="renderer" content="webkit">
        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
        <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
        <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
    </head>
    <body>
        <div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 30px 0 0;">
            <div class="layui-form-item">
                <label class="layui-form-label">重置批号</label>
                <div class="layui-input-block">
                    <select name="reset" id="reset" lay-verify="required">
                        <option value="1">是</option>
                        <option value="0">否</option>
                    </select>
                </div> 
            </div>
            <div class="layui-form-item">
                <label class="layui-form-label">标签级别</label>
                <div class="layui-input-block">
                    <select name="level" id="level" lay-filter="levelFil" lay-verify="required">
                        <option value="1">1</option>
                        <option value="2">2</option>
                    </select>
                </div> 
            </div>
            <div class="layui-form-item">
                <label class="layui-form-label">关系层级</label>
                <div class="layui-input-block">
                    <select name="type" id="type" lay-verify="required"  lay-filter="typeFil" lay-search> 
                        <option value="1">有层级</option>
                        <option value="0">无层级</option> 
                    </select>
                </div>
            </div>
            <div class="layui-form-item">
                <label class="layui-form-label">到货数量</label>
                <div class="layui-input-block">
                    <input type="text" name=arriveQty" id="arriveQty" lay-verify="required"  placeholder="请输入巷道名称" autocomplete="off" class="layui-input">
                </div>
            </div>
            <div class="layui-form-item" id="boxTypeDiv" style="display: none;">
                <label class="layui-form-label">箱支类型</label>
                <div class="layui-input-block">
                    <select name="boxType" id="boxType" lay-filter="boxTypeFil" lay-search>
                        <option value=""></option>
                        <option value="1">箱</option>
                        <option value="2">支</option> 
                    </select>
                </div>
            </div>
            <div class="layui-form-item" id="qtyDiv" style="display: none;">
                <label class="layui-form-label">数量</label>
                <div class="layui-input-block">
                    <input type="text" name="qty" id="qty"   placeholder="请输入巷道名称" autocomplete="off" class="layui-input">
                </div>
            </div>
            <div class="layui-form-item layui-hide">
                <input type="button" lay-submit lay-filter="layuiadmin-app-form-submit" id="layuiadmin-app-form-submit" value="确认添加">
                <input type="button" lay-submit lay-filter="layuiadmin-app-form-edit" id="layuiadmin-app-form-edit" value="确认编辑">
            </div>
				
        </div>
		
            <script src="../../layuiadmin/layui/layui.js"></script>
            <script src="../../js/public.js"></script>
            <script src="../../js/jquery-3.5.1.min.js"></script>
            <script src="../../js/jquery.cookie.js"></script>
            <script>
                layui.config({
                    base: '../../layuiadmin/' //静态资源所在路径
                }).extend({
                    index: 'lib/index' //主入口模块
                }).use(['index', 'form', 'layer'], function() {
                    var $ = layui.$;
                    var    form = layui.form;
                    var    layer = layui.layer;
                    form.on('select(levelFil)', function(data){  
                        console.log($("#type").val());  
                        var type = $("#type").val();
                        if (data.value == "1" ) {
                            $("#boxTypeDiv").css("display","none");  
                            form.val("layuiadmin-app-form-list", {
                                "boxType": ""  
                            });
                            $("#boxType").removeAttr("lay-verify");

                            $("#qtyDiv").css("display","none");
                            $("#qty").removeAttr("lay-verify");
                            $("#qty").val("");

                            form.render('select'); 
                        }
                        if (data.value == "2" && type == "0") {
                            $("#boxTypeDiv").css("display","block"); 
                            $("#boxType").attr("lay-verify","required"); 
                            
                        }
                    });   
                    form.on('select(typeFil)', function(data){  
                        var level = $("#level").val();
                        if (data.value == "1") {
                            $("#boxTypeDiv").css("display","none"); 
 
                            form.val("layuiadmin-app-form-list", {
                                "boxType": ""  
                            });
                            $("#boxType").removeAttr("lay-verify");
                            
                            $("#qtyDiv").css("display","none");
                            $("#qty").removeAttr("lay-verify");
                            $("#qty").val("");
                            form.render('select'); 
                        }
                        if (data.value == "0" && level == "2") {
                            $("#boxTypeDiv").css("display","block"); 
                            $("#boxType").attr("lay-verify","required");

                        }
                    });
                    form.on('select(boxTypeFil)', function(data){   
                        if (data.value == "1") { //箱
                            $("#qtyDiv").css("display","none");
                            $("#qty").removeAttr("lay-verify");
                            $("#qty").val("");
                        }
                        if (data.value == "2" ) { 
                            $("#qtyDiv").css("display","block");
                            $("#qty").attr("lay-verify","required");
                        }
                    });


                })
            </script>
		
    </body>
</html>

 HTML/views/BaseSetting/Customer.html

@@ -54,6 +54,7 @@
                                <option value=""></option>
                                <option value="0">客户</option>
                                <option value="1">供应商</option>
                                <option value="2">货主</option>
                            </select>
                        </div>
                    </div>
@@ -187,6 +188,8 @@
                                    return "客户";
                                } else if(d.Type ==1){
                                    return "供货商";
                                } else if(d.Type ==2){
                                    return "货主";
                                }else{
                                    return "";
                                }

 HTML/views/BaseSetting/CustomerFrom.html

@@ -34,6 +34,7 @@
                        <option value=""></option>
                        <option value="0">客户</option>
                        <option value="1">供应商</option>
                        <option value="2">货主</option>
                    </select>
                </div>
            </div>

 HTML/views/BaseSetting/Materials.html

@@ -59,7 +59,7 @@
                                    <option value="1">包材</option>
                                    <option value="2">成品</option>
                                    <option value="3">耗材</option>
                                    <option value="4">半成品</option>
                                    <option value="4">中间品</option>
                                </select>
                            </div>
                        </div>
@@ -93,7 +93,7 @@
                                    <option value=""></option>
                                    <option value="0">常温</option>
                                    <option value="1">低温</option>
                                    <option value="3">干燥通风</option>
                                    <!-- <option value="3">干燥通风</option> -->
                                </select>
                            </div>
                        </div>
@@ -144,7 +144,7 @@
                        {{# } else if(d.Type=='3') { }}
                            <p>耗材</p>
                        {{# } else if(d.Type=='4') { }}
                            <p>半成品</p>
                            <p>中间品</p>
                        {{# } }}
                    </script>


 HTML/views/BaseSetting/MaterialsForm.html

@@ -64,7 +64,7 @@
                            <option value="1">包材</option>
                            <option value="2">成品</option>
                            <option value="3">耗材</option>
                            <option value="4">半成品</option>
                            <option value="4">中间品</option>
                        </select>
                    </div>
                </div>
@@ -89,9 +89,9 @@
                    </div>
                </div>
                <div class="layui-inline">
                    <label class="layui-form-label">规格</label>
                    <label class="layui-form-label">规格/型号</label>
                    <div class="layui-input-block" style="width: 182px;">
                        <input type="text" name="Standard" placeholder="请输入规格" lay-verify="" autocomplete="off" class="layui-input">
                        <input type="text" name="Standard" placeholder="请输入规格/型号" lay-verify="" autocomplete="off" class="layui-input">
                    </div>
                </div>
            </div>
@@ -123,7 +123,7 @@
                            <option value=""></option>
                            <option value="0">常温</option>
                            <option value="1">低温</option>
                            <option value="3">干燥通风</option>
                            <!-- <option value="3">干燥通风</option> -->
                        </select>
                    </div>
                </div>

 HTML/views/SystemSettings/Category.html

@@ -177,7 +177,7 @@
                            title: '序号', type: 'numbers', fixed: 'left', width:65
                        }, 
                        {
                            field: 'CategoryNo', title: '类别编号', align: 'center', fixed: 'left',width:100
                            field: 'CategoryNo', title: '类别编码', align: 'center', fixed: 'left',width:100
                        }, 
                        {
                            field: 'CategoryName', title: '类别名称', align: 'center',width:100

 HTML/views/SystemSettings/CategoryForm.html

@@ -11,9 +11,9 @@
    <body>
        <div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 30px 0 0;">
            <div class="layui-form-item">
                <label class="layui-form-label">类别编号</label>
                <label class="layui-form-label">类别编码</label>
                <div class="layui-input-block">
                    <input type="text" name="CategoryNo" placeholder="请输入类别编号" lay-verify="required" autocomplete="off" class="layui-input">
                    <input type="text" name="CategoryNo" placeholder="请输入类别编码" lay-verify="required" autocomplete="off" class="layui-input">
                </div>
            </div>
            <div class="layui-form-item">

 Pda/View/AsnSetting/productEnter1.html

New file
@@ -0,0 +1,922 @@
<!DOCTYPE html>
<html>

<head>
    <meta name="viewport" content="user-scalable=0,width=device-width,initial-scale=1.0" />
    <meta charset="UTF-8" />
    <!-- <meta name="viewport" content="width=device-width, initial-scale=0.665, minimum-scale=0.5, maximum-scale=1, user-scalable=no" /> -->
    <!-- <meta name="viewport" content="width=device-width, initial-scale=0.665" /> -->
    <meta http-equiv="X-UA-Compatible" content="ie=edge" />
    <title>Boxline PDA</title>

    <link rel="stylesheet" href="/layui/css/layui.css" />
    <link rel="stylesheet" href="/css/style.css" />
    <script src="/js/adaptive.js"></script>
    <link rel="stylesheet" href="/css/my.css" />
    <style type="text/css">
        td {
            word-break: break-all;
            word-wrap: break-word;
        }

        .layui-form-switch {
            margin-top: 0;
        }

        /* 标签样式 */
        .tableyang-this a {
            margin: 10px 10px 0px 0px;
            line-height: 30px;
            width: 100px;
            color: #999;
            text-align: center;
            float: left;
            background: #f7f7f7;
            user-select: none;
            position: relative;
            z-index: 1;
            cursor: pointer;
            border-radius: 5px;
            border: 1px solid #ccc;
            transition: all 0.3s ease;
        }
        
        .tableyang-this a.hover {
            color: #5298ff;
            background-color: #eff2ff;
            border: 1px solid #5298ff;
        }
        /* 内容居中 */
        .tableyang-tab {
            display: flex;
            /* justify-content: center; */
            /* align-items: center; */
            flex-direction: column;
            height: 90vh;
        }
        /* 必用样式 */
        .tableyang-2,.tableyang-3 {
            display: none; 
        }

        ul {
            list-style-type: none;
            padding: 0;
        }

        li {
            cursor: pointer;
            background-color: lightgray;
            padding: 10px;
            margin-bottom: 5px;
        }

       

    </style>
    <link rel="stylesheet" href="/css/adapter.css" />
    <script src="../../js/jquery.js"></script>
    <script src="../../js/jquery-3.5.1.min.js"></script>
</head>

<body>
    <div id="" class="main-content">
        
        <div id="" class="layout-title">
            <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-menu-icon"><img id="menuImg" src="/assets/menu.jpg"></td>
                </tr>
            </table>
        </div>
        
        <div id="" class="layout-sub-content">
            <div id="menuList" class="menu">
                <ul class="" style="text-align: center;">
                    <li><a href="../index.html" lang>主页</a></li>
                    <!-- <li><a href="productEnterConfirm.html">入库信息确认</a></li> -->
                    <li><a href="../login.html" lang>重新登录</a></li>
                </ul>
            </div>

            <ul>
                <li id="option1">标签</li>
                <li id="option2">数量</li>
                
            </ul>
            
            <br />
            <!-- 有码 -->
            <div id="content1">
                <div id="zongDiv" class="layout-bill-info" style="height: 255px;">
                    <form class="layui-form" action="">
                        <div id="" class="layui-form-item layout-dropdownlist">
                            <label class="layui-form-label" lang>入库单：</label>
                            <div class="layui-input-block" id="selectDiv">
                                <select id="bar" lay-filter="getbar" lay-search>
                                    <option value=""></option>
                                </select>
                                <img src="/assets/down_arraw.png">
                            </div>
                        </div>
                        <div class="layui-form-item layout-dropdownlist" style="margin-top: 10px;">
                            <label class="layui-form-label">物料-批次：</label>
                            <div class="layui-input-block" id="goodDiv">
                                <select id="goodSelect" lay-filter="goodSelect" lay-search>
                                    <option value=""></option>
                                </select>
                                <img src="/assets/down_arraw.png">
                            </div>
                        </div>

                        <div id="" class="layui-form-item layout-input">
                            <label class="layui-form-label" lang>托盘条码：</label>
                            <div class="layui-input-block">
                                <input id="STOCKCODE" type="text" lay-verify="stock" lang langholder placeholder="请扫描托盘条码"
                                    autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <div id="BOX" class="layui-form-item layout-input">
                            <label class="layui-form-label" lang>外箱条码：</label>
                            <div class="layui-input-block">
                                <input id="BOXCODE" type="text" lay-verify="required" lang langholder placeholder="请扫描外箱条码"
                                    autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <div id="" class="layui-form-item layout-input">
                            <label class="layui-form-label" lang>是否连组：</label>
                            <div class="layui-input-block">
                                <input type="checkbox" name="IsLianXu" id="IsLianXu" lay-skin="switch" lay-text="是|否"
                                    lay-filter="IsLianXu">
                            </div>
                        </div>
                        <div id="BOX2" class="layui-form-item layout-input" style="display: none;">
                            <label class="layui-form-label" lang>尾箱条码：</label>
                            <div class="layui-input-block">
                                <input id="BOXCODE2" type="text" lang langholder placeholder="请扫描外箱条码" autocomplete="off"
                                    class="layui-input">
                            </div>
                        </div>

                        <table class="layout-tbl-input" border="" cellspacing="" cellpadding="">
                            <tr>
                                <td>
                                    <div id="" class="layui-form-item layout-boxinfo">
                                        <label class="layui-form-label" lang>规格/型号：</label>
                                        <div class="layui-input-block">
                                            <input id="Standard" type="text" disabled placeholder="" autocomplete="off"
                                                class="layui-input">
                                        </div>
                                    </div>
                                </td>
                                <td>
                                    <div id="" class="layui-form-item layout-boxinfo">
                                        <label class="layui-form-label" lang>计划数量：</label>
                                        <div class="layui-input-block">
                                            <input id="ImportQuantity" type="text" disabled placeholder=""
                                                autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </td>

                            </tr>
                            <tr>
                                <td>
                                    <div id="" class="layui-form-item layout-boxinfo">
                                        <label class="layui-form-label" lang>已组数量：</label>
                                        <div class="layui-input-block">
                                            <input id="ImportFactQuantity" type="text" disabled placeholder=""
                                                autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </td>
                                <td>
                                    <div id="" class="layui-form-item layout-boxinfo">
                                        <label class="layui-form-label" lang>箱内数量：</label>
                                        <div class="layui-input-block">
                                            <input id="BoxQty" type="text" disabled placeholder="" autocomplete="off"
                                                class="layui-input">
                                        </div>
                                    </div>
                                </td>
                            </tr>

                        </table>
                        
                    </form>
                </div>

            </div>
            <!-- 无码 -->
            <div id="content2">
                <div id="zongDiv" class="layout-bill-info" style="height: 255px;">
                    <form class="layui-form" action="">
                        <div id="" class="layui-form-item layout-dropdownlist">
                            <label class="layui-form-label" lang>入库单：</label>
                            <div class="layui-input-block" id="selectDivw">
                                <select id="barw" lay-filter="getbar" lay-search>
                                    <option value=""></option>
                                </select>
                                <img src="/assets/down_arraw.png">
                            </div>
                        </div>
                        <div class="layui-form-item layout-dropdownlist" style="margin-top: 10px;">
                            <label class="layui-form-label">物料-批次：</label>
                            <div class="layui-input-block" id="goodDivw">
                                <select id="goodSelectw" lay-filter="goodSelectw" lay-search>
                                    <option value=""></option>
                                </select>
                                <img src="/assets/down_arraw.png">
                            </div>
                        </div>

                        <div id="" class="layui-form-item layout-input">
                            <label class="layui-form-label" lang>托盘条码：</label>
                            <div class="layui-input-block">
                                <input id="STOCKCODEw" type="text" lay-verify="stock" lang langholder placeholder="请扫描托盘条码"
                                    autocomplete="off" class="layui-input">
                            </div>
                        </div>

                        <div id="" class="layui-form-item layout-input">
                            <label class="layui-form-label" lang>物料数量：</label>
                            <div class="layui-input-block">
                                <input id="SkuQtyw" type="text" lay-verify="stock" lang langholder placeholder="请输入物料数量"
                                    autocomplete="off" class="layui-input">
                            </div>
                        </div>
                       
                        <table class="layout-tbl-input" border="" cellspacing="" cellpadding="">
                            <tr>
                                <td>
                                    <div id="" class="layui-form-item layout-boxinfo">
                                        <label class="layui-form-label" lang>规格/型号：</label>
                                        <div class="layui-input-block">
                                            <input id="Standardw" type="text" disabled placeholder="" autocomplete="off"
                                                class="layui-input">
                                        </div>
                                    </div>
                                </td>
                            </tr>
                            <tr>
                                <td>
                                    <div id="" class="layui-form-item layout-boxinfo">
                                        <label class="layui-form-label" lang>计划数量：</label>
                                        <div class="layui-input-block">
                                            <input id="ImportQuantityw" type="text" disabled placeholder=""
                                                autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </td>

                            </tr>
                            <tr>
                                <td>
                                    <div id="" class="layui-form-item layout-boxinfo">
                                        <label class="layui-form-label" lang>已组数量：</label>
                                        <div class="layui-input-block">
                                            <input id="ImportFactQuantityw" type="text" disabled placeholder=""
                                                autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </td>
                            </tr>

                        </table>

                    </form>
                </div>

            </div>

            <table class="layout-tbl-submit" border="" cellspacing="" cellpadding="">
                <tr>
                    <td style="width: 23%;"></td>
                    <td>
                        <button class="layout-btn layout-btn-red" lang type="button" lay-submit
                            lay-filter="formBind">绑定到托盘</button>
                    </td>
                    <td style="width: 33%;"></td>

                </tr>
            </table>
            
            <br>

            <div id="" class="cut-line">
                <img src="/assets/fengexian.png">
            </div>

            <div class="layout-tbl-paging" id="">
                <table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
                    <tr>
                        <th lang style="width: 15%;">编码</th>
                        <th lang style="width: 35%;">名称</th>
                        <th lang style="width: 25%;">批次</th>
                        <th lang style="width: 15%;">数量</th>
                        <th lang style="width: 10%;">操作</th>
                    </tr>
                    <tr id="boxCell" style="display: none;">
                        <td name="code">AG000001</td>
                        <td name="name">疫苗名称名称名称</td>
                        <td name="lotNo">批次号</td>
                        <td name="num">30</td>
                        <td name="del">
                            <div id="" class="tbl-btn-del" lang>
                                删除
                            </div>
                        </td>
                    </tr>
                </table>
            </div>


        </div>
    </div>
    <script src="/js/jquery-3.5.1.min.js"></script>
    <script src="/layui/layui.js"></script>
    <script src="/js/public.js"></script>
    <script src="/js/language.js"></script>
    <script src="/js/jquery.cookie.js"></script>
    <script>
        layui.use(['form', 'jquery'], function () {
            var form = layui.form

            /* 标签切换代码 */
            
            var xianshiyemian = 0;
            
            $('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //选中后颜色
            $('#option2').attr("style", "background-color: #999;width: 45.77%;float: right;text-align: center;"); //默认颜色
            $('#content2').hide();
            $(document).ready(function() {
                $('#option1').click(function() {
                    xianshiyemian = 0;
                    $('#content1').show();
                    $('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //选中后颜色

                    $('#content2').hide();
                    $('#option2').attr("style", "background-color: #999;width: 45.77%;float: right;text-align: center;"); //默认颜色
                });

                $('#option2').click(function() {
                    xianshiyemian = 1;
                    $('#content1').hide();
                    $('#option1').attr("style", "background-color: #999;width: 45.77%;float: left;text-align: center;"); //默认颜色

                    $('#content2').show();
                    $('#option2').attr("style", "background-color: aqua;width: 45.77%;float: right;text-align: center;"); //选中后颜色
                    
                });
            });
        

            initLanguage()
            setLanguage()

            //当前分页
            var curPageIndex = 1;
            //是否连续组托
            isContinue = "0";
            //清楚文本框中数据
            function clear() {
                $("#ImportQuantity").val("");
                $("#GoodsCode").val("");
                $("#Standard").val("");
                $("#ImportFactQuantity").val("");
                $("#ImportQty").val("");
                $("#BoxQty").val("");
            }

            // 托盘码文本改变时触发
            $("#STOCKCODE").on('input', function () {

                if ($("#STOCKCODE").val() == "" || $("#STOCKCODE").val().length < 8) {
                    return
                }
                if ($("#STOCKCODE").val().length >= 8) {
                    $("#STOCKCODE").val($("#STOCKCODE").val().substr(-8))
                }
                checkPalletStat()
            })

            // 托盘码文本改变时触发-数量
            $("#STOCKCODEw").on('input', function () {

                if ($("#STOCKCODEw").val() == "" || $("#STOCKCODEw").val().length < 8) {
                    return
                }
                if ($("#STOCKCODEw").val().length >= 8) {
                    $("#STOCKCODEw").val($("#STOCKCODEw").val().substr(-8))
                }
                checkPalletStat()
            })

            //箱码回车事件
            $("#BOXCODE").keydown(function (e) {
                if (e.keyCode === 13) {
                    if ($("#BOXCODE").val() == "") {
                        return
                    }

                    if ($("#STOCKCODE").val() == "") {
                        layer.msg('请先扫描托盘码', {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                        $("#BOXCODE").val("");
                        $("#STOCKCODE").focus();
                        return;
                    }
                    checkBoxInfo()
                }
            });

            //点击入库单据下拉框事件
            $("#selectDiv").click(function () {
                var input = $('select[id="bar"]').next().find('.layui-select-title input')
                var val = input.val()
                //先更新一下入库单
                updateBillList(function (data) {
                    $('select[id="bar"]').next().addClass('layui-form-selected')
                    $('select[id="bar"]').next().find('.layui-select-title input').val(val)
                })
            })
            //点击入库单据下拉框事件-数量
            $("#selectDivw").click(function () {
                var input = $('select[id="barw"]').next().find('.layui-select-title input')
                var val = input.val()
                //先更新一下入库单
                updateBillList(function (data) {
                    $('select[id="barw"]').next().addClass('layui-form-selected')
                    $('select[id="barw"]').next().find('.layui-select-title input').val(val)
                })
            })

            //点击物料下拉框事件
            $("#goodDiv").click(function () {
                if ($("#bar").val() == null || $("#bar").val() == "" || $("#bar").val() == undefined) {
                    layer.msg("请先选择入库单", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () { });
                }
            })
            //点击物料下拉框事件-数量
            $("#goodDivw").click(function () {
                if ($("#barw").val() == null || $("#barw").val() == "" || $("#barw").val() == undefined) {
                    layer.msg("请先选择入库单", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () { });
                }
            })

            //选中入库单事件
            form.on('select(getbar)', function (data) {
                updateGoodList()
                setOrderGoods();
            });
            //选中入库单事件-数量
            form.on('select(getbarw)', function (data) {
                updateGoodListw()
                setOrderGoodsw();
            });

            //选中物料事件
            form.on('select(goodSelect)', function (data) {
                setOrderGoods();
            });
            //选中物料事件-数量
            form.on('select(goodSelectw)', function (data) {
                setOrderGoods();
            });


            //绑定到托盘事件
            form.on('submit(formBind)', function (data) {
                console.log(isContinue);
                console.log($("#goodSelect").val());
                if ($("#bar").val() == "") {
                    layer.msg('请选择入库单', {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    });
                    return;
                }
                if ($("#goodSelect").val() == "") {
                    layer.msg('请选择物料及明细', {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    });
                    return;
                }
                if ($("#STOCKCODE").val() == "") {
                    layer.msg('请扫描托盘条码', {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    });
                    return;
                }
                if ($("#BOXCODE").val() == "") {
                    layer.msg('请扫描外箱条码', {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    });
                    return;
                }
                var param = {
                    AsnNo: $("#bar").val(),
                    PalletNo: $("#STOCKCODE").val(),
                    AsnDetailId: parseInt($("#goodSelect").val()),
                    BoxNo: $("#BOXCODE").val(),
                    IsContinue: isContinue,
                    TailBoxNo: $("#BOXCODE2").val(),
                    Origin:"PDA"
                }
                //组盘
                sendData(IP + "/PdaAsn/BindPallet", param, 'post', function (res) {
                    if (res.code == 0) { //成功 
                        layer.msg(res.msg, {
                            icon: 1,
                            time: 1000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () {
                            setOrderGoods();
                            refreshTable();
                            $("#BOXCODE").val("");
                            $("#BOXCODE2").val("");
                            $("#QTY").val("");
                        });
                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () {
                            //回调
                        });
                    }
                });
                return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
            });


            // 根据入库明细ID 获取详细信息
            function setOrderGoods() {
                $("#ImportQuantity").val("");
                $("#Standard").val("");
                $("#ImportFactQuantity").val("");

                var param = {
                    Id: parseInt($("#goodSelect").val())
                };

                synData(IP + "/PdaAsn/GetArrivalNoticeDetail", param, 'post', function (res) {
                    console.log(JSON.stringify(res))
                    if (res.code == 0 && res.data != null) { //成功
                        $("#ImportQuantity").val(res.data.Qty);
                        $("#Standard").val(res.data.Standard);
                        $("#ImportFactQuantity").val(res.data.FactQty + "");
                    }
                });
            }
            // 根据入库明细ID 获取详细信息-数量
            function setOrderGoodsw() {
                $("#ImportQuantity").val("");
                $("#Standard").val("");
                $("#ImportFactQuantity").val("");

                var param = {
                    Id: parseInt($("#goodSelectw").val())
                };

                synData(IP + "/PdaAsn/GetArrivalNoticeDetail", param, 'post', function (res) {
                    console.log(JSON.stringify(res))
                    if (res.code == 0 && res.data != null) { //成功
                        $("#ImportQuantity").val(res.data.Qty);
                        $("#Standard").val(res.data.Standard);
                        $("#ImportFactQuantity").val(res.data.FactQty + "");
                    }
                });
            }

            // 绑定入库单信息
            function updateBillList(callback) {
                var input = $('select[id="bar"]').next().find('.layui-select-title input')
                var val = input.val()
                $("#bar").empty()
                $("#bar").append('<option value =>' + '</option>');
                form.render('select');

                var param = {
                    Type: "0,1"
                };
                sendData(IP + "/PdaAsn/GetArrivalNotices", param, 'post', function (res) {
                    if (res.code == 0) { //成功
                        for (var i = 0; i < res.data.length; i++) {
                            $("#bar").append('<option value =' + res.data[i].ASNNo + '>' + res.data[i]
                                .ASNNo +
                                '</option>');
                        }
                        form.render('select');

                        if (!val) {
                            $('#bar').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
                        } else {
                            var sel = 'dd[lay-value=' + val + ']';
                            $('#bar').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
                        }

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

            var asnDetails = "";

            // 绑定入库单物料及批次
            function updateGoodList() {
                console.log("aaaa");
                var input = $('select[id="goodSelect"]').next().find('.layui-select-title input')
                var val = input.val()

                $("#goodSelect").empty()
                $("#goodSelect").append('<option value =>' + '</option>');

                var param = {
                    AsnNo: $("#bar").val(),
                };
                synData(IP + "/PdaAsn/GetArrivalNoticeDetails", param, 'post', function (res) {
                    console.log("出库口：" + JSON.stringify(res))
                    if (res.code == 0) { //成功
                        asnDetails = res.data;
                        for (var i = 0; i < res.data.length; i++) {
                            if (i == 0) {
                                $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
                                    .SkuName + "-" + res.data[i].LotNo +
                                    '</option>');
                            } else {
                                $("#goodSelect").append('<option value =' + res.data[i].Id + '>' + res.data[i]
                                    .SkuName + "-" + res.data[i].LotNo +
                                    '</option>');
                            }

                        }
                        form.render('select');

                        if (!val) {
                            $('#goodSelect').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
                        } else {
                            var sel = 'dd[lay-value=' + val + ']';
                            $('#goodSelect').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
                        }
                    } else {
                    }
                });
            }
            // 绑定入库单物料及批次-数量
            function updateGoodList() {
                console.log("aaaa");
                var input = $('select[id="goodSelectw"]').next().find('.layui-select-title input')
                var val = input.val()

                $("#goodSelectw").empty()
                $("#goodSelectw").append('<option value =>' + '</option>');

                var param = {
                    AsnNo: $("#bar").val(),
                };
                synData(IP + "/PdaAsn/GetArrivalNoticeDetails", param, 'post', function (res) {
                    console.log("出库口：" + JSON.stringify(res))
                    if (res.code == 0) { //成功
                        asnDetails = res.data;
                        for (var i = 0; i < res.data.length; i++) {
                            if (i == 0) {
                                $("#goodSelectw").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
                                    .SkuName + "-" + res.data[i].LotNo +
                                    '</option>');
                            } else {
                                $("#goodSelectw").append('<option value =' + res.data[i].Id + '>' + res.data[i]
                                    .SkuName + "-" + res.data[i].LotNo +
                                    '</option>');
                            }

                        }
                        form.render('select');

                        if (!val) {
                            $('#goodSelectw').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
                        } else {
                            var sel = 'dd[lay-value=' + val + ']';
                            $('#goodSelectw').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
                        }
                    } else {
                    }
                });
            }

            // 渲染箱码信息
            function refreshTable() {
                //先清空一下箱子列表
                let trs = $("#tableBoxList tr")
                let len = trs.length

                for (i = len - 1; i >= 2; i--) {
                    trs[i].remove();
                }

                //设置托盘号
                $("#palletCode").val($.cookie('stockCode'))

                var param = {
                    PalletNo: $.cookie('stockCode')
                };
                //  根据托盘号获取箱码信息
                sendData(IP + "/PdaAsn/GetBoxInfos", param, 'post', function (res) {
                    if (res.code == 0) { //成功
                        var list = res
                        var arrTrs = new Array()
                        let idx = 0
                        for (var i in res.data) {
                            var tr = $("#boxCell").eq(0).clone();
                            tr.appendTo("#tableBoxList");
                            tr.attr('id', res.data[i].Id)
                            tr.attr('boxno', res.data[i].BoxNo)
                            tr.attr('BindNo', res.data[i].BindNo)
                            idx++;
                            tr.attr('index', idx)
                            tr.find("td[name='code']").html(res.data[i].BoxNo);
                            tr.find("td[name='name']").html(res.data[i].SkuName);
                            tr.find("td[name='lotNo']").html(res.data[i].LotNo);
                            tr.find("td[name='num']").html(res.data[i].Qty);
                            tr.find("td[name='del']").click(function () {
                                var elem = $(this).parent()
                                var boxno = elem.attr('boxno')
                                var BindNo = elem.attr('BindNo')
                                var Id = elem.attr('id')
                                layer.alert("确定要从托盘上删除这个箱物料吗？<br>" + boxno, {
                                    icon: 2,
                                    time: 0, //2秒关闭（如果不配置，默认是3秒）
                                    btn: ['删除', '取消'],
                                    yes: function () {

                                        var param = {
                                            Id: Id,
                                        };
                                        sendData(IP + "/PdaAsn/DelBoxInfo", param, 'post', function (res) {
                                            if (res.code == 0) { //成功
                                                layer.msg(res.msg, {
                                                    icon: 1,
                                                    time: 1000 //2秒关闭（如果不配置，默认是3秒）
                                                });
                                                elem.remove()
                                                setOrderGoods();
                                                refreshTable();
                                            } else { //不成功
                                                layer.msg(res.msg, {
                                                    icon: 2,
                                                    time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                                }, function () { });
                                            }
                                        });
                                    }
                                })
                            })
                            tr.show();
                            arrTrs[i] = tr
                        }


                    } else { //不成功
                        layer.msg("无数据", {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () { });
                        $("#boxNum").val(0)
                    }
                });
            }

            // 判断托盘码是否可用
            function checkPalletStat() {
                var param = {
                    "PalletNo": $("#STOCKCODE").val()
                }
                sendData(IP + "/PdaAsn/IsEnablePalletNo", param, 'post', function (res) {
                    if (res.code == 0) {

                        $.cookie('stockCode', $("#STOCKCODE").val());
                        refreshTable()
                        $("#BOXCODE").focus();

                    } else {
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () { });
                    }
                });
            }
            // 判断托盘码是否可用
            function checkPalletStatw() {
                var param = {
                    "PalletNo": $("#STOCKCODEw").val()
                }
                sendData(IP + "/PdaAsn/IsEnablePalletNo", param, 'post', function (res) {
                    if (res.code == 0) {

                        $.cookie('STOCKCODEw', $("#STOCKCODEw").val());
                        refreshTable()
                        // $("#BOXCODE").focus();

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

            function checkBoxInfo() {
                var param = {
                    "BoxNo": $("#BOXCODE").val(),
                }
                sendData(IP + "/PdaAsn/GetBoxInfos", param, 'post', function (res) {
                    if (res.code == 0) { //成功
                        var bl = false; console.log(res.data);
                        if (res.data.length == 0) {
                            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 { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                    }
                });

            }

          

            form.on('switch(IsLianXu)', function (obj) {
                if (obj.elem.checked) {
                    $('#BOX2').attr("style", "display:block")
                    $('#zongDiv').attr("style", "height: 285px;")
                    isContinue = "1";
                } else {
                    $('#BOX2').attr("style", "display:none")
                    $('#zongDiv').attr("style", "height: 255px;")
                    isContinue = "0";
                }
                $('#BOXCODE2').val("");
            });

            $("#menuImg").click(function (e) {
                //console.log("menuImg")
                e.stopPropagation()

                if ($("#menuList").is(":hidden")) {
                    $("#menuList").show()
                } else {
                    $("#menuList").hide()
                }
            })
            $('body').click(function () {
                // //console.log("body")
                $("#menuList").hide()
            })
        })
    </script>
</body>

</html>

 Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs

@@ -60,7 +60,7 @@
                {
                    Id = a.Id,

                    CategoryNo = a.CategoryNo, //类别号
                    CategoryNo = a.CategoryNo, //类别编码
                    CategoryName = a.CategoryName, //类别名称

                    AreaNo = a.AreaNo, //区域号
@@ -215,7 +215,7 @@
                Db.BeginTran();
                SysMaterialCategory list = new SysMaterialCategory()
                {
                    CategoryNo = category.CategoryNo, //类别号
                    CategoryNo = category.CategoryNo, //类别编码
                    CategoryName = category.CategoryName, //类别名称

                    AreaNo = category.AreaNo, //区域编码
@@ -256,6 +256,8 @@
                string msg = "";
                //获取类别信息
                var categoryInfo = Db.Queryable<SysMaterialCategory>().First(a => a.IsDel == "0" && a.Id == category.Id);
                //获取类别对应物料信息
                var matelist = Db.Queryable<SysMaterials>().Where(a=>a.IsDel == "0" && a.CategoryNo == categoryInfo.CategoryNo).ToList();
                //获取区域信息
                var area = Db.Queryable<SysStorageArea>().First(a => category.AreaNo.Contains(a.AreaNo) && a.IsDel == "0");

@@ -265,16 +267,21 @@
                }

                Db.BeginTran();
                categoryInfo.CategoryNo = category.CategoryNo; //类别号
                categoryInfo.CategoryNo = category.CategoryNo; //类别编码
                categoryInfo.CategoryName = category.CategoryName; //类别名称
                categoryInfo.AreaNo = category.AreaNo; //区域编码
                categoryInfo.Demo = category.Demo; //备注
                categoryInfo.UpdateUser = category.CreateUser; //更改人
                categoryInfo.UpdateTime = Db.GetDate(); //更改时间


                Db.Updateable(categoryInfo).ExecuteCommand();

                foreach (var item in matelist)
                {
                    item.CategoryNo = categoryInfo.CategoryNo;
                }
                Db.Updateable(matelist).ExecuteCommand();

                Db.CommitTran();

                msg = "编辑类别信息成功！";