bklLiudl
2024-08-28 260c6e54c4f100ca49376a6afd70f73843868171
组托收货测试
13个文件已修改
3230 ■■■■ 已修改文件
HTML/views/ASNSetting/PalletBind.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/QualityControl/QualityChangeLog.html 573 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/QualityControl/QualityInformation.html 753 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/QualityControl/QualityInformationFrom.html 149 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/StatisticalReport/BoxInfor.html 1427 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pda/View/SoSetting/SampleOut2.html 148 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/DataServer/StockDetailServer.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/DataServer/StockServer.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/Controllers/StatisticalController.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/ASNSetting/PalletBind.html
@@ -455,13 +455,13 @@
                { field: 'PalletNo3', title: '托盘号LV3', align: 'center' },
                { field: 'LocatNo', title: '储位地址', align: 'center', width: 90 },
                { field: 'RoadwayNo', title: '所属巷道', align: 'center', width: 90, templet: '#RoadwayButton' },
                { field: 'WareHouseName', title: '所属仓库', align: 'center', width: 90},
                { field: 'WareHouseName', title: '所属仓库', align: 'center', width: 90 },
                { field: 'SkuNo', title: '物料编码', align: 'center', width: 110 },
                { field: 'SkuName', title: '物料名称', align: 'center' },
                { field: 'LotNo', title: '批次号', align: 'center', width: 120 },
                { field: 'Qty', title: '数量', align: 'center', width: 90 },
                { field: 'FullQty', title: '整托数量', align: 'center', width: 90 },
                { field: 'SamplingQty', title: '取样数量', align: 'center', width: 90 },
                //{ field: 'SamplingQty', title: '取样数量', align: 'center', width: 90 },                // 取样数量放到请验处显示
                { field: 'InspectMark', title: '抽检标记', align: 'center', width: 90, templet: '#templetInspectMark' },
                //{ field: 'Status', title: '执行状态', align: 'center', width: 90, templet: '#templetStatus' },   // 都是入库完成
                { field: 'BitPalletMark', title: '零托标记', align: 'center', width: 90, templet: '#templetBitPalletMark' },
@@ -544,7 +544,7 @@
                { field: 'LotNo', title: '批次号', align: 'center', width: 150, },
                { field: 'Qty', title: '数量', align: 'center', width: 105, },
                { field: 'FullQty', title: '整箱数量', align: 'center', width: 105, },
                { field: 'SamplingQty', title: '取样数量', align: 'center', width: 105, },
                //{ field: 'SamplingQty', title: '取样数量', align: 'center', width: 105, },           // 取样数量放到请验页面显示。
                { field: 'ProductionTime', title: '生产日期', align: 'center', width: 160, templet: '#templetProductionTime' },
                { field: 'ExpirationTime', title: '过期日期', align: 'center', width: 180, templet: '#templetExpirationTime' },
                { field: 'LotText', title: '批次描述', align: 'center', width: 150, },
HTML/views/QualityControl/QualityChangeLog.html
@@ -1,342 +1,291 @@
<!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">
        <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
        <link rel="stylesheet" href="../../css/public.css" media="all">
        <script>
            // 这里是需要在页面渲染之前执行的代码
            document.addEventListener("DOMContentLoaded", function() {
                //获取table默认显示数
                pageCntFirst();
                //判断是否开启table列表列宽调整功能。
                GetIsSetColW();
            });
          </script>
    </head>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item">
                        <!-- 单据
<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">
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <link rel="stylesheet" href="../../css/public.css" media="all">
    <script>
        // 这里是需要在页面渲染之前执行的代码
        document.addEventListener("DOMContentLoaded", function () {
            //获取table默认显示数
            pageCntFirst();
            //判断是否开启table列表列宽调整功能。
            GetIsSetColW();
        });
    </script>
</head>
<body id="body">
    <div class="layui-fluid" style="padding-bottom: 0;">
        <div class="layui-card">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC"
                id="top">
                <div class="layui-form-item">
                    <!-- 单据
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">入库单据</label>
                            <div class="layui-input-inline">
                                <input type="text" id="ASNNo" name="ASNNo" placeholder="请输入入库单据" autocomplete="off" class="layui-input">
                            </div>
                        </div> -->
                        <!-- 批次 -->
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">批次号</label>
                            <div class="layui-input-inline">
                                <input type="text" id="LotNo" name="LotNo" placeholder="请输入物料名称" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <!-- 物料号 -->
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">物料编码</label>
                            <div class="layui-input-inline">
                                <input type="text" id="SkuNo" name="SkuNo" placeholder="请输入物料编码" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <!-- 物料名称 -->
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">物料名称</label>
                            <div class="layui-input-inline">
                                <input type="text" id="SkuName" name="SkuName" placeholder="请输入物料名称" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <div class="layui-inline">
                            <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-search">
                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
                            </button>
                    <!-- 批次 -->
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 60px;">批次号</label>
                        <div class="layui-input-inline">
                            <input type="text" id="LotNo" name="LotNo" placeholder="请输入物料名称" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <!-- 物料号 -->
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 60px;">物料编码</label>
                        <div class="layui-input-inline">
                            <input type="text" id="SkuNo" name="SkuNo" placeholder="请输入物料编码" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <!-- 物料名称 -->
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 60px;">物料名称</label>
                        <div class="layui-input-inline">
                            <input type="text" id="SkuName" name="SkuName" placeholder="请输入物料名称" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
                            lay-filter="LAY-app-contlist-search">
                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
                        </button>
                    </div>
                </div>
                <div id="center"></div>
                <div class="layui-card-body">
                        <!-- <div style="padding-bottom: 5px; display: flex; flex-direction: row-reverse;">
            </div>
            <div id="center"></div>
            <div class="layui-card-body">
                <!-- <div style="padding-bottom: 5px; display: flex; flex-direction: row-reverse;">
                                <button class="layui-btn layui-btn-sm layuiadmin-btn-list approvalBtn" style="margin-right: 10px;" data-type="add" id="approvalBtn">
                                    <i class="layui-icon">&#xe654;</i>添加
                                </button>
                        </div> -->
                        <div class="position-relative">
                            <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                <div class="position-relative">
                    <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                            <!--#region 自定义表头 -->
                            <div class="headerSetIcon">
                                <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
                                    <i class="layui-icon">&#xe610;</i>
                                </button>
                            </div>
                            <!-- #endregion -->
                         </div>
                        <script type="text/html" id="CreateTimeButton">
                    <!--#region 自定义表头 -->
                    <div class="headerSetIcon">
                        <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
                            <i class="layui-icon">&#xe610;</i>
                        </button>
                    </div>
                    <!-- #endregion -->
                </div>
                <script type="text/html" id="CreateTimeButton">
                            {{# console.log(d.CreateTime);
                                    return formatDate(d.CreateTime);
                            }}
                        </script>
                </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>
            layui.config({
                base: '../../layuiadmin/' //静态资源所在路径
            }).extend({
                index: 'lib/index' //主入口模块
            }).use(['index', 'table', 'laypage', 'layer'], function() {
                var table = layui.table,
                    form = layui.form,
                    laypage = layui.laypage,
                    layer = layui.layer;
    </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', 'table', 'laypage', 'layer'], function () {
            var table = layui.table,
                form = layui.form,
                laypage = layui.laypage,
                layer = layui.layer;
                var h1 = GetTableHeight();
                var TotalColsArr =
                    [[
                        {
                            field: '',title: '序号',type: 'numbers',fixed: 'left', "disabled": true
                        },
                        {
                            field: 'SkuNo',title: '物料编码',align: 'center'
                        },
                        {
                            field: 'SkuName',title: '物料名称',align: 'center'
                        },
                        {
                            field: 'Standard',title: '物料规格',align: 'center'
                        },
                        {
                            field: 'LotNo',title: '批次号',align: 'center'
                        },
                        {
                            field: 'FailQty',title: '数量',align: 'center'
                        },
                        {
                            field: 'Demo',title: '变更信息',align: 'center',width: 360
                        },
                        // {
                        //     field: 'CreateUserName',title: '创建人',align: 'center'
                        // },
                        {
                            field: 'CreateTime',title: '创建时间',align: 'center', templet: '#CreateTimeButton',
                        },
                    ]];
                var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
            var h1 = GetTableHeight();
                refreshTable("","","","","","");
                var tableIns;
                var colsJson;
                function refreshTable(LotNo,SkuNo,SkuName) {
                    var param1={
                        // Href:'QualityControl/QualityInformation'
                        Href:'BllQuality/GetBllQualityList2'
                    };
                    sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
                        if (res.code == 0){
                            if(res.data=='' || res.data==undefined || res.data==null){
                                console.log(1)
                                colsJson=TotalColsArr
                            }else{
                                console.log(2)
                                colsJson= eval(res.data);
                            }
                        }else{
                            colsJson=TotalColsArr
                        }
                        var param = {
                            // ASNNo: ASNNo,
                            LotNo: LotNo,
                            SkuNo: SkuNo,
                            SkuName: SkuName,
                            Origin:'WMS'
                        };
                        // console.log(param)
                        var url  = "/BllQuality/GetBllQualityList";
                        table.render({
                            elem: '#LAY-app-content-list',
                            url: IP + url,
                            method: 'post',
                            height: h1,
                            id: 'LAY-app-content-list',
                            where: param,
                            contentType: 'application/json',
                            // toolbar: '#toolbarDemo',
                            defaultToolbar: [], //'filter','print', 'exports'
                            headers: { ToKen: $.cookie('token') },
                            page: true,
                            even: true,
                            limit: pageCnt,
                            limits: pageLimits,
                            cellMinWidth: 60, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                            done: function (res) {
                                setRight();
                                //自定义列宽
                                SetTableColW('LAY-app-content-list','BllQuality/GetBllQualityList2',TotalColsSysArr);
                            },
                            cols: colsJson
                        });
                    });
                    // var url  = "/BllQuality/GetBllQualityList";
                    // sendData(IP + url, param, 'post', function(res) {
                    //     if (res.code == 0) //成功
                    //     {
                    //         var list = res.data;
                    //         $.extend(infoOptions, {
                    //             data: list
                    //         });
                    //         infoOptions.page = {
                    //             curr: 1
                    //         }
                    //         console.log(res)
                    //         tableIns = table.render(infoOptions);
                    //     }
                    //     else //不成功
                    //     {
                    //         layer.msg('获取质检列表信息失败!', {
                    //             icon: 2,
                    //             time: 2000 //2秒关闭(如果不配置,默认是3秒)
                    //         }, function() {});
                    //     }
                    // });
                }
                // function tableclass(LotNo,SkuNo,SkuName)
                // {
                //     var param = {
                //         // ASNNo: ASNNo,
                //         LotNo: LotNo,
                //         SkuNo: SkuNo,
                //         SkuName: SkuName
                //     };
                //     // console.log(param)
                //     var url  = "/BllQuality/GetBllQualityList";
                //     table.render({
                //         elem: '#LAY-app-content-list',
                //         url: IP + url,
                //         method: 'post',
                //         height: 'full-136',
                //         id: 'LAY-app-content-list',
                //         where: param,
                //         // contentType: 'application/json',
                //         // toolbar: '#toolbarDemo',
                //         // defaultToolbar: [], //'filter','print', 'exports'
                //         // headers: { ToKen: $.cookie('token') },
                //         page: true,
                //         even: true,
                //         limit: pageCnt,
                //         limits: pageLimits,
                //         cellMinWidth: 60, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                //         done: function (res) {
                //             setRight();
                //         },
                //         cols: colsJson
                //     });
                // }
                // 权限设置
                function setRight() {
                    $(function() {
                        $("#approvalBtn").hide();
                    });
                    sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
                        if (res.code == 0) { //成功
                            for (var k = 0; k < res.data.length; k++) {
                                if (res.data[k].MenuName == "添加质检结果")
                                {
                                    $(function() {
                                        $("#approvalBtn").show();
                                    });
                                }
                            }
                        } else { //不成功
                            layer.msg('获取权限信息失败', {
                                icon: 2,
                                time: 2000 //2秒关闭(如果不配置,默认是3秒)
                            }, function () { });
                        }
                    });
                }
                //监听搜索
                form.on('submit(LAY-app-contlist-search)', function(data) {
                    // var ASNNo = data.field.ASNNo;
                    var LotNo = data.field.LotNo;
                    var SkuNo = data.field.SkuNo;
                    var SkuName = data.field.SkuName;
                    refreshTable(LotNo,SkuNo,SkuName);
                });
                var doing = true;
                var $ = layui.$,
                    active = {
                        customCols: function(){
                            layer.open({
                                type: 2,
                                title: '自定义列',
                                content: '../SystemSettings/HeaderSetting.html?Href=BllQuality/GetBllQualityList2&ColsSysArr='+TotalColsSysArr,
                                maxmin: false,
                                resize: false,
                                area: ['970px', '650px']
                            });
                        },
                    };
                $('.layui-btn').on('click', function() {
                    var type = $(this).data('type');
                    active[type] ? active[type].call(this) : '';
                });
                var element = layui.element;
                var houseId = 0;
                var param = {
                    Id: $.cookie('userId')
                }
                var xml = '';
                function getchiled(data, mainId) {
                    if (data)
            var TotalColsArr =
                [[
                    {
                        var list = data.filter(item => item.ParentId == mainId);
                        if (list)
                        {
                            for (var i = 0; i < list.length; i++)
                            {
                                var id = list[i].Id;
                                //查询有无子菜单
                                var count = data.filter(item => item.ParentId == id).length;
                                if (count > 0)
                                {
                                    xml = xml + '<dd>' + '<a href="javascript:;">' + list[i].Name + '</a>' + '<dl class="layui-nav-child">';
                                    getchiled(data, id);
                                    xml = xml + '</dl></dd>';
                                }
                                else
                                {
                                    xml = xml + '<dd>' + '<a lay-href="' + list[i].Url + '">' + list[i].Name + '</a>' + '</dd>';
                                }
                        field: '', title: '序号', type: 'numbers', fixed: 'left', "disabled": true
                    },
                    {
                        field: 'SkuNo', title: '物料编码', align: 'center'
                    },
                    {
                        field: 'SkuName', title: '物料名称', align: 'center'
                    },
                    {
                        field: 'Standard', title: '物料规格', align: 'center'
                    },
                    {
                        field: 'LotNo', title: '批次号', align: 'center'
                    },
                    {
                        field: 'PassQty', title: '合格数量', align: 'center'
                    },
                    {
                        field: 'FailQty', title: '不合格数量', align: 'center'
                    },
                    {
                        field: 'Demo', title: '变更信息', align: 'center', width: 360
                    },
                    // {
                    //     field: 'CreateUserName',title: '创建人',align: 'center'
                    // },
                    {
                        field: 'CreateTime', title: '创建时间', align: 'center', templet: '#CreateTimeButton',
                    },
                ]];
            var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
            refreshTable("", "", "", "", "", "");
            var tableIns;
            var colsJson;
            function refreshTable(LotNo, SkuNo, SkuName) {
                var param1 = {
                    // Href:'QualityControl/QualityInformation'
                    Href: 'BllQuality/GetBllQualityList2'
                };
                sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
                    if (res.code == 0) {
                        if (res.data == '' || res.data == undefined || res.data == null) {
                            console.log(1)
                            colsJson = TotalColsArr
                        } else {
                            console.log(2)
                            colsJson = eval(res.data);
                        }
                    } else {
                        colsJson = TotalColsArr
                    }
                    var param = {
                        // ASNNo: ASNNo,
                        LotNo: LotNo,
                        SkuNo: SkuNo,
                        SkuName: SkuName,
                        Origin: 'WMS'
                    };
                    // console.log(param)
                    var url = "/BllQuality/GetBllQualityList";
                    table.render({
                        elem: '#LAY-app-content-list',
                        url: IP + url,
                        method: 'post',
                        height: h1,
                        id: 'LAY-app-content-list',
                        where: param,
                        contentType: 'application/json',
                        // toolbar: '#toolbarDemo',
                        defaultToolbar: [], //'filter','print', 'exports'
                        headers: { ToKen: $.cookie('token') },
                        page: true,
                        even: true,
                        limit: pageCnt,
                        limits: pageLimits,
                        cellMinWidth: 60, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                        done: function (res) {
                            setRight();
                            //自定义列宽
                            SetTableColW('LAY-app-content-list', 'BllQuality/GetBllQualityList2', TotalColsSysArr);
                        },
                        cols: colsJson
                    });
                });
            }
            // 权限设置
            function setRight() {
                $(function () {
                    $("#approvalBtn").hide();
                });
                sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
                    if (res.code == 0) { //成功
                        for (var k = 0; k < res.data.length; k++) {
                            if (res.data[k].MenuName == "添加质检结果") {
                                $(function () {
                                    $("#approvalBtn").show();
                                });
                            }
                        }
                    } else { //不成功
                        layer.msg('获取权限信息失败', {
                            icon: 2,
                            time: 2000 //2秒关闭(如果不配置,默认是3秒)
                        }, function () { });
                    }
                });
            }
            //监听搜索
            form.on('submit(LAY-app-contlist-search)', function (data) {
                // var ASNNo = data.field.ASNNo;
                var LotNo = data.field.LotNo;
                var SkuNo = data.field.SkuNo;
                var SkuName = data.field.SkuName;
                refreshTable(LotNo, SkuNo, SkuName);
            });
            var doing = true;
            var $ = layui.$,
                active = {
                    customCols: function () {
                        layer.open({
                            type: 2,
                            title: '自定义列',
                            content: '../SystemSettings/HeaderSetting.html?Href=BllQuality/GetBllQualityList2&ColsSysArr=' + TotalColsSysArr,
                            maxmin: false,
                            resize: false,
                            area: ['970px', '650px']
                        });
                    },
                };
            $('.layui-btn').on('click', function () {
                var type = $(this).data('type');
                active[type] ? active[type].call(this) : '';
            });
            var element = layui.element;
            var houseId = 0;
            var param = {
                Id: $.cookie('userId')
            }
            var xml = '';
            function getchiled(data, mainId) {
                if (data) {
                    var list = data.filter(item => item.ParentId == mainId);
                    if (list) {
                        for (var i = 0; i < list.length; i++) {
                            var id = list[i].Id;
                            //查询有无子菜单
                            var count = data.filter(item => item.ParentId == id).length;
                            if (count > 0) {
                                xml = xml + '<dd>' + '<a href="javascript:;">' + list[i].Name + '</a>' + '<dl class="layui-nav-child">';
                                getchiled(data, id);
                                xml = xml + '</dl></dd>';
                            }
                            else {
                                xml = xml + '<dd>' + '<a lay-href="' + list[i].Url + '">' + list[i].Name + '</a>' + '</dd>';
                            }
                        }
                    }
                }
            });
        </script>
    </body>
