HTML/views/home/console2.html

@@ -275,7 +275,7 @@
                            </div>
                        </div>
                    </div>
                    <div style="width: 100%;margin-top: 15%;height: 40%;">
                    <div style="width: 100%;margin-top: 15%;height: 50%;">
                        <div class="layui-card-header">
                            <img src="../../img/console/xiexian.png" style="height: 20px;">
                            库存质量状态分布
@@ -411,22 +411,22 @@
            <!-- 右 -->
            <div class="layui-col-md4" style="height: 100%;margin-top: 10px;">
                <div class="layui-card" style="height: 100%;border-radius: 15px;box-shadow: 0px 0px 10px 1px #a4a3a3;">
                    <div style="width: 100%;height: 33.33%;">
                    <div style="width: 100%;height: 45%;">
                        <div class="layui-card-header">
                            <img src="../../img/console/xiexian.png" style="height: 20px;">
                            近一月热度物料
                        </div>
                        <div class="layui-card-body" style="padding: 0;height: 90%;width: 90%;margin-left: 5%;">
                        <div class="layui-card-body" style="height: 90%;width: 90%;margin-left: 5%;">
                            <table id="LAY-app-content-list" lay-filter="LAY-app-content-list" border="0"
                                cellpadding="0" cellspacing="0"></table>
                        </div>
                    </div>
                    <div style="width: 100%;height: 33.33%;">
                    <div style="width: 100%;height: 45%;">
                        <div class="layui-card-header">
                            <img src="../../img/console/xiexian.png" style="height: 20px;">
                            安全库存预警
                        </div>
                        <div class="layui-card-body" style="padding: 0;height: 90%;width: 90%;margin-left: 5%;">
                        <div class="layui-card-body" style="height: 90%;width: 90%;margin-left: 5%;">
                            <table id="LAY-app-content-list2" lay-filter="LAY-app-content-list2"></table>
                        </div>
                    </div>