</html>
            }
        });
    </script>
</body>
</html>
HTML/views/QualityControl/QualityInformation.html
@@ -1,445 +1,390 @@
<!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">
        <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
        <link rel="stylesheet" href="../../css/public.css" media="all">
        <script>
            // 这里是需要在页面渲染之前执行的代码
            document.addEventListener("DOMContentLoaded", function() {
                //获取table默认显示数
                pageCntFirst();
                //判断是否开启table列表列宽调整功能。
                GetIsSetColW();
            });
          </script>
    </head>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item">
                        <!-- 单据
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">入库单据</label>
                            <div class="layui-input-inline">
                                <input type="text" id="ASNNo" name="ASNNo" placeholder="请输入入库单据" autocomplete="off" class="layui-input">
                            </div>
                        </div> -->
                        <!-- 批次 -->
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">批次号</label>
                            <div class="layui-input-inline">
                                <input type="text" id="LotNo" name="LotNo" placeholder="请输入物料名称" autocomplete="off" class="layui-input">
                            </div>
<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">
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <link rel="stylesheet" href="../../css/public.css" media="all">
    <script>
        // 这里是需要在页面渲染之前执行的代码
        document.addEventListener("DOMContentLoaded", function () {
            //获取table默认显示数
            pageCntFirst();
            //判断是否开启table列表列宽调整功能。
            GetIsSetColW();
        });
    </script>
</head>
<body id="body">
    <div class="layui-fluid" style="padding-bottom: 0;">
        <div class="layui-card">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC"
                id="top">
                <div class="layui-form-item">
                    <!-- 单据 -->
                    <!-- <div class="layui-inline">
                        <label class="layui-form-label" style="width: 60px;">入库单据</label>
                        <div class="layui-input-inline">
                            <input type="text" id="ASNNo" name="ASNNo" placeholder="请输入入库单据" autocomplete="off"
                                class="layui-input">
                        </div>
                        <!-- 物料号 -->
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">物料编码</label>
                            <div class="layui-input-inline">
                                <input type="text" id="SkuNo" name="SkuNo" placeholder="请输入物料编码" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <!-- 物料名称 -->
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">物料名称</label>
                            <div class="layui-input-inline">
                                <input type="text" id="SkuName" name="SkuName" placeholder="请输入物料名称" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <div class="layui-inline">
                            <!-- 是否合格 -->
                            <label class="layui-form-label" style="width: 60px;">是否合格</label>
                                <div class="layui-input-inline">
                                <select name="IsQualified" id="IsQualified" lay-verify="" lay-verify="" lay-search>
                                    <option value=""></option>
                                    <option value="0">不合格</option>
                                    <option value="1">合格</option>
                                </select>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-search">
                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
                            </button>
                            <button class="layui-btn layui-btn-sm layuiadmin-btn-list approvalBtn" lay-submit lay-filter="LAY-app-contlist-tianjia" id="add">
                                <i class="layui-icon layui-icon-add layuiadmin-button-btn"></i>添加
                            </button>
                    </div> -->
                    <!-- 批次 -->
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 60px;">批次号</label>
                        <div class="layui-input-inline">
                            <input type="text" id="LotNo" name="LotNo" placeholder="请输入物料名称" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <!-- 物料号 -->
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 60px;">物料编码</label>
                        <div class="layui-input-inline">
                            <input type="text" id="SkuNo" name="SkuNo" placeholder="请输入物料编码" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <!-- 物料名称 -->
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 60px;">物料名称</label>
                        <div class="layui-input-inline">
                            <input type="text" id="SkuName" name="SkuName" placeholder="请输入物料名称" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <!-- 是否合格 -->
                        <label class="layui-form-label" style="width: 60px;">是否合格</label>
                        <div class="layui-input-inline">
                            <select name="IsQualified" id="IsQualified" lay-verify="" lay-verify="" lay-search>
                                <option value=""></option>
                                <option value="0">不合格</option>
                                <option value="1">合格</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline">
                        <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
                            lay-filter="LAY-app-contlist-search">
                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
                        </button>
                        <button class="layui-btn layui-btn-sm layuiadmin-btn-list approvalBtn" lay-submit
                            lay-filter="LAY-app-contlist-tianjia" id="add">
                            <i class="layui-icon layui-icon-add layuiadmin-button-btn"></i>添加
                        </button>
                    </div>
                </div>
                <div id="center"></div>
                <div class="layui-card-body">
                        <!-- <div style="padding-bottom: 5px; display: flex; flex-direction: row-reverse;">
            </div>
            <div id="center"></div>
            <div class="layui-card-body">
                <!-- <div style="padding-bottom: 5px; display: flex; flex-direction: row-reverse;">
                                <button class="layui-btn layui-btn-sm layuiadmin-btn-list approvalBtn" style="margin-right: 10px;" data-type="add" id="approvalBtn">
                                    <i class="layui-icon">&#xe654;</i>添加
                                </button>
                        </div> -->
                        <div class="position-relative">
                            <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                <div class="position-relative">
                    <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                            <!--#region 自定义表头 -->
                            <div class="headerSetIcon">
                                <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
                                    <i class="layui-icon">&#xe610;</i>
                                </button>
                            </div>
                            <!-- #endregion -->
                         </div>
                    <!--#region 自定义表头 -->
                    <div class="headerSetIcon">
                        <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
                            <i class="layui-icon">&#xe610;</i>
                        </button>
                    </div>
                    <!-- #endregion -->
                </div>
                        <script type="text/html" id="IsQualifiedButton">
                <script type="text/html" id="IsQualifiedButton">
                            {{#  if(d.IsQualified=='0'){ }}
                                <p>不合格</p>
                            {{#  } else if(d.IsQualified=='1'){ }}
                            <p>合格</p>
                            {{#  } }}
                        </script>
                        <script type="text/html" id="CreateTimeButton">
                <script type="text/html" id="CreateTimeButton">
                            {{# console.log(d.CreateTime);
                                    return formatDate(d.CreateTime);
                            }}
                        </script>
                </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>
            layui.config({
                base: '../../layuiadmin/' //静态资源所在路径
            }).extend({
                index: 'lib/index' //主入口模块
            }).use(['index', 'table', 'laypage', 'layer'], function() {
                var table = layui.table,
                    form = layui.form,
                    laypage = layui.laypage,
                    layer = layui.layer;
    </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', 'table', 'laypage', 'layer'], function () {
            var table = layui.table,
                form = layui.form,
                laypage = layui.laypage,
                layer = layui.layer;
                var h1 = GetTableHeight();
                var TotalColsArr =
                    [[
                        {
                            field: '',title: '序号',type: 'numbers',fixed: 'left', "disabled": true
                        },
                        {
                            field: 'InspectNo',title: '检验号',align: 'center'
                        },
                        {
                            field: 'SkuNo',title: '物料编码',align: 'center'
                        },
                        {
                            field: 'SkuName',title: '物料名称',align: 'center'
                        },
                        {
                            field: 'Standard',title: '物料规格',align: 'center'
                        },
                        {
                            field: 'LotNo',title: '批次号',align: 'center'
                        },
                        {
                            field: 'IsQualified',title: '检验结果',align: 'center',templet: '#IsQualifiedButton',
                        },
                        {
                            field: 'Origin',title: '来源',align: 'center'
                        },
                        {
                            field: 'PassQty',title: '合格数量',align: 'center'
                        },
                        {
                            field: 'FailQty',title: '不合格数量',align: 'center'
                        },
                        {
                            field: 'CreateUserName',title: '创建人',align: 'center'
                        },
                        {
                            field: 'CreateTime',title: '创建时间',align: 'center', templet: '#CreateTimeButton',
                        },
                    ]];
                var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
            var h1 = GetTableHeight();
                refreshTable("","","","","","");
                var tableIns;
                var colsJson;
                function refreshTable(LotNo,SkuNo,SkuName,IsQualified) {
                    var param1={
                        // Href:'QualityControl/QualityInformation'
                        Href:'BllQuality/GetBllQualityList'
                    };
                    sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
                        if (res.code == 0){
                            if(res.data=='' || res.data==undefined || res.data==null){
                                console.log(1)
                                colsJson=TotalColsArr
                            }else{
                                console.log(2)
                                colsJson= eval(res.data);
                            }
                        }else{
                            colsJson=TotalColsArr
            var TotalColsArr =
                [[
                    {
                        field: '', title: '序号', type: 'numbers', fixed: 'left', "disabled": true
                    },
                    {
                        field: 'InspectNo', title: '检验号', align: 'center'
                    },
                    {
                        field: 'SkuNo', title: '物料编码', align: 'center'
                    },
                    {
                        field: 'SkuName', title: '物料名称', align: 'center'
                    },
                    {
                        field: 'Standard', title: '物料规格', align: 'center'
                    },
                    {
                        field: 'LotNo', title: '批次号', align: 'center'
                    },
                    {
                        field: 'IsQualified', title: '检验结果', align: 'center', templet: '#IsQualifiedButton',
                    },
                    {
                        field: 'Origin', title: '来源', align: 'center'
                    },
                    {
                        field: 'PassQty', title: '合格数量', align: 'center'
                    },
                    {
                        field: 'FailQty', title: '不合格数量', align: 'center'
                    },
                    {
                        field: 'CreateUserName', title: '创建人', align: 'center'
                    },
                    {
                        field: 'CreateTime', title: '创建时间', align: 'center', templet: '#CreateTimeButton',
                    },
                ]];
            var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
            refreshTable("", "", "", "", "", "");
            var tableIns;
            var colsJson;
            function refreshTable(LotNo, SkuNo, SkuName, IsQualified) {
                var param1 = {
                    // Href:'QualityControl/QualityInformation'
                    Href: 'BllQuality/GetBllQualityList'
                };
                sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
                    if (res.code == 0) {
                        if (res.data == '' || res.data == undefined || res.data == null) {
                            console.log(1)
                            colsJson = TotalColsArr
                        } else {
                            console.log(2)
                            colsJson = eval(res.data);
                        }
                        // tableclass(LotNo,SkuNo,SkuName,IsQualified);
                    } else {
                        colsJson = TotalColsArr
                    }
                    // tableclass(LotNo,SkuNo,SkuName,IsQualified);
                        var param = {
                            // ASNNo: ASNNo,
                            LotNo: LotNo,
                            SkuNo: SkuNo,
                            SkuName: SkuName,
                            IsQualified: IsQualified,
                            Origin:'WMS'
                        };
                        // console.log(param)
                        var url  = "/BllQuality/GetBllQualityList";
                        table.render({
                            elem: '#LAY-app-content-list',
                            url: IP + url,
                            method: 'post',
                            height: h1,
                            id: 'LAY-app-content-list',
                            where: param,
                            contentType: 'application/json',
                            // toolbar: '#toolbarDemo',
                            defaultToolbar: [], //'filter','print', 'exports'
                            headers: { ToKen: $.cookie('token') },
                            page: true,
                            even: true,
                            limit: pageCnt,
                            limits: pageLimits,
                            cellMinWidth: 60, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                            done: function (res) {
                                setRight();
                                //自定义列宽
                                SetTableColW('LAY-app-content-list','BllQuality/GetBllQualityList',TotalColsSysArr);
                            },
                            cols: colsJson
                    var param = {
                        // ASNNo: ASNNo,
                        LotNo: LotNo,
                        SkuNo: SkuNo,
                        SkuName: SkuName,
                        IsQualified: IsQualified,
                        Origin: 'WMS'
                    };
                    // console.log(param)
                    var url = "/BllQuality/GetBllQualityList";
                    table.render({
                        elem: '#LAY-app-content-list',
                        url: IP + url,
                        method: 'post',
                        height: h1,
                        id: 'LAY-app-content-list',
                        where: param,
                        contentType: 'application/json',
                        // toolbar: '#toolbarDemo',
                        defaultToolbar: [], //'filter','print', 'exports'
                        headers: { ToKen: $.cookie('token') },
                        page: true,
                        even: true,
                        limit: pageCnt,
                        limits: pageLimits,
                        cellMinWidth: 60, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                        done: function (res) {
                            setRight();
                            //自定义列宽
                            SetTableColW('LAY-app-content-list', 'BllQuality/GetBllQualityList', TotalColsSysArr);
                        },
                        cols: colsJson
                    });
                });
            }
            // 权限设置
            function setRight() {
                $(function () {
                    $(".approvalBtn").hide();
                });
                sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
                    if (res.code == 0) { //成功
                        for (var k = 0; k < res.data.length; k++) {
                            if (res.data[k].MenuName == "添加质检结果") {
                                $(function () {
                                    $(".approvalBtn").show();
                                });
                            }
                        }
                    } else { //不成功
                        layer.msg('获取权限信息失败', {
                            icon: 2,
                            time: 2000 //2秒关闭(如果不配置,默认是3秒)
                        }, function () { });
                    }
                });
            }
            //监听搜索
            form.on('submit(LAY-app-contlist-search)', function (data) {
                // var ASNNo = data.field.ASNNo;
                var LotNo = data.field.LotNo;
                var SkuNo = data.field.SkuNo;
                var SkuName = data.field.SkuName;
                var IsQualified = data.field.IsQualified;
                refreshTable(LotNo, SkuNo, SkuName, IsQualified);
            });
            var doing = true;
            var $ = layui.$,
                active = {
                    customCols: function () {
                        layer.open({
                            type: 2,
                            title: '自定义列',
                            content: '../SystemSettings/HeaderSetting.html?Href=BllQuality/GetBllQualityList&ColsSysArr=' + TotalColsSysArr,
                            maxmin: false,
                            resize: false,
                            area: ['970px', '650px']
                        });
                    });
                    },
                };
            $('.layui-btn').on('click', function () {
                var type = $(this).data('type');
                active[type] ? active[type].call(this) : '';
            });
                    // var url  = "/BllQuality/GetBllQualityList";
                    // sendData(IP + url, param, 'post', function(res) {
                    //     if (res.code == 0) //成功
                    //     {
                    //         var list = res.data;
                    //         $.extend(infoOptions, {
                    //             data: list
                    //         });
                    //         infoOptions.page = {
                    //             curr: 1
                    //         }
                    //         console.log(res)
                    //         tableIns = table.render(infoOptions);
                    //     }
                    //     else //不成功
                    //     {
                    //         layer.msg('获取质检列表信息失败!', {
                    //             icon: 2,
                    //             time: 2000 //2秒关闭(如果不配置,默认是3秒)
                    //         }, function() {});
                    //     }
                    // });
                }
                // function tableclass(LotNo,SkuNo,SkuName,IsQualified)
                // {
                //     var param = {
                //         // ASNNo: ASNNo,
                //         LotNo: LotNo,
                //         SkuNo: SkuNo,
                //         SkuName: SkuName,
                //         IsQualified: IsQualified
                //     };
                //     // console.log(param)
                //     var url  = "/BllQuality/GetBllQualityList";
                //     table.render({
                //         elem: '#LAY-app-content-list',
                //         url: IP + url,
                //         method: 'post',
                //         height: 'full-136',
                //         id: 'LAY-app-content-list',
                //         where: param,
                //         // contentType: 'application/json',
                //         // toolbar: '#toolbarDemo',
                //         // defaultToolbar: [], //'filter','print', 'exports'
                //         // headers: { ToKen: $.cookie('token') },
                //         page: true,
                //         even: true,
                //         limit: pageCnt,
                //         limits: pageLimits,
                //         cellMinWidth: 60, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                //         done: function (res) {
                //             setRight();
                //         },
                //         cols: colsJson
                //     });
                // }
                // 权限设置
                function setRight() {
                    $(function() {
                        $(".approvalBtn").hide();
                    });
                    sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
                        if (res.code == 0) { //成功
                            for (var k = 0; k < res.data.length; k++) {
                                if (res.data[k].MenuName == "添加质检结果")
                                {
                                    $(function() {
                                        $(".approvalBtn").show();
                                    });
                                }
                            }
                        } else { //不成功
                            layer.msg('获取权限信息失败', {
                                icon: 2,
                                time: 2000 //2秒关闭(如果不配置,默认是3秒)
                            }, function () { });
                        }
                    });
                }
                //监听搜索
                form.on('submit(LAY-app-contlist-search)', function(data) {
                    // var ASNNo = data.field.ASNNo;
                    var LotNo = data.field.LotNo;
                    var SkuNo = data.field.SkuNo;
                    var SkuName = data.field.SkuName;
                    var IsQualified = data.field.IsQualified;
                    refreshTable(LotNo,SkuNo,SkuName,IsQualified);
                });
                var doing = true;
                var $ = layui.$,
                    active = {
                        customCols: function(){
                            layer.open({
                                type: 2,
                                title: '自定义列',
                                content: '../SystemSettings/HeaderSetting.html?Href=BllQuality/GetBllQualityList&ColsSysArr='+TotalColsSysArr,
                                maxmin: false,
                                resize: false,
                                area: ['970px', '650px']
                            });
                        },
                    };
                $('.layui-btn').on('click', function() {
                    var type = $(this).data('type');
                    active[type] ? active[type].call(this) : '';
                });
                //监听添加
                form.on('submit(LAY-app-contlist-tianjia)', function () {
                    layer.open({
                        type: 2,
                        title: '添加质检信息',
                        content: 'QualityInformationFrom.html',
                        maxmin: true,
                        area: ['500px', '450px'],
                        btn: ['确定', '取消'],
                        yes: function(index, layero) {
                            var iframeWindow = window['layui-layer-iframe' + index],
                                submitID = 'layuiadmin-app-form-submit',
                                submit = layero.find('iframe').contents().find('#' + submitID);
                            //监听提交
                            iframeWindow.layui.form.on('submit(' + submitID + ')', function(
                                data) {
                                var field = data.field; //获取提交的字段
                                //提交 Ajax 成功后,静态更新表格中的数据
                                var param = {
                                    InspectNo: field.InspectNo,
                                    //ASNNo: field.ASNNo,
                                    LotNo: field.LotNo,
                                    SkuNo: field.SkuNo,
                                    IsQualified: field.IsQualified,
                                };
                                if(doing)
                                {
                                    doing = false;
                                    sendData(IP + "/BllQuality/InsertQuality", param, 'post',function(res) {
                                        console.log(res);
                                        if (res.code == 0) { //成功
                                            layer.msg(res.msg, {
                                                icon: 1,
                                                time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                            }, function() {
                                                layer.close(index); //关闭弹层
                                                refreshTable
            //监听添加
            form.on('submit(LAY-app-contlist-tianjia)', function () {
                layer.open({
                    type: 2,
                    title: '添加质检信息',
                    content: 'QualityInformationFrom.html',
                    maxmin: true,
                    area: ['500px', '450px'],
                    btn: ['确定', '取消'],
                    yes: function (index, layero) {
                        var iframeWindow = window['layui-layer-iframe' + index],
                            submitID = 'layuiadmin-app-form-submit',
                            submit = layero.find('iframe').contents().find('#' + submitID);
                        //监听提交
                        iframeWindow.layui.form.on('submit(' + submitID + ')', function (
                            data) {
                            var field = data.field; //获取提交的字段
                            //提交 Ajax 成功后,静态更新表格中的数据
                            var param = {
                                InspectNo: field.InspectNo,
                                ASNNo: field.ASNNo,
                                LotNo: field.LotNo,
                                SkuNo: field.SkuNo,
                                IsQualified: field.IsQualified,
                            };
                            if (doing) {
                                doing = false;
                                sendData(IP + "/BllQuality/InsertQuality", param, 'post', function (res) {
                                    console.log(res);
                                    if (res.code == 0) { //成功
                                        layer.msg(res.msg, {
                                            icon: 1,
                                            time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                        }, function () {
                                            layer.close(index); //关闭弹层
                                            refreshTable
                                                (
                                                    // $("#ASNNo").val(),
                                                    $("#ASNNo").val(),
                                                    $("#LotNo").val(),
                                                    $("#SkuNo").val(),
                                                    $("#SkuName").val(),
                                                    $("#InsertQuality").val(),
                                                );
                                                doing = true;
                                            });
                                        }
                                        else //不成功
                                        {
                                            layer.msg(res.msg, {
                                                icon: 2,
                                                time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                            }, function() {doing = true;});
                                        }
                                    });
                                }
                                else{
                                    console.log(123);
                                }
                            });
                            submit.trigger('click');
                        }
                    });
                })
                var element = layui.element;
                var houseId = 0;
                var param = {
                    Id: $.cookie('userId')
                }
                var xml = '';
                function getchiled(data, mainId) {
                    if (data)
                    {
                        var list = data.filter(item => item.ParentId == mainId);
                        if (list)
                        {
                            for (var i = 0; i < list.length; i++)
                            {
                                var id = list[i].Id;
                                //查询有无子菜单
                                var count = data.filter(item => item.ParentId == id).length;
                                if (count > 0)
                                {
                                    xml = xml + '<dd>' + '<a href="javascript:;">' + list[i].Name + '</a>' + '<dl class="layui-nav-child">';
                                    getchiled(data, id);
                                    xml = xml + '</dl></dd>';
                                }
                                else
                                {
                                    xml = xml + '<dd>' + '<a lay-href="' + list[i].Url + '">' + list[i].Name + '</a>' + '</dd>';
                                }
                                            doing = true;
                                        });
                                    }
                                    else //不成功
                                    {
                                        layer.msg(res.msg, {
                                            icon: 2,
                                            time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                        }, function () { doing = true; });
                                    }
                                });
                            }
                            else {
                                console.log(123);
                            }
                        });
                        submit.trigger('click');
                    }
                });
            })
            var element = layui.element;
            var houseId = 0;
            var param = {
                Id: $.cookie('userId')
            }
            var xml = '';
            function getchiled(data, mainId) {
                if (data) {
                    var list = data.filter(item => item.ParentId == mainId);
                    if (list) {
                        for (var i = 0; i < list.length; i++) {
                            var id = list[i].Id;
                            //查询有无子菜单
                            var count = data.filter(item => item.ParentId == id).length;
                            if (count > 0) {
                                xml = xml + '<dd>' + '<a href="javascript:;">' + list[i].Name + '</a>' + '<dl class="layui-nav-child">';
                                getchiled(data, id);
                                xml = xml + '</dl></dd>';
                            }
                            else {
                                xml = xml + '<dd>' + '<a lay-href="' + list[i].Url + '">' + list[i].Name + '</a>' + '</dd>';
                            }
                        }
                    }
                }
            });
        </script>
    </body>
</html>
            }
        });
    </script>
</body>
</html>
HTML/views/QualityControl/QualityInformationFrom.html
@@ -1,77 +1,86 @@
<!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 0px 0 0;">
            <div class="layui-form-item">
                <label class="layui-form-label">检验号</label>
                <div class="layui-input-block" style="width: 70%;">
                    <input type="text" name="InspectNo" placeholder="请输入检验号" lay-verify="required" autocomplete="off" class="layui-input">
                </div>
            </div>
            <!-- <div class="layui-form-item">
                <label class="layui-form-label">入库单号</label>
                <div class="layui-input-block" style="width: 70%;">
                    <input type="text" name="ASNNo" placeholder="请输入入库单号" autocomplete="off" class="layui-input">
                </div>
            </div> -->
            <div class="layui-form-item">
                <label class="layui-form-label">批次号</label>
                <div class="layui-input-block" style="width: 70%;">
                    <input type="text" name="LotNo" placeholder="请输入批次号" lay-verify="required" autocomplete="off" class="layui-input">
                </div>
            </div>
            <div class="layui-form-item">
                <label class="layui-form-label">物料号</label>
                <div class="layui-input-block" style="width: 70%;">
                    <input type="text" name="SkuNo" placeholder="请输入物料号" lay-verify="required" autocomplete="off" class="layui-input">
                </div>
            </div>
            <div class="layui-form-item">
                    <label class="layui-form-label">审核状态</label>
                    <div class="layui-input-block" style="width: 70%;">
                        <select name="IsQualified" id="IsQualified" lay-verify="">
                            <!-- <option value=""></option> -->
                            <option value="0">不合格</option>
                            <option value="1" selected>合格</option>
                        </select>
                    </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="确认添加">
<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 0px 0 0;">
        <div class="layui-form-item">
            <label class="layui-form-label">检验号</label>
            <div class="layui-input-block" style="width: 70%;">
                <input type="text" name="InspectNo" placeholder="请输入检验号" lay-verify="required" autocomplete="off"
                    class="layui-input">
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">入库单号</label>
            <div class="layui-input-block" style="width: 70%;">
                <input type="text" name="ASNNo" placeholder="请输入入库单号" autocomplete="off" class="layui-input">
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">批次号</label>
            <div class="layui-input-block" style="width: 70%;">
                <input type="text" name="LotNo" placeholder="请输入批次号" lay-verify="required" autocomplete="off"
                    class="layui-input">
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">物料号</label>
            <div class="layui-input-block" style="width: 70%;">
                <input type="text" name="SkuNo" placeholder="请输入物料号" lay-verify="required" autocomplete="off"
                    class="layui-input">
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">审核状态</label>
            <div class="layui-input-block" style="width: 70%;">
                <select name="IsQualified" id="IsQualified" lay-verify="">
                    <!-- <option value=""></option> -->
                    <option value="0">不合格</option>
                    <option value="1" selected>合格</option>
                </select>
            </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="确认添加">
        </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.$,
                    form = layui.form,
                    layer = layui.layer;
    <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.$,
                form = layui.form,
                layer = layui.layer;
                });
        });
                //获取浏览器参数
                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>
        //获取浏览器参数
        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/StatisticalReport/BoxInfor.html
@@ -1,85 +1,92 @@
<!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">
        <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
        <link rel="stylesheet" href="../../css/public.css" media="all">
        <style type="text/css">
            .layui-form-item .layui-inline {
                margin-bottom: 1px;
                margin-right: 1px;
            }
        </style>
        <script>
            // 这里是需要在页面渲染之前执行的代码
            document.addEventListener("DOMContentLoaded", function() {
                //获取table默认显示数
                pageCntFirst();
                //判断是否开启table列表列宽调整功能。
                GetIsSetColW();
            });
          </script>
    </head>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
                    <div class="layui-form-item" style="margin-bottom: 0px;">
                        <div class="layui-inline zongdan" >
                            <label class="layui-form-label" style="width: 60px;">物料编码</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <input type="text" id="SkuNo"  name="SkuNo" placeholder="物料编码" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <div class="layui-inline zongdan" >
                            <label class="layui-form-label" style="width: 60px;">物料名称</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <input type="text" id="SkuName"  name="SkuName" placeholder="物料名称" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <div class="layui-inline zongdan" >
                            <label class="layui-form-label" style="width: 60px;">托盘号</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <input type="text" id="PalletNo"  name="PalletNo" placeholder="托盘号" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <div class="layui-inline mingxi">
                            <label class="layui-form-label" style="width: 60px;">货主编码</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <input type="text" id="OwnerNo" name="OwnerNo" placeholder="货主编码" autocomplete="off"
                                    class="layui-input">
                            </div>
                        </div>
                        <div class="layui-inline mingxi">
                            <label class="layui-form-label" style="width: 60px;">货主名称</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <input type="text" id="OwnerName" name="OwnerName" placeholder="货主名称" autocomplete="off"
                                    class="layui-input">
                            </div>
                        </div>
                        <div class="layui-inline mingxi">
                            <label class="layui-form-label" style="width: 60px;">批次号</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <input type="text" id="LotNo"  name="LotNo" placeholder="批次号" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <!-- 箱码 箱支状态 检验标记 零箱标记 质量状态 -->
<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">
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <link rel="stylesheet" href="../../css/public.css" media="all">
    <style type="text/css">
        .layui-form-item .layui-inline {
            margin-bottom: 1px;
            margin-right: 1px;
        }
    </style>
    <script>
        // 这里是需要在页面渲染之前执行的代码
        document.addEventListener("DOMContentLoaded", function () {
            //获取table默认显示数
            pageCntFirst();
            //判断是否开启table列表列宽调整功能。
            GetIsSetColW();
        });
    </script>
                        <div class="layui-inline zongdan" >
                            <label class="layui-form-label" style="width: 60px;">箱码</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <input type="text" id="BoxNo"  name="BoxNo" placeholder="箱码" autocomplete="off" class="layui-input">
                            </div>