@@ -603,20 +603,20 @@
                sendData(IP + "/Statistical/GetQualityStatusFb", param, 'get', function (res) {
                    if (res.code == 0) { //成功
                        //库存质量状态分布(饼状)
                        this.chartYuan = echarts.init(document.getElementById("yuanOrder"));
                        var chartYuan = echarts.init(document.getElementById("yuanOrder"));
                        var option2 = {
                            tooltip: {
                                trigger: 'item'
                            },
                            legend: {
                                top: '5%',
                                top: '0%',
                                left: 'center'
                            },
                            series: [{
                                name: '数量',
                                type: 'pie',
                                radius: ['40%', '75%'],
                                avoidLabelOverlap: false,
                                radius: ['30%', '60%'],
                                avoidLabelOverlap: true,//自动避免重叠
                                itemStyle: {
                                    borderRadius: 10,
                                    borderColor: '#fff',
@@ -625,12 +625,13 @@
                                label: {
                                    show: true, // 显示标签
                                    position: 'outside', // 标签位置在饼图外部
                                    formatter: '{b}: {c} ({d}%)' // 标签格式，显示名称、值和百分比
                                    //formatter: '{b}:{c} ({d}%)' // 标签格式，显示名称、值和百分比
                                    formatter: '{b}:({d}%)' // 标签格式，显示名称、值和百分比
                                },
                                labelLine: {
                                    show: true, // 显示引导线
                                    length: 20, // 第一段引导线的长度
                                    length2: 30 // 第二段引导线的长度
                                    // length: 20, // 第一段引导线的长度
                                    // length2: 30 // 第二段引导线的长度
                                },
                                data: res.data.map(function (item) {
                                    return {
@@ -640,7 +641,7 @@
                                })
                            }]
                        };
                        this.chartYuan.setOption(option2);
                        chartYuan.setOption(option2);
                    }
                    else { //不成功
                        layer.msg('获取总量列表信息失败！', {
@@ -775,7 +776,8 @@
            function refreshTable() {
                infoOptions = {
                    elem: '#LAY-app-content-list',
                    height: 'full-600',
                    //height: 'full-600',
                    height: '270%',
                    id: 'LAY-app-content-list',
                    page: false,
                    limit: pageCnt,
@@ -819,7 +821,8 @@
            function refreshTable2() {
                infoOptions2 = {
                    elem: '#LAY-app-content-list2',
                    height: 'full-600',
                    //height: 'full-600',
                    height: '270%',
                    id: 'LAY-app-content-list2',
                    page: false,
                    limit: pageCnt,
@@ -830,7 +833,7 @@
                        { field: '', title: '序号', type: 'numbers', fixed: 'left', "disabled": true },
                        { field: 'SkuNo', title: '物料编码', align: 'center' },
                        { field: 'SkuName', title: '物料名称', align: 'center' },
                        { title: '批次', field: 'LotNo', align: 'center' },
                        { field: 'LotNo', title: '批次', align: 'center' },
                        { field: 'ResidueQty', title: '剩余数量', align: 'center' },
                    ]]
                };

 Pda/View/SoSetting/ExNoticeOut.html

@@ -87,7 +87,7 @@
                    <div class="layui-form-item layout-dropdownlist" style="margin-top: 10px;">
                        <label class="layui-form-label">物料-批次：</label>
                        <div class="layui-input-block" id="goodDiv">
                            <select id="goodSelect" lay-filter="goodSelect" lay-search>    
                            <select id="goodSelect" lay-filter="goodSelect" lay-search>
                                <option value=""></option>
                            </select>
                            <img src="/assets/down_arraw.png">
@@ -105,7 +105,7 @@
                    <div id="" class="layui-form-item layout-dropdownlist">
                        <label class="layui-form-label" lang>出库楼层：</label>
                        <div class="layui-input-block">
                            <select id="endFloor" lay-filter="endFloor" lay-search>    
                            <select id="endFloor" lay-filter="endFloor" lay-search>
                                <option value=""></option>
                                <option value="1">一楼</option>
                                <option value="2">二楼</option>
@@ -116,7 +116,7 @@
                    <div id="" class="layui-form-item layout-dropdownlist">
                        <label class="layui-form-label" lang>出库地址：</label>
                        <div class="layui-input-block" id="endSelectDiv">
                            <select id="endSelect" lay-filter="endSelect" lay-search>    
                            <select id="endSelect" lay-filter="endSelect" lay-search>
                                <option value=""></option>
                            </select>
                            <img src="/assets/down_arraw.png">
@@ -125,10 +125,10 @@

                </form>
                <div id="" style="text-align: center;">
                    <button class="btn-ok-blue" type="button" lay-submit lay-filter="formBind">确认出库</button> 
                    <button class="btn-ok-blue" type="button" lay-submit lay-filter="formBind">确认出库</button>
                </div>
            </div>
 


        </div>

@@ -149,23 +149,23 @@
                $("#BOXCODE").val("");
            }

            //选中单据事件
            //选中单据事件
            form.on('select(getbar)', function (data) {
                $("#PalletNo").empty()
                $("#PalletNo").append('<option value =>' + '</option>');
                form.render('select');
                $("#PalletNo").append('<option value =>' + '</option>');
                form.render('select');
                if (data.value == "") {
                    return;
                }
                updateGoodList();
				

            });
            //选中单据明细事件
            form.on('select(goodSelect)', function (data) {
				

                $("#PalletNo").empty()
                $("#PalletNo").append('<option value =>' + '</option>');
                form.render('select');
                $("#PalletNo").append('<option value =>' + '</option>');
                form.render('select');
            });
            $("#selectDiv").click(function () {
                var input = $('select[id="bar"]').next().find('.layui-select-title input')
@@ -193,186 +193,187 @@
                var val = input.val()
                $("#bar").empty()
                $("#bar").append('<option value =>' + '</option>');
				
                var param = {
                    Type: "1",
                };
                synData(IP + "/PdaSo/GetRunNoticeList", param,'post', function (res) {
                    //console.log(res);
                    if (res.code == 0) { //成功
                        for (var i = 0; i < res.data.length; i++) {
                            $("#bar").append('<option value =' + res.data[i] + '>' + res.data[i]
                                    +
                                '</option>');
                        }
                        form.render('select');

                        if (!val) {
                            $('#bar').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
                        } else {
                            var sel = 'dd[lay-value=' + val + ']';
                            $('#bar').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
                        }
                var param = {
                    Type: "1",
                };
                synData(IP + "/PdaSo/GetRunNoticeList", param, 'post', function (res) {
                    //console.log(res);
                    if (res.code == 0) { //成功
                        for (var i = 0; i < res.data.length; i++) {
                            $("#bar").append('<option value =' + res.data[i] + '>' + res.data[i]
                                +
                                '</option>');
                        }
                        form.render('select');

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

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

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

            }
 
              /* 物料及批次下拉框 */

            /* 物料及批次下拉框 */
            function updateGoodList(data) {
                var input = $('select[id="goodSelect"]').next().find('.layui-select-title input')
                var val = input.val()
                $("#goodSelect").empty()
                $("#goodSelect").append('<option value =>' + '</option>');

                 var param = {
                    SoNo: $("#bar").val(),
                };
                synData(IP + "/PdaSo/GetSoSkuLotNoListBySo", param, 'post', function (res) {
                        console.log(res);
                        
                    if (res.code == 0) { //成功
                        asnDetails = res.data;
                        
                        for (var i = 0; i < res.data.length; i++) {
                            
                            if (i == 0) {
                                if (res.data[i].LotNo == '' || res.data[i].LotNo == null) {
                                    $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + ' selected>' + res.data[i]
                                        .SkuName +
                                        '</option>');
                                } else {
                                    $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + ' selected>' + res.data[i]
                                        .SkuName + "-" + res.data[i].LotNo +
                                        '</option>');
                                }
                var param = {
                    SoNo: $("#bar").val(),
                };
                synData(IP + "/PdaSo/GetSoSkuLotNoListBySo", param, 'post', function (res) {
                    console.log(res);

                            } else {
                                if (res.data[i].LotNo == '' || res.data[i].LotNo == null) {
                                    $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + '>' + res.data[i]
                                        .SkuName +
                                        '</option>');
                                } else {
                                    $("#goodSelect").append('<option value =' + res.data[i].SoDetailId+ '>' + res.data[i]
                                        .SkuName + "-" + res.data[i].LotNo +
                                        '</option>');
                                }
                            }
                            
                        }
                        form.render('select');
                    if (res.code == 0) { //成功
                        asnDetails = res.data;

                        if (!val) {
                            $('#goodSelect').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
                        } else {
                            var sel = 'dd[lay-value=' + val + ']';
                            //$('#goodSelect').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
                        }
                    }  
                    else {
                         layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                    }
                });
				
                        for (var i = 0; i < res.data.length; i++) {

                            if (i == 0) {
                                if (res.data[i].LotNo == '' || res.data[i].LotNo == null) {
                                    $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + ' selected>' + res.data[i]
                                        .SkuName +
                                        '</option>');
                                } else {
                                    $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + ' selected>' + res.data[i]
                                        .SkuName + "-" + res.data[i].LotNo +
                                        '</option>');
                                }

                            } else {
                                if (res.data[i].LotNo == '' || res.data[i].LotNo == null) {
                                    $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + '>' + res.data[i]
                                        .SkuName +
                                        '</option>');
                                } else {
                                    $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + '>' + res.data[i]
                                        .SkuName + "-" + res.data[i].LotNo +
                                        '</option>');
                                }
                            }

                        }
                        form.render('select');

                        if (!val) {
                            $('#goodSelect').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
                        } else {
                            var sel = 'dd[lay-value=' + val + ']';
                            //$('#goodSelect').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
                        }
                    }
                    else {
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                    }
                });

            }

            //选中单据明细事件
            form.on('select(endFloor)', function (data) {				
            form.on('select(endFloor)', function (data) {
                $("#endSelect").empty()
                $("#endSelect").append('<option value =>' + '</option>');
                $("#endSelect").append('<option value =>' + '</option>');

                if($("#endFloor").val() == "1"){
                    $("#endSelect").append('<option value ="B020101">一楼-B020101</option> <option value ="B020102">一楼-B020102</option> <option value ="B020103">一楼-B020103</option> '
                    +'<option value ="B020104">一楼-B020104</option> <option value ="B020201">一楼-B020201</option> <option value ="B020202">一楼-B020202</option>'
                    +' <option value ="B020301">一楼-B020301</option> <option value ="B020302">一楼-B020302</option> <option value ="B020303">一楼-B020303</option>'
                    +'<option value ="B020304">一楼-B020304</option>'
                      +'<option value ="B010201">一楼-B010201</option> <option value ="B010202">一楼-B010202</option> <option value ="B010203">一楼-B010203</option> <option value ="B010204">一楼-B010204</option> <option value ="B010205">一楼-B010205</option> <option value ="B010206">一楼-B010206</option> <option value ="B010207">一楼-B010207</option> <option value ="B010208">一楼-B010208</option> <option value ="B010209">一楼-B010209</option>'
                );
					
                }else if($("#endFloor").val() == "2"){
                if ($("#endFloor").val() == "1") {
                    $("#endSelect").append('<option value ="B010201">一楼-B010201</option> <option value ="B010202">一楼-B010202</option> <option value ="B010203">一楼-B010203</option> <option value ="B010204">一楼-B010204</option> <option value ="B010205">一楼-B010205</option> <option value ="B010206">一楼-B010206</option> <option value ="B010207">一楼-B010207</option> <option value ="B010208">一楼-B010208</option> <option value ="B010209">一楼-B010209</option>'
                        + '<option value ="B020101">一楼-B020101</option> <option value ="B020102">一楼-B020102</option> <option value ="B020103">一楼-B020103</option> '
                        + '<option value ="B020104">一楼-B020104</option> <option value ="B020201">一楼-B020201</option> <option value ="B020202">一楼-B020202</option>'
                        + ' <option value ="B020301">一楼-B020301</option> <option value ="B020302">一楼-B020302</option> <option value ="B020303">一楼-B020303</option>'
                        + '<option value ="B020304">一楼-B020304</option>'

                    );

                } else if ($("#endFloor").val() == "2") {
                    $("#endSelect").append('<option value ="B050101">二楼-B050101</option> <option value ="B050102">二楼-B050102</option> <option value ="B050103">二楼-B050103</option> '
                    +' <option value ="B050104">二楼-B050104</option> <option value ="B050105">二楼-B050105</option> <option value ="B050106">二楼-B050106</option>'
                    +' <option value ="B050107">二楼-B050107</option> <option value ="B050108">二楼-B050108</option> <option value ="B050109">二楼-B050109</option>'
                    +' <option value ="B050110">二楼-B050110</option> <option value ="B050111">二楼-B050111</option> <option value ="B050112">二楼-B050112</option>'
                    +' <option value ="B050113">二楼-B050113</option>');
                }else{
                        + ' <option value ="B050104">二楼-B050104</option> <option value ="B050105">二楼-B050105</option> <option value ="B050106">二楼-B050106</option>'
                        + ' <option value ="B050107">二楼-B050107</option> <option value ="B050108">二楼-B050108</option> <option value ="B050109">二楼-B050109</option>'
                        + ' <option value ="B050110">二楼-B050110</option> <option value ="B050111">二楼-B050111</option> <option value ="B050112">二楼-B050112</option>'
                        + ' <option value ="B050113">二楼-B050113</option>');
                } else {
                    layer.msg("选择出库楼层错误", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () { });
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () { });
                    return;
                }
                form.render('select');
            });
            //点击出库地址下拉框事件
            $("#endSelectDiv").click(function () {
                if ($("#endFloor").val() == null || $("#endFloor").val() == "" || $("#endFloor").val() == undefined) {
                    layer.msg("请先选择出库楼层", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () { });
            $("#endSelectDiv").click(function () {
                if ($("#endFloor").val() == null || $("#endFloor").val() == "" || $("#endFloor").val() == undefined) {
                    layer.msg("请先选择出库楼层", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () { });
                    return;
                }
				
            })
 
                }

            })

            function updatePalletNoList(callback) {
                var input = $('select[id="PalletNo"]').next().find('.layui-select-title input')
                var val = input.val()
                $("#PalletNo").empty()
                $("#PalletNo").append('<option value =>' + '</option>');
                form.render('select');
                var input = $('select[id="PalletNo"]').next().find('.layui-select-title input')
                var val = input.val()
                $("#PalletNo").empty()
                $("#PalletNo").append('<option value =>' + '</option>');
                form.render('select');

                var param = {
                    SoNo:$("#bar").val(),
                    SoDetailId:$("#goodSelect").val(),
                };
                sendData(IP + "/PdaSo/GetPalletListBySo", param, 'post', function (res) {
                    if (res.code == 0) { //成功
                        for (var i = 0; i < res.data.length; i++) {
                            $("#PalletNo").append('<option value =' + res.data[i] + '>' + res.data[i]+
                                '</option>');
                        }
                        form.render('select');
                var param = {
                    SoNo: $("#bar").val(),
                    SoDetailId: $("#goodSelect").val(),
                };
                sendData(IP + "/PdaSo/GetPalletListBySo", param, 'post', function (res) {
                    if (res.code == 0) { //成功
                        for (var i = 0; i < res.data.length; i++) {
                            $("#PalletNo").append('<option value =' + res.data[i] + '>' + res.data[i] +
                                '</option>');
                        }
                        form.render('select');

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

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

            form.on('submit(formBind)', function (data) {
 

                var param = {
                    SoNo: $("#bar").val(),
                    soDetailId: $("#goodSelect").val(),
                    palletNo: $("#PalletNo").val(),
                    outMode:$("#endSelect").val(),
                    outMode: $("#endSelect").val(),
                }
                console.log(param);
				

                sendData(IP + "/DownApi/PDAIssueOut", param, 'get', function (res) {
                    if (res.Success == "0") { //成功 
                        layer.msg(res.Message, {
@@ -393,7 +394,7 @@
                    }
                });
                return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
            }); 
            });
            //-------------------------------------------------------------------------------------------------

            $("#menuImg").click(function (e) {
@@ -410,11 +411,11 @@
                // //console.log("body")
                $("#menuList").hide()
            })
 
 

			  
 





        })
    </script>

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -4763,7 +4763,9 @@

                    }

                    var endLocateList = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && (m.AreaNo == "B02" || m.AreaNo == "B05")).Select(m => m.LocatNo).ToList();
                    //所属区域集合
                    List<string> areNolist = new List<string>() { "B01", "B02", "B05" };
                    var endLocateList = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && areNolist.Contains(m.AreaNo)).Select(m => m.LocatNo).ToList();
                    //判断是否是原辅料出库任务  货架储位=》平库储位
                    if (endLocateList.Contains(task.EndLocat) && PalletType == "0")
                    {