</head>
<body id="body">
    <div class="layui-fluid" style="padding-bottom: 0;">
        <div class="layui-card">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
                <div class="layui-form-item" style="margin-bottom: 0px;">
                    <div class="layui-inline zongdan">
                        <label class="layui-form-label" style="width: 60px;">物料编码</label>
                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                            <input type="text" id="SkuNo" name="SkuNo" placeholder="物料编码" autocomplete="off"
                                class="layui-input">
                        </div>
                        <!-- <div class="layui-inline zhijian">
                    </div>
                    <div class="layui-inline zongdan">
                        <label class="layui-form-label" style="width: 60px;">物料名称</label>
                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                            <input type="text" id="SkuName" name="SkuName" placeholder="物料名称" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline zongdan">
                        <label class="layui-form-label" style="width: 60px;">托盘号</label>
                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                            <input type="text" id="PalletNo" name="PalletNo" placeholder="托盘号" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline mingxi">
                        <label class="layui-form-label" style="width: 60px;">货主编码</label>
                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                            <input type="text" id="OwnerNo" name="OwnerNo" placeholder="货主编码" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline mingxi">
                        <label class="layui-form-label" style="width: 60px;">货主名称</label>
                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                            <input type="text" id="OwnerName" name="OwnerName" placeholder="货主名称" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline mingxi">
                        <label class="layui-form-label" style="width: 60px;">批次号</label>
                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                            <input type="text" id="LotNo" name="LotNo" placeholder="批次号" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <!-- 箱码 箱支状态 检验标记 零箱标记 质量状态 -->
                    <div class="layui-inline zongdan">
                        <label class="layui-form-label" style="width: 60px;">箱码</label>
                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                            <input type="text" id="BoxNo" name="BoxNo" placeholder="箱码" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <!-- <div class="layui-inline zhijian">
                            <label class="layui-form-label" style="width: 60px;">箱支状态</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <select name="Status" id="Status" lay-search>
@@ -91,117 +98,112 @@
                                </select>
                            </div>
                        </div> -->
                        <div class="layui-inline zhijian">
                            <label class="layui-form-label" style="width: 60px;">抽检标记</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <select name="InspectMark" id="InspectMark" lay-filter="InspectMark"
                                    lay-search>
                                    <option value=""></option>
                                    <option value="0">否</option>
                                    <option value="1">是</option>
                                </select>
                            </div>
                        </div>
                        <div class="layui-inline zhijian">
                            <label class="layui-form-label" style="width: 60px;">零托标记</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <select name="BitPalletMark" id="BitPalletMark" lay-filter="BitPalletMark"
                                    lay-search>
                                    <option value=""></option>
                                    <option value="0">否</option>
                                    <option value="1">是</option>
                                </select>
                            </div>
                        </div>
                        <div class="layui-inline zhijian">
                            <label class="layui-form-label" style="width: 60px;">零箱标记</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <select name="BitBoxMark" id="BitBoxMark" lay-filter="BitBoxMark"
                                    lay-search>
                                    <option value=""></option>
                                    <option value="0">否</option>
                                    <option value="1">是</option>
                                </select>
                            </div>
                        </div>
                        <div class="layui-inline zhijian">
                            <label class="layui-form-label" style="width: 60px;">质检状态</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <select name="InspectStatus" id="InspectStatus" lay-filter="InspectStatus"
                                    lay-search>
                                    <option value=""></option>
                                    <option value="0">待质检</option><!-- 待检验 -->
                                    <option value="1">检验合格</option><!-- 合格品 -->
                                    <option value="2">不合格</option><!-- 不合格 -->
                                    <option value="3">放置期</option><!-- 不合格 -->
                                </select>
                            </div>
                        </div>
                        <div class="layui-inline zhijian">
                            <label class="layui-form-label" style="width: 60px;">开始时间</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <input type="text" autocomplete="off" id="StartTime" class="layui-input"
                                    placeholder="开始时间">
                            </div>
                        </div>
                        <div class="layui-inline zhijian">
                            <label class="layui-form-label" style="width: 60px;">结束时间</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <input type="text" autocomplete="off" id="EndTime" class="layui-input"
                                    placeholder="结束时间">
                            </div>
                        </div>
                        <div class="layui-inline sousuo">
                            <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-search">
                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
                            </button>
                            <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
                                lay-filter="daochu">
                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>导出
                            </button>
                    <div class="layui-inline zhijian">
                        <label class="layui-form-label" style="width: 60px;">抽检标记</label>
                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                            <select name="InspectMark" id="InspectMark" lay-filter="InspectMark" lay-search>
                                <option value=""></option>
                                <option value="0">否</option>
                                <option value="1">是</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline zhijian">
                        <label class="layui-form-label" style="width: 60px;">零托标记</label>
                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                            <select name="BitPalletMark" id="BitPalletMark" lay-filter="BitPalletMark" lay-search>
                                <option value=""></option>
                                <option value="0">否</option>
                                <option value="1">是</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline zhijian">
                        <label class="layui-form-label" style="width: 60px;">零箱标记</label>
                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                            <select name="BitBoxMark" id="BitBoxMark" lay-filter="BitBoxMark" lay-search>
                                <option value=""></option>
                                <option value="0">否</option>
                                <option value="1">是</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline zhijian">
                        <label class="layui-form-label" style="width: 60px;">质检状态</label>
                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                            <select name="InspectStatus" id="InspectStatus" lay-filter="InspectStatus" lay-search>
                                <option value=""></option>
                                <option value="0">待质检</option><!-- 待检验 -->
                                <option value="1">检验合格</option><!-- 合格品 -->
                                <option value="2">不合格</option><!-- 不合格 -->
                                <option value="3">放置期</option><!-- 不合格 -->
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline zhijian">
                        <label class="layui-form-label" style="width: 60px;">开始时间</label>
                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                            <input type="text" autocomplete="off" id="StartTime" class="layui-input" placeholder="开始时间">
                        </div>
                    </div>
                    <div class="layui-inline zhijian">
                        <label class="layui-form-label" style="width: 60px;">结束时间</label>
                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                            <input type="text" autocomplete="off" id="EndTime" class="layui-input" placeholder="结束时间">
                        </div>
                    </div>
                    <div class="layui-inline sousuo">
                        <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
                            lay-filter="LAY-app-contlist-search">
                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
                        </button>
                        <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="daochu">
                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>导出
                        </button>
                    </div>
                </div>
            </div>
                <div class="layui-card-body">
                    <div style="position: relative;">
                        <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                            <ul class="layui-tab-title" id="tab">
                                <li  class="layui-this">托盘明细</li>
                                <li >箱码明细</li>
                            </ul>
            <div class="layui-card-body">
                <div style="position: relative;">
                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                        <ul class="layui-tab-title" id="tab">
                            <li class="layui-this">托盘明细</li>
                            <li>箱码明细</li>
                        </ul>
                            <div id="center">
                            </div>
                        <div id="center">
                        </div>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
                                        <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                                        <!-- #region 自定义表头 -->
                                        <div class="headerSetIcon">
                                            <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
                                                <i class="layui-icon">&#xe610;</i>
                                            </button>
                                        </div>
                                        <!-- #endregion -->
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                <div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
                                    <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                                    <!-- #region 自定义表头 -->
                                    <div class="headerSetIcon">
                                        <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
                                            <i class="layui-icon">&#xe610;</i>
                                        </button>
                                    </div>
                                    <!-- #endregion -->
                                </div>
                                <div class="layui-tab-item">
                                    <div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
                                        <table id="LAY-app-content-list2" lay-filter="LAY-app-content-list2"></table>
                                        <!-- #region 自定义表头 -->
                                        <div class="headerSetIcon">
                                            <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols2">
                                                <i class="layui-icon">&#xe610;</i>
                                            </button>
                                        </div>
                                        <!-- #endregion -->
                            </div>
                            <div class="layui-tab-item">
                                <div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
                                    <table id="LAY-app-content-list2" lay-filter="LAY-app-content-list2"></table>
                                    <!-- #region 自定义表头 -->
                                    <div class="headerSetIcon">
                                        <button class="layui-btn layui-btn-primary layui-btn-sm"
                                            data-type="customCols2">
                                            <i class="layui-icon">&#xe610;</i>
                                        </button>
                                    </div>
                                    <!-- #endregion -->
                                        <!-- #region 自定义表头 -->
                                        <script type="text/html" id="templetProductionTime">
                                    <!-- #region 自定义表头 -->
                                    <script type="text/html" id="templetProductionTime">
                                            {{# function GetBtn(d){
                                                    return formatDate(d.ProductionTime);
                                                }    
@@ -209,22 +211,22 @@
                                            {{ GetBtn(d) }}
                                        </script>
                                        <script type="text/html" id="templetInspectTime">
                                    <script type="text/html" id="templetInspectTime">
                                            {{# function GetBtn1(d){
                                                    return formatDate(d.InspectTime);
                                                }    
                                            }}
                                            {{ GetBtn1(d) }}
                                        </script>
                                        <!-- #endregion -->
                                    </div>
                                    <!-- #endregion -->
                                </div>
                            </div>
                        </div>
                    </div>
                    <script type="text/html" id="BoxStatus">
                </div>
                <script type="text/html" id="BoxStatus">
                        {{#  if(d.Status=='0'){ }}
                            <p>未组托</p>
                        {{#  } else if(d.Status == '1') { }}
@@ -240,14 +242,14 @@
                        {{#  } }}
                        
                    </script>
                    <script type="text/html" id="InspectMarkStatus">
                <script type="text/html" id="InspectMarkStatus">
                        {{#  if(d.InspectMark=='0'){ }}
                            <p>否</p>
                        {{#  } else if(d.InspectMark == '1') { }}
                            <p>是</p>
                        {{# } }}
                    </script>
                    <script type="text/html" id="BitPalletMarkStatus">
                <script type="text/html" id="BitPalletMarkStatus">
                        {{#  if(d.BitPalletMark=='0'){ }}
                            <p>否</p>
                        {{#  } else if(d.BitPalletMark == '1') { }}
@@ -255,7 +257,7 @@
                        {{# } }}
                    </script>
                    <script type="text/html" id="InspectStatus1">
                <script type="text/html" id="InspectStatus1">
                        {{#  if(d.InspectStatus == '0') { }}
                            <p>待检验</p>
                        {{#  } else if(d.InspectStatus == '1'){ }}
@@ -266,630 +268,503 @@
                            <p>放置期</p>
                        {{#  } }}
                    </script>
                    <script type="text/html" id="BitPalletMarkStatus1">
                <script type="text/html" id="BitPalletMarkStatus1">
                        {{#  if(d.BitBoxMark=='0'){ }}
                            <p>否</p>
                        {{#  } else if(d.BitBoxMark == '1') { }}
                            <p>是</p>
                        {{# } }}
                    </script>
                    <script type="text/html" id="table-content-list">
                <script type="text/html" id="table-content-list">
                        <button class="layui-btn layui-btn-normal layui-btn-xs approvalBtnupt" id="approvalBtnupt" lay-event="edit">
                            <i class="layui-icon layui-icon-edit"></i>详情
                        </button>
                    </script>
                </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>
            var uid = $.cookie('userId');
            layui.config({
                base: '../../layuiadmin/' //静态资源所在路径
            }).extend({
                index: 'lib/index' //主入口模块
            }).use(['index', 'table', 'laypage', 'layer','element','laydate'], function() {
                var table = layui.table,
                    form = layui.form,
                    laypage = layui.laypage,
                    layer = layui.layer;
                    element = layui.element;
                    laydate = layui.laydate;
    <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>
        var uid = $.cookie('userId');
        layui.config({
            base: '../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'table', 'laypage', 'layer', 'element', 'laydate'], function () {
            var table = layui.table,
                form = layui.form,
                laypage = layui.laypage,
                layer = layui.layer;
            element = layui.element;
            laydate = layui.laydate;
                var h1 = GetTableTabHeight();
                // var h1 =  GetTkableTopHeight();
                // console.log(h1)
            var h1 = GetTableTabHeight();
            // var h1 =  GetTkableTopHeight();
            // console.log(h1)
                laydate.render({
                    elem: '#StartTime',
                    format: 'yyyy-MM-dd' //可任意组合
                });
                laydate.render({
                    elem: '#EndTime',
                    format: 'yyyy-MM-dd' //可任意组合
                });
                //获取当前时间
                function getNowTime() {
                    var date = new Date();
                    //年 getFullYear():四位数字返回年份
                    var year = date.getFullYear(); //getFullYear()代替getYear()
                    //月 getMonth():0 ~ 11
                    var month = date.getMonth() + 1;
                    //日 getDate():(1 ~ 31)
                    var day = date.getDate();
                    //时 getHours():(0 ~ 23)
                    var hour = date.getHours();
                    //分 getMinutes(): (0 ~ 59)
                    var minute = date.getMinutes();
                    //秒 getSeconds():(0 ~ 59)
                    var second = date.getSeconds();
                    var time = year + addZero(month) + addZero(day) + addZero(hour) + addZero(minute) + addZero(second);
                    return time;
                    //小于10的拼接上0字符串
                };
                function addZero(s) {
                    return s < 10 ? ('0' + s) : s;
                };
            laydate.render({
                elem: '#StartTime',
                format: 'yyyy-MM-dd' //可任意组合
            });
            laydate.render({
                elem: '#EndTime',
                format: 'yyyy-MM-dd' //可任意组合
            });
            //获取当前时间
            function getNowTime() {
                var date = new Date();
                //年 getFullYear():四位数字返回年份
                var year = date.getFullYear(); //getFullYear()代替getYear()
                //月 getMonth():0 ~ 11
                var month = date.getMonth() + 1;
                //日 getDate():(1 ~ 31)
                var day = date.getDate();
                //时 getHours():(0 ~ 23)
                var hour = date.getHours();
                //分 getMinutes(): (0 ~ 59)
                var minute = date.getMinutes();
                //秒 getSeconds():(0 ~ 59)
                var second = date.getSeconds();
                var $ = layui.$;
                var yemianid =0;
                refreshTable("","","","","","","","","","","","","","");
                var time = year + addZero(month) + addZero(day) + addZero(hour) + addZero(minute) + addZero(second);
                return time;
                // 表单需要的变量
                var infoOptions;
                //#region 原始非自定义列
                // infoOptions = {
                //     elem: '#LAY-app-content-list',
                //     height: 'full-206',
                //     id: 'LAY-app-content-list',
                //     page: true,
                //     limit: pageCnt,
                //     limits: pageLimits,
                //     even: true,
                //     cellMinWidth: 80, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                //     cols:
                //     [[
                //         {
                //             title: '序号',  type: 'numbers',  fixed: 'left'
                //         },
                //         {
                //             field: 'AreaNo', title: '所属区域', align: 'center',
                //         },
                //         {
                //             field: 'LocatNo', title: '储位地址', align: 'center'
                //         },
                //         {
                //             field: 'PalletNo', title: '托盘号', align: 'center',
                //         },
                //         {
                //             field: 'SkuNo', title: '物料编码', align: 'center'
                //         },
                //         {
                //             field: 'SkuName', title: '物料名称', align: 'center',
                //         },
                //         {
                //             field: 'LotNo', title: '批次号', align: 'center',
                //         },
                //         {
                //             field: 'LotText', title: '批次描述', align: 'center'
                //         },
                //         {
                //             field: 'SupplierLot', title: '供货批次', align: 'center',
                //         },
                //         {
                //             field: 'Qty', title: '数量', align: 'center'
                //         },
                //         {
                //             field: 'LockQty', title: '锁定数量', align: 'center',
                //         },
                //         {
                //             field: 'FrozenQty', title: '冻结数量', align: 'center'
                //         },
                //         {
                //             field: 'InspectMark', title: '抽检标记', align: 'center', templet: '#InspectMarkStatus'
                //         },
                //         {
                //             field: 'BitPalletMark', title: '零托标记', align: 'center', templet: '#BitPalletMarkStatus'
                //         },
                //        //{
                //        //    field: 'Status', title: '托盘状态', align: 'center', templet: '#PalletStatus',
                //        //},
                //     ]]
                // };
                //#endregion
                //小于10的拼接上0字符串
            };
            function addZero(s) {
                return s < 10 ? ('0' + s) : s;
            };
            var $ = layui.$;
            var yemianid = 0;
            refreshTable("", "", "", "", "", "", "", "", "", "", "", "", "", "");
            // 表单需要的变量
            var infoOptions;
            //#region 自定义表头
            var TotalColsArr = [[
                { field: '', title: '序号', type: 'numbers', align: 'center', fixed: 'left', "disabled": true },
                { field: 'WareHouseName', title: '所属仓库', align: 'center' },
                { field: 'RoadwayName', title: '所属巷道', align: 'center' },
                { field: 'AreaName', title: '所属区域', align: 'center' },
                { field: 'LocatNo', title: '储位地址', align: 'center' },
                { field: 'PalletNo', title: '托盘号', align: 'center' },
                { field: 'SkuNo', title: '物料编码', align: 'center' },
                { field: 'SkuName', title: '物料名称', align: 'center' },
                { field: 'OwnerNo', title: '货主编码', align: 'center' },
                { field: 'OwnerName', title: '货主名称', align: 'center' },
                { field: 'SupplierNo', title: '供应商编码', align: 'center' },
                { field: 'SupplierName', title: '供应商名称', align: 'center' },
                { field: 'LotNo', title: '批次号', align: 'center' },
                { field: 'LotText', title: '批次描述', align: 'center' },
                { field: 'SupplierLot', title: '供货批次', align: 'center' },
                { field: 'Qty', title: '数量', align: 'center' },
                { field: 'LockQty', title: '锁定数量', align: 'center', },
                { field: 'FrozenQty', title: '冻结数量', align: 'center' },
                { field: 'InspectMark', title: '抽检标记', align: 'center', templet: '#InspectMarkStatus' },
                { field: 'ProductionTime', title: '生产日期', align: 'center', templet: '#templetProductionTime' },
                { field: 'InspectStatus', templet: '#InspectStatus1', title: '质检状态', align: 'center' },
                { field: 'BitPalletMark', title: '零托标记', align: 'center', templet: '#BitPalletMarkStatus' },
            ]];
            var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
            //#endregion
            //获取托盘明细
            function refreshTable(SkuNo, SkuName, PalletNo, LotNo, BoxNo, Status, InspectMark, BitPalletMark,
                BitBoxMark, InspectStatus, OwnerNo, OwnerName, StartTime, EndTime) {
                //#region 自定义表头
                var TotalColsArr = [[
                    {field: '',title: '序号',type:'numbers',align: 'center',fixed: 'left', "disabled": true},
                    {field: 'WareHouseName', title: '所属仓库', align: 'center'},
                    {field: 'RoadwayName', title: '所属巷道', align: 'center'},
                    {field: 'AreaName', title: '所属区域', align: 'center'},
                    {field: 'LocatNo', title: '储位地址', align: 'center'},
                    {field: 'PalletNo', title: '托盘号', align: 'center'},
                    {field: 'SkuNo', title: '物料编码', align: 'center'},
                    {field: 'SkuName', title: '物料名称', align: 'center'},
                    {field: 'OwnerNo',title: '货主编码',align: 'center'},
                    {field: 'OwnerName',title: '货主名称',align: 'center'},
                    {field: 'SupplierNo',title: '供应商编码',align: 'center'},
                    {field: 'SupplierName',title: '供应商名称',align: 'center'},
                    {field: 'LotNo', title: '批次号', align: 'center'},
                    {field: 'LotText', title: '批次描述', align: 'center'},
                    {field: 'SupplierLot', title: '供货批次', align: 'center'},
                    {field: 'Qty', title: '数量', align: 'center'},
                    {field: 'LockQty', title: '锁定数量', align: 'center',},
                    {field: 'FrozenQty', title: '冻结数量', align: 'center'},
                    {field: 'InspectMark', title: '抽检标记', align: 'center', templet: '#InspectMarkStatus'},
                    {field: 'BitPalletMark', title: '零托标记', align: 'center', templet: '#BitPalletMarkStatus'},
                ]];
                var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
                //#endregion
                //获取托盘明细
                function refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName,StartTime,EndTime) {
                    //#region 自定义表头
                    var colsJson
                    var param1={
                        Href:'Statistical/GetBindList'
                    };
                    sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
                        if (res.code == 0){
                            if(res.data=='' || res.data==undefined || res.data==null){
                                colsJson=TotalColsArr
                            }else{
                                colsJson= eval(res.data);
                            }
                        }else{
                            colsJson=TotalColsArr
                var colsJson
                var param1 = {
                    Href: 'Statistical/GetBindList'
                };
                sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
                    if (res.code == 0) {
                        if (res.data == '' || res.data == undefined || res.data == null) {
                            colsJson = TotalColsArr
                        } else {
                            colsJson = eval(res.data);
                        }
                        infoOptions = {
                            elem: '#LAY-app-content-list',
                            height: h1,
                            id: 'LAY-app-content-list',
                            page: true,
                            limit: pageCnt,
                            limits: pageLimits,
                            even: true,
                            cellMinWidth: 80, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                            done: function(){
                                //自定义列宽
                                SetTableColW('LAY-app-content-list','Statistical/GetBindList',TotalColsSysArr);
                            },
                            cols:colsJson
                    } else {
                        colsJson = TotalColsArr
                    }
                    infoOptions = {
                        elem: '#LAY-app-content-list',
                        height: h1,
                        id: 'LAY-app-content-list',
                        page: true,
                        limit: pageCnt,
                        limits: pageLimits,
                        even: true,
                        cellMinWidth: 80, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                        done: function () {
                            //自定义列宽
                            SetTableColW('LAY-app-content-list', 'Statistical/GetBindList', TotalColsSysArr);
                        },
                        cols: colsJson
                    };
                    var param = {
                        SkuNo: SkuNo, //物料号
                        SkuName: SkuName, //物料名称
                        palletNo: PalletNo, //托盘号
                        LotNo: LotNo, //批次号
                        BoxNo: BoxNo, //箱码
                        Status: Status, //箱支状态
                        InspectMark: InspectMark, //检验标记
                        BitPalletMark: BitPalletMark, //零托标记
                        BitBoxMark: BitBoxMark, //零箱标记
                        InspectStatus: InspectStatus, //质量状态
                        OwnerNo: OwnerNo, //货主编码
                        OwnerName: OwnerName, //货主名称
                        StartTime: StartTime, //开始时间
                        EndTime: EndTime, //结束时间
                    };
                    sendData(IP + "/Statistical/GetBindList", param, 'get', function (res) {
                        console.log(res)
                        if (res.code == 0) { //成功
                            var list = res.data;
                            $.extend(infoOptions, {
                                data: list
                            });
                            infoOptions.page = {
                                curr: 1
                            }
                            tableIns = table.render(infoOptions);
                        }
                        else { //不成功
                            layer.msg('获取总量列表信息失败!', {
                                icon: 2,
                                time: 2000 //2秒关闭(如果不配置,默认是3秒)
                            }, function () { });
                        }
                    });
                });
                //#endregion
            }
            // 表单需要的变量
            var infoOptions2;
            //获取明细信息
            //#region 自定义表头
            var DetailColsArr = [[
                { field: '', title: '序号', type: 'numbers', fixed: 'left', "disabled": true },
                { field: 'SkuNo', title: '物料编码', align: 'center' },
                { field: 'SkuName', title: '物料名称', align: 'center' },
                { field: 'PalletNo', title: '托盘号', align: 'center', width: 110 },
                { field: 'BoxNo', title: '箱码', align: 'center', width: 100 },
                { field: 'Status', title: '箱支状态', align: 'center', templet: '#BoxStatus' },
                { field: 'LotNo', title: '批次号', align: 'center' },
                { field: 'LotText', title: '批次描述', align: 'center' },
                { field: 'Qty', title: '数量', width: 90, align: 'center' },
                { field: 'FullQty', title: '整箱数量', width: 100, align: 'center' },
                { field: 'ProductionTime', title: '生产日期', align: 'center', templet: '#templetProductionTime' },
                { field: 'InspectMark', title: '抽检标记', align: 'center', templet: '#InspectMarkStatus' },
                { field: 'BitBoxMark', templet: '#BitPalletMarkStatus1', title: '零箱标记', align: 'center' },
                { field: 'InspectStatus', templet: '#InspectStatus1', title: '质检状态', align: 'center' },
                { field: 'InspectTime', title: '复检时间', align: 'center', templet: '#templetInspectTime' },
                { field: 'caozuo', title: '操作', fixed: 'right', align: 'center', toolbar: '#table-content-list', "disabled": true }
            ]];
            var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//将表头数据进行url编码
            //#endregion
            function refreshTable2(Id, SkuNo, SkuName, LotNo, PalletNo, BoxNo, Status, InspectMark, BitBoxMark, InspectStatus, StartTime, EndTime) {
                //#region 自定义表头
                var colsJson2
                var param1 = {
                    Href: 'Statistical/GetBoxInfo'
                };
                sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
                    if (res.code == 0) {
                        if (res.data == '' || res.data == undefined || res.data == null) {
                            colsJson2 = DetailColsArr
                        } else {
                            colsJson2 = eval(res.data);
                        }
                    } else {
                        colsJson2 = DetailColsArr
                    }
                    infoOptions2 = {
                        elem: '#LAY-app-content-list2',
                        height: h1,
                        id: 'LAY-app-content-list2',
                        page: true,
                        limit: pageCnt,
                        limits: pageLimits,
                        even: true,
                        cellMinWidth: 80, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                        done: function () {
                            //自定义列宽
                            SetTableColW('LAY-app-content-list2', 'Statistical/GetBoxInfo', DetailColsSysArr);
                        },
                        cols: colsJson2
                    };
                    var param = {
                        Id: Id,
                        SkuNo: SkuNo,
                        SkuName: SkuName,
                        LotNo: LotNo,
                        PalletNo: PalletNo,
                        BoxNo: BoxNo,
                        Status: Status,
                        InspectMark: InspectMark,
                        BitBoxMark: BitBoxMark,
                        InspectStatu: InspectStatus,
                        StartTime: StartTime,
                        EndTime: EndTime,
                    }
                    sendData(IP + "/Statistical/GetBoxInfo", param, 'get', function (res) {
                        if (res.code == 0) //成功
                        {
                            var list = res.data;
                            $.extend(infoOptions2, {
                                data: list
                            });
                            infoOptions2.page = {
                                curr: 1
                            }
                            tableIns2 = table.render(infoOptions2);
                        }
                        else //不成功
                        {
                            layer.msg('获取明细列表信息失败!', {
                                icon: 2,
                                time: 2000 //2秒关闭(如果不配置,默认是3秒)
                            }, function () { });
                        }
                    })
                });
                //#endregion
            }
            //var url = IP + "/Statistical/GetInventoryList1";
            //接受全局变量
            let quanid = '';
            //监听搜索
            form.on('submit(LAY-app-contlist-search)', function (data) {
                var SkuNo = $("#SkuNo").val();
                var SkuName = $("#SkuName").val();
                var LotNo = $("#LotNo").val();
                var PalletNo = $("#PalletNo").val();
                var BoxNo = $("#BoxNo").val();
                var Status = $("#Status").val();
                var InspectMark = $("#InspectMark").val();
                var BitPalletMark = $("#BitPalletMark").val();
                var BitBoxMark = $("#BitBoxMark").val();
                var InspectStatus = $("#InspectStatus").val();
                var OwnerNo = $("#OwnerNo").val();
                var OwnerName = $("#OwnerName").val();
                var StartTime = $("#StartTime").val();
                var EndTime = $("#EndTime").val();
                if (yemianid == 0) {
                    console.log("总单");
                    refreshTable(SkuNo, SkuName, PalletNo, LotNo, BoxNo, Status, InspectMark, BitPalletMark, BitBoxMark, InspectStatus, OwnerNo, OwnerName, StartTime, EndTime);
                } else if (yemianid == 1) {
                    quanid = '';
                    console.log("明细");
                    refreshTable2(quanid, SkuNo, SkuName, LotNo, PalletNo, BoxNo, Status, InspectMark, BitBoxMark, InspectStatus, StartTime, EndTime);
                }
            });
            //触发行双击事件
            table.on('rowDouble(LAY-app-content-list)', function (obj) {
                $(".layui-tab-title>li").attr("class", "");
                $('.layui-tab-title>li').eq(1).attr('class', 'layui-this');
                $('.layui-tab-content .layui-tab-item').attr('class', 'layui-tab-item')
                $('.layui-tab-content .layui-tab-item').eq(1).attr('class', 'layui-tab-item layui-show')
                console.log(obj.data.Id);
                quanid = obj.data.Id;
                refreshTable2(obj.data.Id);
                yemianid = 1;
            });
            //监听Tab切换,以改变地址hash值
            element.on('tab(docDemoTabBrief)', function (data) {
                var SkuNo = $("#SkuNo").val();
                var SkuName = $("#SkuName").val();
                var LotNo = $("#LotNo").val();
                var PalletNo = $("#PalletNo").val();
                var BoxNo = $("#BoxNo").val();
                var Status = $("#Status").val();
                var InspectMark = $("#InspectMark").val();
                var BitPalletMark = $("#BitPalletMark").val();
                var BitBoxMark = $("#BitBoxMark").val();
                var InspectStatus = $("#InspectStatus").val();
                var OwnerNo = $("#OwnerNo").val();
                var OwnerName = $("#OwnerName").val();
                var StartTime = $("#StartTime").val();
                var EndTime = $("#EndTime").val();
                console.log(data.index);
                yemianid = data.index
                if (yemianid == 0) {
                    console.log("总单");
                    refreshTable(SkuNo, SkuName, PalletNo, LotNo, BoxNo, Status, InspectMark, BitPalletMark, BitBoxMark, InspectStatus, OwnerNo, OwnerName, StartTime, EndTime);
                } else if (yemianid == 1) {
                    console.log("明细");
                    refreshTable2(quanid, SkuNo, SkuName, LotNo, PalletNo, BoxNo, Status, InspectMark, BitBoxMark, InspectStatus, StartTime, EndTime);
                }
            });
            var doing = true;
            // ------------------------------------详情---------------------------------------------------
            table.on('tool(LAY-app-content-list2)', function (obj) {
                console.log(obj)
                var data = obj.data;
                //详情
                if (obj.event === 'edit') {
                    BoxNo = data.BoxNo;
                    console.log(data)
                    layer.open({
                        type: 2,
                        title: '箱支详情信息',
                        content: 'BoxSupportInfor.html?BoxNo=' + BoxNo,
                        maxmin: true,
                        area: ['80%', '85%'],
                        btn: ['关闭'],
                        yes: function (index, layero) {
                            var iframeWindow = window['layui-layer-iframe' + index],
                                submitID = 'layuiadmin-app-form-edit',
                                submit = layero.find('iframe').contents().find('#' + submitID);
                            if (doing) {
                                doing = false;
                                layer.close(index); //关闭弹层
                                refreshTable();
                                doing = true;
                            }
                        }
                    });
                }
            });
            form.on('submit(daochu)', function () {
                layer.confirm('确定导出当前数据吗?', function (index) {
                    if (yemianid == 0) {
                        console.log("托盘明细");
                        var param = {
                            SkuNo: $("#SkuNo").val(),
                            SkuName: $("#SkuName").val(),
                            LotNo: $("#LotNo").val(),
                            PalletNo: $("#PalletNo").val(),
                            BoxNo: $("#BoxNo").val(),
                            Status: $("#Status").val(),
                            InspectMark: $("#InspectMark").val(),
                            BitPalletMark: $("#BitPalletMark").val(),
                            BitBoxMark: $("#BitBoxMark").val(),
                            InspectStatus: $("#InspectStatus").val(),
                            StartTime: $("#StartTime").val(),
                            EndTime: $("#EndTime").val(),
                        };
                        var param = {
                            SkuNo:SkuNo, //物料号
                            SkuName:SkuName, //物料名称
                            palletNo:PalletNo, //托盘号
                            LotNo:LotNo, //批次号
                            BoxNo:BoxNo, //箱码
                            Status:Status, //箱支状态
                            InspectMark:InspectMark, //检验标记
                            BitPalletMark:BitPalletMark, //零托标记
                            BitBoxMark:BitBoxMark, //零箱标记
                            InspectStatus:InspectStatus, //质量状态
                            OwnerNo:OwnerNo, //货主编码
                            OwnerName:OwnerName, //货主名称
                            StartTime:StartTime, //开始时间
                            EndTime:EndTime, //结束时间
                        };
                        sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) {
                            console.log(res)
                        sendData(IP + "/Statistical/GetBindListDaoChu", param, 'get', function (res) {
                            console.log(res);
                            if (res.code == 0) { //成功
                                var list = res.data;
                                $.extend(infoOptions, {
                                    data: list
                                table.exportFile(tableIns.config.id, list, 'xls', "托盘明细信息" + getNowTime(),); //data 为该实例中的任意数量的数据
                                layer.msg('导出成功!', {
                                    icon: 1,
                                    time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                }, function () {
                                });
                                infoOptions.page = {
                                    curr: 1
                                }
                                tableIns = table.render(infoOptions);
                            }
                            else { //不成功
                                layer.msg('获取总量列表信息失败!', {
                            } else { //不成功
                                layer.msg('获取信息失败!', {
                                    icon: 2,
                                    time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                }, function() {});
                                }, function () { });
                            }
                        });
                    });
                    //#endregion
                }
                // 表单需要的变量
                var infoOptions2;
                //#region 原始非自定义列
                // infoOptions2 = {
                //     elem: '#LAY-app-content-list2',
                //     height: 'full-206',
                //     id: 'LAY-app-content-list2',
                //     page: true,
                //     limit: pageCnt,
                //     limits: pageLimits,
                //     even: true,
                //     cellMinWidth: 80, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                //     cols:
                //     [[
                //         {
                //             title: '序号',  type: 'numbers',  fixed: 'left'
                //         },
                //         {
                //             field: 'SkuNo', title: '物料编码', align: 'center',
                //         },
                //         {
                //             field: 'SkuName', title: '物料名称', align: 'center',
                //         },
                //         {
                //             field: 'PalletNo', title: '托盘号', align: 'center', width: 110,
                //         },
                //         {
                //             field: 'BoxNo', title: '箱码', align: 'center', width: 100,
                //         },
                //         {
                //             field: 'Status', title: '箱支状态', align: 'center', templet: '#BoxStatus',
                //         },
                //         {
                //             field: 'LotNo', title: '批次号', align: 'center',
                //         },
                //         {
                //             field: 'LotText', title: '批次描述', align: 'center',
                //         },
                //         {
                //             field: 'Qty', title: '数量', width: 90, align: 'center',
                //         },
                //         {
                //             field: 'FullQty', title: '整箱数量', width: 100, align: 'center',
                //         },
                //         {
                //             field: 'ProductionTime', title: '生产日期', align: 'center',
                //             templet: function(d) {
                //                 return formatDate(d.ProductionTime);
                //             },
                //         },
                //         {
                //             field: 'InspectMark', title: '抽检标记', align: 'center', templet: '#InspectMarkStatus',
                //         },
                //         {
                //             field: 'BitBoxMark', templet: '#BitPalletMarkStatus1', title: '零箱标记', align: 'center',
                //         },
                //         {
                //             field: 'InspectStatus', templet: '#InspectStatus1', title: '质检状态', align: 'center',
                //         },
                //         {
                //             field: 'InspectTime', title: '复检时间', align: 'center',
                //             templet: function(d) {
                //                 return formatDate(d.InspectTime);
                //             },
                //         },
                //         {
                //             title: '操作', fixed: 'right', align: 'center', toolbar: '#table-content-list'
                //         }
                //     ]]
                // };
                //#endregion
                //获取明细信息
                //#region 自定义表头
                var DetailColsArr = [[
                    {field: '',title: '序号',type:'numbers',fixed: 'left', "disabled": true},
                    {field: 'SkuNo', title: '物料编码', align: 'center'},
                    {field: 'SkuName', title: '物料名称', align: 'center'},
                    {field: 'PalletNo', title: '托盘号', align: 'center', width: 110},
                    {field: 'BoxNo', title: '箱码', align: 'center', width: 100},
                    {field: 'Status', title: '箱支状态', align: 'center', templet: '#BoxStatus'},
                    {field: 'LotNo', title: '批次号', align: 'center'},
                    {field: 'LotText', title: '批次描述', align: 'center'},
                    {field: 'Qty', title: '数量', width: 90, align: 'center'},
                    {field: 'FullQty', title: '整箱数量', width: 100, align: 'center'},
                    {field: 'ProductionTime', title: '生产日期', align: 'center',templet: '#templetProductionTime'},
                    {field: 'InspectMark', title: '抽检标记', align: 'center', templet: '#InspectMarkStatus'},
                    {field: 'BitBoxMark', templet: '#BitPalletMarkStatus1', title: '零箱标记', align: 'center'},
                    {field: 'InspectStatus', templet: '#InspectStatus1', title: '质检状态', align: 'center'},
                    {field: 'InspectTime', title: '复检时间', align: 'center',templet: '#templetInspectTime'},
                    {field: 'caozuo',title: '操作', fixed: 'right', align: 'center', toolbar: '#table-content-list', "disabled": true}
                ]];
                var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//将表头数据进行url编码
                //#endregion
                function refreshTable2(Id,SkuNo,SkuName,LotNo,PalletNo,BoxNo,Status,InspectMark,BitBoxMark,InspectStatus,StartTime,EndTime) {
                    //#region 自定义表头
                    var colsJson2
                    var param1={
                        Href:'Statistical/GetBoxInfo'
                    };
                    sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
                        if (res.code == 0){
                            if(res.data=='' || res.data==undefined || res.data==null){
                                colsJson2=DetailColsArr
                            }else{
                                colsJson2= eval(res.data);
                            }
                        }else{
                                colsJson2=DetailColsArr
                        }
                        infoOptions2 = {
                            elem: '#LAY-app-content-list2',
                            height: h1,
                            id: 'LAY-app-content-list2',
                            page: true,
                            limit: pageCnt,
                            limits: pageLimits,
                            even: true,
                            cellMinWidth: 80, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                            done: function(){
                                //自定义列宽
                                SetTableColW('LAY-app-content-list2','Statistical/GetBoxInfo',DetailColsSysArr);
                            },
                            cols:colsJson2
                        };
                    } else if (yemianid == 1) {
                        console.log("箱码明细");
                        var param = {
                            Id:Id,
                            SkuNo:SkuNo,
                            SkuName:SkuName,
                            LotNo:LotNo,
                            PalletNo:PalletNo,
                            BoxNo:BoxNo,
                            Status:Status,
                            InspectMark:InspectMark,
                            BitBoxMark:BitBoxMark,
                            InspectStatu:InspectStatus,
                            StartTime:StartTime,
                            EndTime:EndTime,
                        }
                        sendData(IP + "/Statistical/GetBoxInfo", param, 'get', function(res) {
                            if (res.code == 0) //成功
                            {
                            Id: quanid,
                            SkuNo: $("#SkuNo").val(),
                            SkuName: $("#SkuName").val(),
                            LotNo: $("#LotNo").val(),
                            LocatNo: $("#LocatNo").val(),
                            PalletNo: $("#PalletNo").val(),
                            Status: $("#Status").val(),
                            InspectStatus: $("#InspectStatus").val(),
                            IsSamolingTray: $("#IsSamolingTray").val(),
                            StartTime: $("#StartTime").val(),
                            EndTime: $("#EndTime").val(),
                        };
                        sendData(IP + "/Statistical/GetBoxInfoDaoChu", param, 'get', function (res) {
                            console.log(res);
                            if (res.code == 0) { //成功
                                var list = res.data;
                                $.extend(infoOptions2, {
                                    data: list
                                table.exportFile(tableIns2.config.id, list, 'xls', "箱码明细信息" + getNowTime(),); //data 为该实例中的任意数量的数据
                                layer.msg('导出成功!', {
                                    icon: 1,
                                    time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                }, function () {
                                });
                                infoOptions2.page = {
                                    curr: 1
                                }
                                tableIns2 = table.render(infoOptions2);
                            }
                            else //不成功
                            {
                                layer.msg('获取明细列表信息失败!', {
                            } else { //不成功
                                layer.msg('获取信息失败!', {
                                    icon: 2,
                                    time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                }, function() {});
                            }
                        })
                    });
                    //#endregion
                }
                //var url = IP + "/Statistical/GetInventoryList1";
                //接受全局变量
                let quanid = '';
                //监听搜索
                form.on('submit(LAY-app-contlist-search)', function(data) {
                    var SkuNo = $("#SkuNo").val();
                    var SkuName = $("#SkuName").val();
                    var LotNo = $("#LotNo").val();
                    var PalletNo = $("#PalletNo").val();
                    var BoxNo = $("#BoxNo").val();
                    var Status = $("#Status").val();
                    var InspectMark = $("#InspectMark").val();
                    var BitPalletMark = $("#BitPalletMark").val();
                    var BitBoxMark = $("#BitBoxMark").val();
                    var InspectStatus = $("#InspectStatus").val();
                    var OwnerNo = $("#OwnerNo").val();
                    var OwnerName = $("#OwnerName").val();
                    var StartTime = $("#StartTime").val();
                    var EndTime = $("#EndTime").val();
                    if(yemianid == 0){
                        console.log("总单");
                        refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName,StartTime,EndTime);
                    }else if(yemianid == 1){
                        quanid = '';
                        console.log("明细");
                        refreshTable2(quanid,SkuNo,SkuName,LotNo,PalletNo,BoxNo,Status,InspectMark,BitBoxMark,InspectStatus,StartTime,EndTime);
                    }
                });
                //触发行双击事件
                table.on('rowDouble(LAY-app-content-list)', function(obj) {
                    $(".layui-tab-title>li").attr("class", "");
                    $('.layui-tab-title>li').eq(1).attr('class', 'layui-this');
                    $('.layui-tab-content .layui-tab-item').attr('class', 'layui-tab-item')
                    $('.layui-tab-content .layui-tab-item').eq(1).attr('class', 'layui-tab-item layui-show')
                    console.log(obj.data.Id);
                    quanid = obj.data.Id;
                    refreshTable2(obj.data.Id);
                    yemianid=1;
                });
                //监听Tab切换,以改变地址hash值
                element.on('tab(docDemoTabBrief)', function(data){
                    var SkuNo = $("#SkuNo").val();
                    var SkuName = $("#SkuName").val();
                    var LotNo = $("#LotNo").val();
                    var PalletNo = $("#PalletNo").val();
                    var BoxNo = $("#BoxNo").val();
                    var Status = $("#Status").val();
                    var InspectMark = $("#InspectMark").val();
                    var BitPalletMark = $("#BitPalletMark").val();
                    var BitBoxMark = $("#BitBoxMark").val();
                    var InspectStatus = $("#InspectStatus").val();
                    var OwnerNo = $("#OwnerNo").val();
                    var OwnerName = $("#OwnerName").val();
                    var StartTime = $("#StartTime").val();
                    var EndTime = $("#EndTime").val();
                    console.log(data.index);
                    yemianid = data.index
                    if(yemianid == 0){
                        console.log("总单");
                        refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName,StartTime,EndTime);
                    }else if(yemianid == 1){
                        console.log("明细");
                        refreshTable2(quanid,SkuNo,SkuName,LotNo,PalletNo,BoxNo,Status,InspectMark,BitBoxMark,InspectStatus,StartTime,EndTime);
                    }
                });
                var doing = true;
                // ------------------------------------详情---------------------------------------------------
                table.on('tool(LAY-app-content-list2)', function(obj) {
                    console.log(obj)
                    var data = obj.data;
                    //详情
                    if (obj.event === 'edit') {
                        BoxNo = data.BoxNo;
                        console.log(data)
                        layer.open({
                            type: 2,
                            title: '箱支详情信息',
                            content: 'BoxSupportInfor.html?BoxNo=' + BoxNo,
                            maxmin: true,
                            area: ['80%', '85%'],
                            btn: ['关闭'],
                            yes: function(index, layero) {
                                var iframeWindow = window['layui-layer-iframe' + index],
                                    submitID = 'layuiadmin-app-form-edit',
                                    submit = layero.find('iframe').contents().find('#' + submitID);
                                    if(doing)
                                    {
                                        doing = false;
                                        layer.close(index); //关闭弹层
                                        refreshTable();
                                        doing = true;
                                    }
                                }, function () { });
                            }
                        });
                    }
                });
                form.on('submit(daochu)', function () {
                    layer.confirm('确定导出当前数据吗?', function(index) {
                        if(yemianid == 0){
                            console.log("托盘明细");
                            var param = {
                                SkuNo : $("#SkuNo").val(),
                                SkuName : $("#SkuName").val(),
                                LotNo : $("#LotNo").val(),
                                PalletNo : $("#PalletNo").val(),
                                BoxNo : $("#BoxNo").val(),
                                Status : $("#Status").val(),
                                InspectMark : $("#InspectMark").val(),
                                BitPalletMark : $("#BitPalletMark").val(),
                                BitBoxMark : $("#BitBoxMark").val(),
                                InspectStatus : $("#InspectStatus").val(),
                                StartTime: $("#StartTime").val(),
                                EndTime: $("#EndTime").val(),
                            };
                            sendData(IP + "/Statistical/GetBindListDaoChu", param, 'get', function (res) {
                                console.log(res);
                                if (res.code == 0) { //成功
                                    var list = res.data;
                                    table.exportFile(tableIns.config.id, list,'xls',"托盘明细信息"+getNowTime(),); //data 为该实例中的任意数量的数据
                                    layer.msg('导出成功!', {
                                        icon: 1,
                                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                    }, function () {
                                    });
                                } else { //不成功
                                    layer.msg('获取信息失败!', {
                                        icon: 2,
                                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                    }, function () { });
                                }
                            });
                        }else if(yemianid == 1){
                            console.log("箱码明细");
                            var param = {
                                Id:quanid,
                                SkuNo: $("#SkuNo").val(),
                                SkuName: $("#SkuName").val(),
                                LotNo:$("#LotNo").val(),
                                LocatNo:$("#LocatNo").val(),
                                PalletNo:$("#PalletNo").val(),
                                Status:$("#Status").val(),
                                InspectStatus:$("#InspectStatus").val(),
                                IsSamolingTray:$("#IsSamolingTray").val(),
                                StartTime: $("#StartTime").val(),
                                EndTime: $("#EndTime").val(),
                            };
                            sendData(IP + "/Statistical/GetBoxInfoDaoChu", param, 'get', function (res) {
                                console.log(res);
                                if (res.code == 0) { //成功
                                    var list = res.data;
                                    table.exportFile(tableIns2.config.id, list,'xls',"箱码明细信息"+getNowTime(),); //data 为该实例中的任意数量的数据
                                    layer.msg('导出成功!', {
                                        icon: 1,
                                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                    }, function () {
                                    });
                                } else { //不成功
                                    layer.msg('获取信息失败!', {
                                        icon: 2,
                                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                    }, function () { });
                                }
                            });
                        }
                    });
                });
                //#region 自定义表头
                //自定义表头
                active = {
                    customCols: function(){
                        layer.open({
                            type: 2,
                            title: '自定义列',
                            content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetBindList&ColsSysArr='+TotalColsSysArr,
                            maxmin: false,
                            resize: false,
                            area: ['970px', '650px']
                        });
                    },
                    customCols2: function(){
                        layer.open({
                            type: 2,
                            title: '自定义列',
                            content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetBoxInfo&ColsSysArr='+DetailColsSysArr,
                            maxmin: false,
                            resize: false,
                            area: ['970px', '650px']
                        });
                    }
                };
                $('.layui-btn').on('click', function() {
                    var type = $(this).data('type');
                    active[type] ? active[type].call(this) : '';
                });
                //#endregion
            });
        </script>
    </body>
</html>
            //#region 自定义表头
            //自定义表头
            active = {
                customCols: function () {
                    layer.open({
                        type: 2,
                        title: '自定义列',
                        content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetBindList&ColsSysArr=' + TotalColsSysArr,
                        maxmin: false,
                        resize: false,
                        area: ['970px', '650px']
                    });
                },
                customCols2: function () {
                    layer.open({
                        type: 2,
                        title: '自定义列',
                        content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetBoxInfo&ColsSysArr=' + DetailColsSysArr,
                        maxmin: false,
                        resize: false,
                        area: ['970px', '650px']
                    });
                }
            };
            $('.layui-btn').on('click', function () {
                var type = $(this).data('type');
                active[type] ? active[type].call(this) : '';
            });
            //#endregion
        });
    </script>
</body>
</html>
Pda/View/SoSetting/SampleOut2.html
@@ -157,7 +157,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">取样出库</td>
                    <td class="title-text">取样拣货</td>
                    <td class="title-menu-icon"><img id="menuImg" src="/assets/menu.jpg"></td>
                </tr>
            </table>
@@ -193,32 +193,32 @@
                                    <img src="/assets/down_arraw.png">
                                </div>
                            </div>
                            <div id="" class="layout-tab-page">
                                <table class="tbl-box-sim-info" cellspacing="" cellpadding="">
                                    <tr>
                                        <td colspan="3">
                                        <td colspan="3">
                                            <div class="layui-form-item">
                                                <label class="layui-form-label" style="width: 20%;">物料:</label>
                                                <div class="layui-input-block" style="width: 80%;margin-left:20%;">
                                                    <input id="sku" type="text" lay-verify="" disabled
                                                        placeholder="" class="layui-input">
                                                    <input id="sku" type="text" lay-verify="" disabled placeholder=""
                                                        class="layui-input">
                                                </div>
                                            </div>
                                        </td>
                                    </tr>
                                    <tr>
                                        <td colspan="3">
                                    </tr>
                                    <tr>
                                        <td colspan="3">
                                            <div class="layui-form-item">
                                                <label class="layui-form-label" style="width: 20%;">批次号</label>
                                                <div class="layui-input-block" style="width: 80%;margin-left:20%;">
                                                    <input id="lotNo" type="text" lay-verify="" disabled
                                                        placeholder="" class="layui-input">
                                                    <input id="lotNo" type="text" lay-verify="" disabled placeholder=""
                                                        class="layui-input">
                                                </div>
                                            </div>
                                        </td>
                                    </tr>
                                    <tr>
                                    </tr>
                                    <tr>
                                        <td>
                                            <div class="layui-form-item">
                                                <label class="layui-form-label" style="width: 50%;">计划数量:</label>
@@ -239,11 +239,11 @@
                                        </td>
                                    </tr>
                                </table>
                            </div>
                        </div>
                        <div id="layout-pallet" class="layui-form-item layout-input">
                            <label class="layui-form-label lableWidth">托盘条码:</label>
                            <div class="layui-input-block">
@@ -280,11 +280,11 @@
                                    <td>
                                        <div class="layui-form-item layout-input" style="margin-top: 6px;">
                                            <label class="layui-form-label lableWidth">拣货数量:</label>
                                            <div class="layui-input-block">
                                            <div class="layui-input-block">
                                                <input id="pickQty1" type="text" placeholder="请输入拣货数量"
                                                    autocomplete="off" class="layui-input"
                                                    oninput="value=value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')"
                                                     onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')">
                                                    onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')">
                                            </div>
                                        </div>
                                    </td>
@@ -313,7 +313,7 @@
                    </form>
                </div>
            </div>
            <!-- 无码 -->
            <div id="content2">
@@ -330,31 +330,31 @@
                                    <img src="/assets/down_arraw.png">
                                </div>
                            </div>
                            <div id="" class="layout-tab-page">
                                <table class="tbl-box-sim-info" cellspacing="" cellpadding="">
                                    <tr>
                                        <td colspan="3">
                                        <td colspan="3">
                                            <div class="layui-form-item">
                                                <label class="layui-form-label" style="width: 20%;">物料:</label>
                                                <div class="layui-input-block" style="width: 80%;margin-left:20%;">
                                                    <input id="sku2" type="text" lay-verify="" disabled
                                                        placeholder="" class="layui-input">
                                                    <input id="sku2" type="text" lay-verify="" disabled placeholder=""
                                                        class="layui-input">
                                                </div>
                                            </div>
                                        </td>
                                    </tr>
                                    <tr>
                                        <td colspan="3">
                                    </tr>
                                    <tr>
                                        <td colspan="3">
                                            <div class="layui-form-item">
                                                <label class="layui-form-label" style="width: 20%;">批次号</label>
                                                <div class="layui-input-block" style="width: 80%;margin-left:20%;">
                                                    <input id="lotNo2" type="text" lay-verify="" disabled
                                                        placeholder="" class="layui-input">
                                                    <input id="lotNo2" type="text" lay-verify="" disabled placeholder=""
                                                        class="layui-input">
                                                </div>
                                            </div>
                                        </td>
                                    </tr>
                                    </tr>
                                    <tr>
                                        <td>
                                            <div class="layui-form-item">
@@ -376,11 +376,11 @@
                                        </td>
                                    </tr>
                                </table>
                            </div>
                        </div>
                        <div id="layout-pallet" class="layui-form-item layout-input">
                            <label class="layui-form-label lableWidth">托盘条码:</label>
                            <div class="layui-input-block">
@@ -388,7 +388,7 @@
                                    autocomplete="off" class="layui-input" style="height:24px">
                            </div>
                        </div>
                        <div id="" class="layout-tab-page">
                            <table class="layout-tab-content">
@@ -402,7 +402,7 @@
                                                        autocomplete="off" class="layui-input"
                                                        style="padding-left:0.1rem;"
                                                        oninput="value=value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')"
                                                         onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')">
                                                        onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')">
                                                </div>
                                            </div>
                                            <div id="" class="local-ok">
@@ -441,7 +441,7 @@
            /* 标签切换代码 */
            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();
@@ -469,14 +469,14 @@
                });
            });
            var canPickBox = true
            $("#palletNo").focus();//光标默认选中        
            function clear2() {
                $("#sku").val("")//物料
                $("#lotNo").val("") //批次
                $("#lotNo").val("") //批次
            }
            function clear3() {
                $("#planQty").val("");  //计划数量
@@ -497,8 +497,8 @@
                }
                checkPalletState()
            })
            updateBillList();
            updateBillList();
            //检查托盘状态
            function checkPalletState() {
@@ -516,7 +516,7 @@
                                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                    }, function () { });
                                }
                            } else { //不成功
                                layer.msg(res.msg, {
                                    icon: 2,
@@ -535,7 +535,7 @@
            //下拉请验单据选中后事件
            form.on('select(getbar)', function (data) {
                if ($('#bar').val() == "") {
                    clear2();
                    clear3();
@@ -543,17 +543,17 @@
                }
                updateInspectionInfo();
            });
            //初始化渲染 请验单
            function updateBillList() {
                var bar = $("#bar").val();
                var bar = $("#bar").val();
                $("#bar").empty()
                $("#bar").append('<option value =>' + '</option>');
                form.render('select');
                synData(IP + "/PdaSo/GetInspectionNo", {}, 'get', function (res) {
                    if (res.code == 0) { //成功
                        for (var i = 0; i < res.data.length; i++) {
                            if (bar == res.data[i]) {
                                $("#bar").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
@@ -575,16 +575,16 @@
            //初始化渲染 请验单的信息 物料-批次、数量等
            function updateInspectionInfo() {
                clear2();
                clear3();
                clear3();
                var param = {
                    qcNo: $("#bar").val(),
                };
                synData(IP + "/PdaSo/GetInspectionRequestInfo", param, 'get', function (res) {
                    if (res.code == 0) { //成功
                        console.log(res.data);
                        $("#sku").val(res.data.Sku)
                        $("#lotNo").val(res.data.LotNo)
                        $("#planQty").val(res.data.Qty)
                        console.log(res.data);
                        $("#sku").val(res.data.Sku)
                        $("#lotNo").val(res.data.LotNo)
                        $("#planQty").val(res.data.Qty)
                        $("#finishQty").val(res.data.SamplingQty)
                    } else { //不成功
                        layer.msg(res.msg, {
@@ -597,7 +597,7 @@
            //单拣货(确认按钮)
            form.on('submit(formPickScatter)', function (data) {
                if (canPickBox == false) {
                    layer.msg("请求未完成,不要重复请求", {
@@ -606,7 +606,7 @@
                    });
                    return;
                }
                if ($('#bar').val() == "") {
                    layer.msg("请选择请验单", {
                        icon: 2,
@@ -619,14 +619,14 @@
                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                    }); return;
                }
                if ($('#boxNo').val() == "") {
                    layer.msg("请输入箱码", {
                        icon: 2,
                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                    }); return;
                }
                }
                reqPickScatter()
                return false; //阻止表单跳转。如果需要表单跳转,去掉这段即可。
@@ -641,7 +641,7 @@
                    "BoxNo": $('#boxNo').val(),
                    "BoxNo3": $('#boxNo3').val(),
                    "PickQty": $('#pickQty1').val(),
                }
                sendData(IP + "/PdaSo/SampleSetPick", param, 'post', function (res) {
@@ -651,14 +651,14 @@
                            icon: 1,
                            time: 2000 //2秒关闭(如果不配置,默认是3秒)
                        }, function () {
                            canPickBox = true//回调
                            // $("#boxNo").val('');
                            $("#boxNo3").val('');
                            $("#pickQty1").val('');
                            updateInspectionInfo();
                        });
                    } else { //不成功
                        layer.msg(res.msg, {
@@ -693,7 +693,7 @@
            function clear22() {
                //物料批次
                $("#sku2").val("")//物料
                $("#lotNo2").val("") //批次
                $("#lotNo2").val("") //批次
            }
            function clear23() {
                $("#planQty2").val("");  //计划数量
@@ -710,7 +710,7 @@
                }
                checkPalletState2()
            })
            //检查托盘状态
            function checkPalletState2() {
                var param = {
@@ -727,7 +727,7 @@
                                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                    }, function () { });
                                }
                            } else { //不成功
                                layer.msg(res.msg, {
                                    icon: 2,
@@ -743,11 +743,11 @@
                    }
                });
            }
            //下拉请验单据选中后事件
            form.on('select(getbar2)', function (data) {
                if ($('#bar2').val() == "") {
                    clear22();
                    clear23();
@@ -755,8 +755,8 @@
                }
                updateInspectionInfo2();
            });
            //初始化渲染 请验单
            function updateBillList2() {
                $("#bar2").empty()
@@ -765,7 +765,7 @@
                synData(IP + "/PdaSo/GetInspectionNo", {}, 'get', function (res) {
                    if (res.code == 0) { //成功
                        for (var i = 0; i < res.data.length; i++) {
                            if (bar == res.data[i]) {
                                $("#bar2").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
@@ -787,16 +787,16 @@
            //初始化渲染 物料-批次
            function updateInspectionInfo2() {
                clear22();
                clear23();
                clear23();
                var param = {
                    qcNo: $("#bar2").val(),
                };
                synData(IP + "/PdaSo/GetInspectionRequestInfo", param, 'get', function (res) {
                    if (res.code == 0) { //成功
                        console.log(res.data);
                        $("#sku2").val(res.data.Sku)
                        $("#lotNo2").val(res.data.LotNo)
                        $("#planQty2").val(res.data.Qty)
                        console.log(res.data);
                        $("#sku2").val(res.data.Sku)
                        $("#lotNo2").val(res.data.LotNo)
                        $("#planQty2").val(res.data.Qty)
                        $("#finishQty2").val(res.data.SamplingQty)
                    } else { //不成功
                        layer.msg(res.msg, {
@@ -823,7 +823,7 @@
                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                    }); return;
                }
                if ($('#palletNo2').val() == "") {
                    layer.msg("请输入托盘码", {
                        icon: 2,
@@ -838,8 +838,8 @@
                    });
                    return;
                }
                reqPickScatter2()
@@ -865,7 +865,7 @@
                        }, function () {
                            canPickBox = true//回调
                            $("#pickQty2").val('');
                            updateInspectionInfo2();
                        });
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -892,7 +892,7 @@
                #endregion
                #region 地码信息(储位信息)
                var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo && w.Status == "0" && w.WareHouseNo == "W02");
                var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo && w.Status == "0");
                if (storageLocat == null)
                {
                    strMsg = "-1:储位信息不存在或非空闲状态,请核查!";
@@ -4582,6 +4582,18 @@
            var bindId = 0;
            if (bind == null)
            {
                DateTime? pTime = null;
                DateTime? eTime = null;
                if (!string.IsNullOrWhiteSpace(detail.Lot1))
                {
                    pTime = DateTime.Parse(detail.Lot1);
                }
                if (!string.IsNullOrWhiteSpace(detail.Lot2))
                {
                    eTime = DateTime.Parse(detail.Lot2);
                }
                bind = new BllPalletBind
                {
                    ASNNo = model.AsnNo,
@@ -4597,6 +4609,8 @@
                    SupplierLot = detail.SupplierLot,
                    //InspectMark = model.IsSample,      //是否取样托盘  后期业务开发时 接口传值需添加对应字段判断
                    //SamplingQty = 0,     //取样数量  后期业务开发时 接口传值需添加对应字段判断
                    ProductionTime = pTime,
                    ExpirationTime = eTime,
                    BitPalletMark = "1",
                    IsBale = "0",
                    IsBelt = "0",
@@ -4652,6 +4666,12 @@
            }
            else
            {
                string inspectStatusStr = "0";
                if (sku.IsInspect == "1")
                {
                    inspectStatusStr = "1";
                }
                // 库存不存在 插入数据
                sd1 = new DataStockDetail()
                {
@@ -4680,7 +4700,7 @@
                    ExpirationTime = bind.ExpirationTime,
                    Status = "0",
                    InspectMark = bind.InspectMark,
                    InspectStatus = sku.IsInspect,
                    InspectStatus = inspectStatusStr,
                    BitPalletMark = bind.BitPalletMark,
                    PackagNo = detail.PackagNo,                    //liudl 由sku的包装编号变为入库单明细的包装编码       
                    IsBale = bind.IsBale,
@@ -4870,9 +4890,6 @@
            sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{model.AsnNo}','组盘','0',getDate(),{userId},NULL,NULL);";
            Db.Ado.ExecuteCommand(sqlStr);
            new OperationASNServer().AddLogOperationAsn("PDA模块", "托盘绑定", model.AsnNo, "添加", $"添加了托盘码为:{model.PalletNo}的组盘信息", userId);
        }
        #endregion
@@ -4922,7 +4939,7 @@
                #endregion
                #region 地码信息(储位信息)
                var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo && w.Status == "0" && w.WareHouseNo == "W02");
                var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo && w.Status == "0");
                if (storageLocat == null)
                {
                    throw new Exception("储位信息不存在或非空闲状态,请核查!");
@@ -5262,11 +5279,13 @@
                    //修改库存明细信息
                    foreach (var item in stockDetail)
                    {
                        item.Status = "0"; //状态更改为待分配
                        item.WareHouseNo = "W02"; //所属仓库
                        item.LocatNo = model.LocatNo;//储位地址
                        item.UpdateTime = serverTime; //修改时间
                        item.UpdateUser = model.CreateUser; //修改人
                        item.Status = "0";                                  // 状态更改为待分配
                        item.WareHouseNo = storageLocat.WareHouseNo;        // 所属仓库
                        item.RoadwayNo = storageLocat.RoadwayNo;            // 所属巷道
                        item.AreaNo = storageLocat.AreaNo;                  // 所属区域
                        item.LocatNo = model.LocatNo;                       // 储位地址
                        item.UpdateTime = serverTime;                       // 修改时间
                        item.UpdateUser = model.CreateUser;                 // 修改人
                        //修改库存明细信息                                           
                        Db.Updateable(item).ExecuteCommand();
                    }
@@ -5304,15 +5323,17 @@
                    };
                    Db.Insertable(exTask).ExecuteCommand();
                    //托盘绑定信息
                    var bindInfo = Db.Queryable<BllPalletBind>().First(w => w.IsDel == "0" && w.PalletNo == model.PalletNo && w.Status == "2" && string.IsNullOrEmpty(w.LocatNo));
                    var bindInfo = Db.Queryable<BllPalletBind>().First(w => w.IsDel == "0" && w.PalletNo == model.PalletNo
                    && w.Status == "2" && string.IsNullOrEmpty(w.LocatNo));
                    if (bindInfo != null)
                    {
                        bindInfo.WareHouseNo = "W02";//所属仓库
                        bindInfo.LocatNo = model.LocatNo;//储位地址
                        bindInfo.WareHouseNo = storageLocat.WareHouseNo;            // 所属仓库
                        bindInfo.RoadwayNo = storageLocat.RoadwayNo;                // 所属巷道
                        bindInfo.LocatNo = model.LocatNo;                           // 储位地址
                        bindInfo.UpdateTime = serverTime;
                        bindInfo.UpdateUser = model.CreateUser;
                        bindInfo.CompleteTime = serverTime; //完成时间
                        bindInfo.TaskNo = taskNo; //任务号
                        bindInfo.CompleteTime = serverTime;                         // 完成时间
                        bindInfo.TaskNo = taskNo;                                   // 任务号
                        Db.Updateable(bindInfo).ExecuteCommand();
                    }
                    #endregion
@@ -5344,7 +5365,8 @@
                //修改储位信息                                        
                Db.Updateable(storageLocat).ExecuteCommand();
                new OperationASNServer().AddLogOperationAsn("PDA模块", "平库入库", model.PalletNo, "完成", $"在PDA上完成单据号为:{model.ASNNo}的托盘码为:{model.PalletNo}的平库入库操作", (int)model.CreateUser);
                new OperationASNServer().AddLogOperationAsn("PDA模块", "平库入库", model.PalletNo, "完成",
                    $"在PDA上完成单据号为:{model.ASNNo}的托盘码为:{model.PalletNo}的平库入库操作", (int)model.CreateUser);
                Db.CommitTran();
            }
            catch (Exception ex)
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -960,6 +960,7 @@
            catch (Exception e)
            {
                Db.RollbackTran();
                throw e;
            }
        }
@@ -1328,6 +1329,7 @@
            catch (Exception e)
            {
                Db.RollbackTran();
                throw e;
            }
        }
@@ -1385,7 +1387,8 @@
        }
        //取样出库拣货(标签)
        public async Task SampleSoSetPick(string soType, string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string pickQty1, string asnNo, int userId)
        public async Task SampleSoSetPick(string soType, string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3,
            string pickQty1, string asnNo, int userId)
        {
            Db.BeginTran();
            try
@@ -2025,6 +2028,7 @@
            catch (Exception e)
            {
                Db.RollbackTran();
                throw e;
            }
        }
@@ -2497,6 +2501,7 @@
            catch (Exception e)
            {
                Db.RollbackTran();
                throw e;
            }
        }
@@ -3032,6 +3037,7 @@
            catch (Exception e)
            {
                Db.RollbackTran();
                throw e;
            }
        }
        /// <summary>
@@ -3345,6 +3351,7 @@
            catch (Exception e)
            {
                Db.RollbackTran();
                throw e;
            }
        }
        #endregion
@@ -3389,7 +3396,7 @@
            var samplingQty = await Db.Queryable<BllSamplingDetails>().Where(m => m.IsDel == "0" && m.QcNo == qcNo).SumAsync(m => m.CompleteQty);
            data.QcNo = qcNo;
            data.Sku = inspectionRequest.SkuNo;
            data.Sku = inspectionRequest.SkuNo + "-" + inspectionRequest.SkuName;
            data.LotNo = inspectionRequest.LotNo;
            data.Qty = inspectionRequest.SamplingQty.ToString();
            data.SamplingQty = samplingQty == null ? "0" : samplingQty.ToString();
@@ -3855,6 +3862,7 @@
            catch (Exception e)
            {
                Db.RollbackTran();
                throw e;
            }
        }
@@ -3899,14 +3907,20 @@
                    throw Oops.Bah("请验单状态错误,请核实");
                }
                //库存明细信息
                var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNo && m.SkuNo == inspecd.SkuNo && m.LotNo == inspecd.LotNo);
                var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNo
                && m.SkuNo == inspecd.SkuNo && m.LotNo == inspecd.LotNo);
                if (stockDetail == null)
                {
                    throw Oops.Bah("未在库存中查询出当前托盘信息");
                }
                // 判断托盘是否在库内
                if (!string.IsNullOrWhiteSpace(stockDetail.LocatNo))
                {
                    throw Oops.Bah("当前托盘不是库外托盘,请核实");
                    var wareHouseData = await Db.Queryable<SysWareHouse>().FirstAsync(m => m.IsDel == "0" && m.WareHouseNo == stockDetail.WareHouseNo);
                    if (wareHouseData.Type != "2")
                    {
                        throw Oops.Bah("当前托盘不是库外托盘,请核实");
                    }
                }
                //库存总表
                var stock = await Db.Queryable<DataStock>().FirstAsync(m => m.IsDel == "0" && m.SkuNo == inspecd.SkuNo && m.LotNo == inspecd.LotNo);
@@ -4033,8 +4047,6 @@
                await Db.Updateable(inspecd).ExecuteCommandAsync();
                #endregion
                //添加操作日志记录
                var k = new OperationSOServer().AddLogOperationSo("PDA模块", "取样拣货", qcNo, "拣货", $"在PDA上对请验单号为:{qcNo}的托盘码为:{palletNo}的拣货操作", userId);
                Db.CommitTran();
@@ -4042,6 +4054,7 @@
            catch (Exception e)
            {
                Db.RollbackTran();
                throw e;
            }
        }
Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
@@ -31,7 +31,12 @@
        /// <returns></returns>
        public List<BllQualityInspectDto> GetBllQualityList(BllQualityInspect model)
        {
            string str = "select q.Id Id,q.InspectNo InspectNo,q.ASNNo ASNNo,q.LotNo LotNo,q.SupplierLot SupplierLot,q.SkuNo SkuNo,q.SkuName SkuName,q.Standard Standard,q.PassQty PassQty,q.FailQty FailQty,q.Origin Origin,q.InspectTime InspectTime,q.IsOut IsOut,q.Demo Demo,q.IsQualified IsQualified,q.IsDel IsDel,q.CreateTime CreateTime,u.RealName CreateUserName,q.UpdateTime UpdateTime,q.UpdateUser UpdateUserName from BllQualityInspect q left join SysUserInfor u on q.CreateUser = u.id where q.IsDel = @isdel";
            string str = "select q.Id Id,q.InspectNo InspectNo,q.ASNNo ASNNo,q.LotNo LotNo,q.SupplierLot SupplierLot," +
                "q.SkuNo SkuNo,q.SkuName SkuName,q.Standard Standard,q.PassQty PassQty,q.FailQty FailQty,q.Origin Origin," +
                "q.InspectTime InspectTime,q.IsOut IsOut,q.Demo Demo,q.IsQualified IsQualified,q.IsDel IsDel,q.CreateTime " +
                "CreateTime,u.RealName CreateUserName,q.UpdateTime UpdateTime,q.UpdateUser UpdateUserName " +
                "from BllQualityInspect q " +
                "left join SysUserInfor u on q.CreateUser = u.id where q.IsDel = @isdel";
            ////判断入库单号是否为空
            //if (!string.IsNullOrEmpty(model.ASNNo))
@@ -111,23 +116,25 @@
            {
                throw new Exception("批次号不可为空,请核查!");
            }
            //int isTui = 0;
            //验证入库单号是否为空
            if (!string.IsNullOrEmpty(model.ASNNo))
            if (string.IsNullOrEmpty(model.ASNNo))
            {
                //查询是否为退货入库单据
                var Arrival = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.Type == "3");
                if (Arrival == null)
                {
                    throw new Exception("只有入库单据为退货入库单可输入 入库单号,请核查!");
                }
                throw new Exception("入库单号不可为空!");
                //获取入库单明细
                var ArrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.LotNo.Contains(model.LotNo) && a.SkuNo == model.SkuNo);
                if (ArrivalDetail == null)
                {
                    throw new Exception("输入的批次或物料信息与入库单据不符,请核查!");
                }
                //查询是否为退货入库单据
                //var Arrival = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.Type == "3");
                //if (Arrival == null)
                //{
                //    throw new Exception("只有入库单据为退货入库单可输入 入库单号,请核查!");
                //}
                ////获取入库单明细
                //var ArrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.LotNo.Contains(model.LotNo) && a.SkuNo == model.SkuNo);
                //if (ArrivalDetail == null)
                //{
                //    throw new Exception("输入的批次或物料信息与入库单据不符,请核查!");
                //}
                //isTui = 1;
            }
@@ -148,7 +155,13 @@
            //}
            ////查找同批次 同单据 入库单信息、
            //BllArrivalNoticeDetail arrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.ASNNo == model.ASNNo && m.LotNo == model.LotNo);
            BllArrivalNoticeDetail arrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0"
            && m.ASNNo == model.ASNNo && m.LotNo == model.LotNo && m.SkuNo == model.SkuNo);
            if (arrivalDetail == null)
            {
                throw new Exception("未找到入库单信息!");
            }
            arrivalDetail.InspectStatus = model.IsQualified;
            model.Origin = "WMS"; //来源
            model.CreateTime = Db.GetDate(); //创建日期
@@ -171,24 +184,19 @@
                    model.PassQty += item.Qty;
                    //修改库存明细合格状态
                    item.InspectStatus = "1"; //1合格
                    //foreach (var b1 in box)
                    //{
                    //    b1.InspectMark = "1"; //1合格
                    //}
                }
                else //不合格
                {
                    //不合格 相同批次、入库单库存信息全部改为不合格物料 且不合格数量增加为同批次同单号该物料全部数量之和
                    model.FailQty += item.Qty;
                    item.InspectStatus = "2"; //2不合格
                    //foreach (var b1 in box)
                    //{
                    //    b1.InspectMark = "2"; //2不合格
                    //}
                }
                Db.Updateable(box).ExecuteCommand();
                Db.Updateable(item).ExecuteCommand();
            }
            Db.Updateable(arrivalDetail).ExecuteCommand();
            var isquality = Db.Insertable(model).ExecuteCommand();
            return isquality;
Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
@@ -34,9 +34,11 @@
        /// <param name="bitBoxMark">零箱标记</param>
        /// <param name="inspectStatus">质量状态</param>
        /// <returns></returns>
        public List<DataBoxInfo> GetDataBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus)
        public List<DataBoxInfo> GetDataBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
            string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus)
        {
            string str = "select PalletNo,PalletNo2,PalletNo3,BoxNo,BoxNo2,BoxNo3,Status,LotNo,Qty,FullQty,SkuNo,SkuName,LotText,ProductionTime,InspectMark,BitBoxMark,InspectStatus,InspectTime from DataBoxInfo Where IsDel = @isdel";
            string str = "select PalletNo,PalletNo2,PalletNo3,BoxNo,BoxNo2,BoxNo3,Status,LotNo,Qty,FullQty,SkuNo,SkuName," +
                "LotText,ProductionTime,InspectMark,BitBoxMark,InspectStatus,InspectTime from DataBoxInfo Where IsDel = @isdel";
            //判断id是否为空
            if (!string.IsNullOrEmpty(id))
            {
Wms/WMS.BLL/DataServer/StockDetailServer.cs
@@ -37,9 +37,16 @@
        /// <param name="bitBoxMark">零箱标记</param>
        /// <param name="inspectStatus">质量状态</param>
        /// <returns></returns>
        public List<StockDetailDto> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTime)
        public List<StockDetailDto> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status,
            string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTime)
        {
            string str = "select detail.*,house.WareHouseNo + '-' + house.WareHouseName as WareHouseName,roadway.RoadwayNo + '-' + roadway.RoadwayName as RoadwayName,area.AreaNo + '-' + area.AreaName as AreaName from DataStockDetail detail left join SysStorageRoadway roadway on detail.RoadwayNo = roadway.RoadwayNo left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo left join SysStorageArea area on detail.AreaNo = area.AreaNo where detail.IsDel = @isdel";
            string str = "select detail.*,house.WareHouseNo + '-' + house.WareHouseName as WareHouseName,roadway.RoadwayNo + '-' + roadway.RoadwayName as RoadwayName," +
                "area.AreaNo + '-' + area.AreaName as AreaName " +
                "from DataStockDetail detail " +
                "left join SysStorageRoadway roadway on detail.RoadwayNo = roadway.RoadwayNo " +
                "left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo " +
                "left join SysStorageArea area on detail.AreaNo = area.AreaNo " +
                "where detail.IsDel = @isdel";
            //判断物料号是否为空
            if (!string.IsNullOrEmpty(skuNo))
            {
@@ -199,9 +206,11 @@
        /// <param name="bitBoxMark">零箱标记</param>
        /// <param name="inspectStatus">质量状态</param>
        /// <returns></returns>
        public List<DataStockDetail> GetBindListDaoChu(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus)
        public List<DataStockDetail> GetBindListDaoChu(string skuNo, string skuName, string palletNo, string lotNo, string boxNo,
            string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus)
        {
            string str = "select Id,LotNo,LotText,SupplierLot,SkuNo,SkuName,Qty,LockQty,FrozenQty,AreaNo,LocatNo,PalletNo,PalletNo2,PalletNo3,InspectMark,BitPalletMark from DataStockDetail where IsDel = @isdel";
            string str = "select Id,LotNo,LotText,SupplierLot,SkuNo,SkuName,Qty,LockQty,FrozenQty,AreaNo,LocatNo,PalletNo,PalletNo2," +
                "PalletNo3,InspectMark,BitPalletMark from DataStockDetail where IsDel = @isdel";
            //判断物料号是否为空
            if (!string.IsNullOrEmpty(skuNo))
            {
Wms/WMS.BLL/DataServer/StockServer.cs
@@ -845,8 +845,6 @@
                throw new Exception(ex.Message);
            }
        }
        #endregion
        #region 导出库存
@@ -939,7 +937,8 @@
        /// <param name="startTime">开始时间</param>
        /// <param name="endTime">结束时间</param>
        /// <returns></returns>
        public List<StockDetailDto> GetInventoryList1DaoChu(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string startTime, string endTime)
        public List<StockDetailDto> GetInventoryList1DaoChu(string skuNo, string skuName, string lotNo, string locatNo,
            string palletNo, string status, string inspectStatus, string startTime, string endTime)
        {
            string str = "select detail.*,house.WareHouseName as WareHouseName,roadway.RoadwayName as RoadwayName  from DataStockDetail detail left join SysStorageRoadway roadway on detail.RoadwayNo = roadway.RoadwayNo left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo Where detail.IsDel = @isdel";
            //判断物料编码是否为空
Wms/Wms/Controllers/StatisticalController.cs
@@ -105,11 +105,13 @@
        /// <param name="inspectStatus">质量状态</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTIme)
        public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status,
            string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTIme)
        {
            try
            {
                List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme);
                List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark,
                    bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme);
                return Ok(new { data = boxInfoList, code = 0, msg = "获取托盘明细成功" });
            }
            catch (Exception e)
@@ -134,7 +136,8 @@
        /// <param name="inspectStatus">质量状态</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus)
        public IActionResult GetBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
            string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus)
        {
            try
            {