JC24WMS.git - Gitblit

parent: 009e869b | 补丁 | 提交 | ignore whitespace
yuyou_x
2024-02-04 c0ed9488d0c19ae59cf6fe175d3f31681e357d02
1个文件已修改
1个文件已添加
	Pda/View/AsnSetting/productEnterQuantity .html	1485 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
 Pda/View/AsnSetting/productEnterQuantity .html

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

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

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

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

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

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

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

       

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

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

            <ul>
                <li id="option1">标签</li>
                <li id="option2">数量</li>
                
            </ul>
            
            <br />
            <!-- 有码 -->
            <div id="content1">
                <div id="zongDiv" class="layout-bill-info" style="height: 285px;">
                    <form class="layui-form" action="">
                        <div id="" class="layui-form-item layout-dropdownlist">
                            <label class="layui-form-label" lang>入库单：</label>
                            <div class="layui-input-block" id="selectDiv">
                                <select id="bar" lay-filter="getbar" lay-search>
                                    <option value=""></option>
                                </select>
                                <img src="/assets/down_arraw.png">
                            </div>
                        </div>
                        <div class="layui-form-item layout-dropdownlist" style="margin-top: 10px;">
                            <label class="layui-form-label">物料-批次：</label>
                            <div class="layui-input-block" id="goodDiv">
                                <select id="goodSelect" lay-filter="goodSelect" lay-search>
                                    <option value=""></option>
                                </select>
                                <img src="/assets/down_arraw.png">
                            </div>
                        </div>
    
                        <div id="" class="layui-form-item layout-input">
                            <label class="layui-form-label" lang>托盘条码：</label>
                            <div class="layui-input-block">
                                <input id="STOCKCODE" type="text" lay-verify="stock" lang langholder placeholder="请扫描托盘条码"
                                    autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <div id="BOX" class="layui-form-item layout-input">
                            <label class="layui-form-label" lang>外箱条码：</label>
                            <div class="layui-input-block">
                                <input id="BOXCODE" type="text" lay-verify="required" lang langholder placeholder="请扫描外箱条码"
                                    autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <div id="" class="layui-form-item layout-input">
                            <label class="layui-form-label" lang>是否连组：</label>
                            <div class="layui-input-block">
                                <input type="checkbox" name="IsLianXu" id="IsLianXu" lay-skin="switch" lay-text="是|否"
                                    lay-filter="IsLianXu">
                            </div>
                        </div>
                        <div id="BOX2" class="layui-form-item layout-input" style="display: none;">
                            <label class="layui-form-label" lang>尾箱条码：</label>
                            <div class="layui-input-block">
                                <input id="BOXCODE2" type="text" lang langholder placeholder="请扫描外箱条码" autocomplete="off"
                                    class="layui-input">
                            </div>
                        </div>
    
                        <table class="layout-tbl-input" border="" cellspacing="" cellpadding="">
                            <tr>
                                <td>
                                    <div id="" class="layui-form-item layout-boxinfo">
                                        <label class="layui-form-label" lang>规格/型号：</label>
                                        <div class="layui-input-block">
                                            <input id="Standard" type="text" disabled placeholder="" autocomplete="off"
                                                class="layui-input">
                                        </div>
                                    </div>
                                </td>
                                <td>
                                    <div id="" class="layui-form-item layout-boxinfo">
                                        <label class="layui-form-label" lang>计划数量：</label>
                                        <div class="layui-input-block">
                                            <input id="ImportQuantity" type="text" disabled placeholder=""
                                                autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </td>
    
                            </tr>
                            <tr>
                                <td>
                                    <div id="" class="layui-form-item layout-boxinfo">
                                        <label class="layui-form-label" lang>已组数量：</label>
                                        <div class="layui-input-block">
                                            <input id="ImportFactQuantity" type="text" disabled placeholder=""
                                                autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </td>
                                <td>
                                    <div id="" class="layui-form-item layout-boxinfo">
                                        <label class="layui-form-label" lang>箱内数量：</label>
                                        <div class="layui-input-block">
                                            <input id="BoxQty" type="text" disabled placeholder="" autocomplete="off"
                                                class="layui-input">
                                        </div>
                                    </div>
                                </td>
                            </tr>
    
                        </table>
    
                        <table class="layout-tbl-submit" border="" cellspacing="" cellpadding="">
                            <tr>
                                <td style="width: 23%;"></td>
                                <td>
                                    <button class="layout-btn layout-btn-red" lang type="button" lay-submit
                                        lay-filter="formBind">绑定到托盘</button>
                                </td>
                                <td style="width: 33%;"></td>
    
                            </tr>
                        </table>
                    </form>
                </div>

                <br>

                <div id="" class="cut-line">
                    <img src="/assets/fengexian.png">
                </div>
    
                <div class="layout-tbl-paging" id="">
                    <table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
                        <tr>
                            <th lang style="width: 15%;">编码</th>
                            <th lang style="width: 35%;">名称</th>
                            <th lang style="width: 25%;">批次</th>
                            <th lang style="width: 15%;">数量</th>
                            <th lang style="width: 10%;">操作</th>
                        </tr>
                        <tr id="boxCell" style="display: none;">
                            <td name="code">AG000001</td>
                            <td name="name">疫苗名称名称名称</td>
                            <td name="lotNo">批次号</td>
                            <td name="num">30</td>
                            <td name="del">
                                <div id="" class="tbl-btn-del" lang>
                                    删除
                                </div>
                            </td>
                        </tr>
                    </table>
                    <!-- 分页 -->
                    <table id="tableBoxPages" class="tbl-box-pages" border="" cellspacing="" cellpadding="">
                        <tr style="display: ;">
                            <td class="page-prev">上一页</td>
                            <td class="page-num page-num-select">1</td>
                            <td class="page-num">2</td>
                            <td class="page-num">3</td>
                            <td class="page-num">4</td>
                            <td class="page-num">5</td>
                            <td class="page-next">下一页</td>
                        </tr>
                    </table>
                </div>

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

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

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

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

                        </table>

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

                    </form>
                </div>

                <br>

                <div id="" class="cut-line">
                    <img src="/assets/fengexian.png">
                </div>
    
                <div class="layout-tbl-paging" id="">
                    <table id="tableBoxList1" class="tbl-box-list" border="" cellspacing="" cellpadding="">
                        <tr>
                            <th lang style="width: 15%;">物料编码</th>
                            <th lang style="width: 35%;">物料名称</th>
                            <th lang style="width: 25%;">批次</th>
                            <th lang style="width: 15%;">物料数量</th>
                            <th lang style="width: 10%;">操作</th>
                        </tr>
                        <tr id="boxCell" style="display: none;">
                            <td name="code">AG000001</td>
                            <td name="name">疫苗名称名称名称</td>
                            <td name="lotNo">批次号</td>
                            <td name="num">30</td>
                            <td name="del">
                                <div id="" class="tbl-btn-del" lang>
                                    删除
                                </div>
                            </td>
                        </tr>
                    </table>
                    <!-- 分页 -->
                    <table id="tableBoxPages1" class="tbl-box-pages" border="" cellspacing="" cellpadding="">
                        <tr style="display: ;">
                            <td class="page-prev">上一页</td>
                            <td class="page-num page-num-select">1</td>
                            <td class="page-num">2</td>
                            <td class="page-num">3</td>
                            <td class="page-num">4</td>
                            <td class="page-num">5</td>
                            <td class="page-next">下一页</td>
                        </tr>
                    </table>
                </div>

            </div>

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

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

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

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

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

            //清楚文本框中数据
            // function clear() {	
            //     if (xianshiyemian == "0")
            //     {
            //         $("#BOXCODE").val("");
            //         $("#BOXCODE2").val("");

            //         $("#ImportQuantity").val("");
            //         $("#Standard").val("");
            //         $("#ImportFactQuantity").val("");
            //         $("#BoxQty").val("");
            //     }
            //     else if (xianshiyemian == "1")
            //     {
            //         $("#BOXCODE").val("");
            //         $("#BOXCODE2").val("");

            //         $("#ImportQuantity").val("");
            //         $("#Standard").val("");
            //         $("#ImportFactQuantity").val("");
            //         $("#BoxQty").val("");
            //     }
				
            // }
            
            /*——————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————*/

            initLanguage()
            setLanguage()

            //当前分页
            var curPageIndex = 1;
            //是否连续组托
            isContinue = "0";

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

                if ($("#STOCKCODE").val() == "" || $("#STOCKCODE").val().length < 8) {
                    return
                }
                if ($("#STOCKCODE").val().length >= 8) {
                    $("#STOCKCODE").val($("#STOCKCODE").val().substr(-8))
                }
                checkPalletStat()
            })
            // 托盘码文本改变时触发-数量
            $("#STOCKCODE1").on('input', function () {

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

            //箱码回车事件
            $("#BOXCODE").keydown(function (e) {
                if (e.keyCode === 13) {
                    if ($("#BOXCODE").val() == "") {
                        layer.msg('请先扫描箱码', {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                        return
                    }

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

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

            /*————————————————————————————————————————————————————————————————————————————————————————————————*/


            /* 绑定入库单信息 */ 

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

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

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

                            callback(res.data)
                        } else { //不成功
                            // layer.msg(res.msg, {
                            //     icon: 2,
                            //     time: 2000 //2秒关闭（如果不配置，默认是3秒）
                            // }, function() {});
                        }
                    });
                }
                else if (xianshiyemian == 1)
                {
                    var input = $('select[id="bar1"]').next().find('.layui-select-title input')
                    var val = input.val()
                    $("#bar1").empty()
                    $("#bar1").append('<option value =>' + '</option>');
                    form.render('select');

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

                            if (!val) {
                                $('#bar1').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
                            } else {
                                var sel = 'dd[lay-value=' + val + ']';
                                $('#bar1').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() {});
                        }
                    });
                }
				
            }
           
            /*————————————————————————————————————————————————————————————————————————————————————————————————*/

            //点击物料下拉框事件
            $("#goodDiv").click(function () {
                if ($("#bar").val() == null || $("#bar").val() == "" || $("#bar").val() == undefined) {
                    layer.msg("请先选择入库单", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () { });
                }
            })
            //点击物料下拉框事件-数量
            $("#goodDiv1").click(function () {
                if ($("#bar1").val() == null || $("#bar1").val() == "" || $("#bar1").val() == undefined) {
                    layer.msg("请先选择入库单", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () { });
                }
            })
            //选中入库单事件
            form.on('select(getbar)', function (data) {
                updateGoodList()
                setOrderGoods();
            });
            //选中入库单事件-数量
            form.on('select(getbar1)', function (data) {
                updateGoodList()
                setOrderGoods();
            });
           
            //选中物料事件
            form.on('select(goodSelect)', function (data) {
                setOrderGoods();
            });
           //选中物料事件-数量
            form.on('select(goodSelect1)', function (data) {
                setOrderGoods();
            });

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


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

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

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

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

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

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

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

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

                            if (!val) {
                                $('#goodSelect').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
                            } else {
                                var sel = 'dd[lay-value=' + val + ']';
                                $('#goodSelect').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
                            }
                        } else {
                        }
                    });
                }
                else if (xianshiyemian == 1)
                {
                    console.log("bbbb");
                    var input = $('select[id="goodSelect1"]').next().find('.layui-select-title input')
                    var val = input.val()

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

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

                            }
                            form.render('select');

                            if (!val) {
                                $('#goodSelect1').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
                            } else {
                                var sel = 'dd[lay-value=' + val + ']';
                                $('#goodSelect1').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
                            }
                        } else {
                        }
                    });
                }
				
            }
           
            // 渲染箱码信息
            function refreshTable() {
                if (xianshiyemian == 0)
                {
                    //先清空一下箱子列表
                    let trs = $("#tableBoxList tr")
                    let len = trs.length

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

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

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

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


                        } else { //不成功
                            layer.msg("无数据", {
                                icon: 2,
                                time: 2000 //2秒关闭（如果不配置，默认是3秒）
                            }, function () { });
                            $("#boxNum").val(0)
                        }
                    });
                }
                else if (xianshiyemian == 1)
                {
                    //先清空一下箱子列表
                    let trs = $("#tableBoxList1 tr")
                    let len = trs.length

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

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

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

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

                        //设置分页
                        setPages(1, list.length)

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

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

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

                        } else {
                            layer.msg(res.msg, {
                                icon: 2,
                                time: 2000 //2秒关闭（如果不配置，默认是3秒）
                            }, function () { });
                        }
                    });
                }
                else if (xianshiyemian == 1)
                {
                    var param = {
                        "PalletNo": $("#STOCKCODE1").val()
                    }
                    sendData(IP + "/PdaAsn/IsEnablePalletNo", param, 'post', function (res) {
                        if (res.code == 0) {

                            $.cookie('stockCode1', $("#STOCKCODE1").val());
                            refreshTable()
                            $("#SkuQty").focus();

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

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

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

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

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

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

            }


            /* 分页 */
            //设置分页
            function setPages(pageIndex, boxNum){

                if (xianshiyemian == 0)
                {
                    if(boxNum <= 0){
                        //列表为空，隐藏分页页码
                        $("#tableBoxPages").hide()
                        return
                    }
                    
                    let pageNum = Math.floor(boxNum / 10);
                    if(boxNum % 10 > 0){
                        pageNum += 1;
                    }
                    //console.log("pageNum is " + pageNum)
                    
                    $("#tableBoxPages").find("tr").remove()
                    let table = $("#tableBoxPages")
                    $("<tr></tr>").appendTo("#tableBoxPages")
                    
                    // let newTr = table.append("<tr></tr>")
                    // newTr.append("<td class='page-prev'>上一页</td>")
                    $("<td id='prevPage' class='page-prev'>上一页</td>").appendTo("#tableBoxPages tr")
                    $("#tableBoxPages tr").eq(0).find("td[id^='prevPage']").click(function(){
                        onClickPrevPage()
                    })
                    for(i=1; i < pageNum + 1; i++){
                        // newTr.append("<td class='page-num'>"+ i +"</td>")
                        $("<td class='page-num'>"+ i +"</td>").appendTo("#tableBoxPages tr")
                    }
                    // newTr.append("<td class='page-next'>下一页</td>")
                    $("<td id='nextPage' class='page-next'>下一页</td>").appendTo("#tableBoxPages tr")
                    $("#tableBoxPages tr").eq(0).find("td[id^='nextPage']").click(function(){
                        onClickNextPage()
                    })
                    // pages.show()
                    $("#tableBoxPages").show()
                    
                    setCurPage(1)
                }
                else if (xianshiyemian == 1)
                {
                    if(boxNum <= 0){
                        //列表为空，隐藏分页页码
                        $("#tableBoxPages1").hide()
                        return
                    }
                    
                    let pageNum = Math.floor(boxNum / 10);
                    if(boxNum % 10 > 0){
                        pageNum += 1;
                    }
                    //console.log("pageNum is " + pageNum)
                    
                    $("#tableBoxPages1").find("tr").remove()
                    let table = $("#tableBoxPages1")
                    $("<tr></tr>").appendTo("#tableBoxPages1")
                    
                    // let newTr = table.append("<tr></tr>")
                    // newTr.append("<td class='page-prev'>上一页</td>")
                    $("<td id='prevPage' class='page-prev'>上一页</td>").appendTo("#tableBoxPages1 tr")
                    $("#tableBoxPages1 tr").eq(0).find("td[id^='prevPage']").click(function(){
                        onClickPrevPage()
                    })
                    for(i=1; i < pageNum + 1; i++){
                        // newTr.append("<td class='page-num'>"+ i +"</td>")
                        $("<td class='page-num'>"+ i +"</td>").appendTo("#tableBoxPages1 tr")
                    }
                    // newTr.append("<td class='page-next'>下一页</td>")
                    $("<td id='nextPage' class='page-next'>下一页</td>").appendTo("#tableBoxPages1 tr")
                    $("#tableBoxPages1 tr").eq(0).find("td[id^='nextPage']").click(function(){
                        onClickNextPage()
                    })
                    // pages.show()
                    $("#tableBoxPages1").show()
                    
                    setCurPage(1)
                }
                
            }
            
            //设置当前分页
            function setCurPage(pageIndex){
                if (xianshiyemian == 0)
                {
                    let totalTrNum = $("#tableBoxList tr").length
                    if(totalTrNum <= 2 ){
                        //console.log("tableBoxList 为空 totalTrNum: " + totalTrNum)
                        //curPageIndex = 1
                        return
                    }
                    
                    let pageNum = getBoxPageNum()
                    if(pageIndex > pageNum){
                        //console.log("设置的页码超出页数, pageIndex : " + pageIndex)
                        //curPageIndex = 1
                        return
                    }
                    
                    let startIndex = (pageIndex - 1) * 10 + 1
                    let n = totalTrNum - startIndex
                    let endIndex = 0
                    if(n > 9){
                        endIndex = startIndex + 9
                    }else{
                        endIndex = startIndex + n
                    }
                    
                    let trs = $("#tableBoxList tr")
                    //console.log("行数 "+trs.length)
                    let d = 0
                    for(let i = 2; i < trs.length; i++){
                        //console.log("行索引 " + trs.eq(i).attr('index'))
                        let t = trs.eq(i)
                        d = t.attr('index')
                        if(d >= startIndex && d <= endIndex){
                            //console.log("需要显示")
                            //显示行
                            t.show()
                        }else{
                            //隐藏行
                            t.hide()
                        }
                    }
                    
                    curPageIndex = pageIndex
                    
                    let ptr = $("#tableBoxPages tr")
                    for(let i = 1; i < pageNum+1; i++){
                        ptr.eq(0).find("td").eq(i).removeClass("page-num-select")
                        if(i == curPageIndex){
                            ptr.eq(0).find("td").eq(i).addClass("page-num-select")
                        }
                    }
                }
                else if (xianshiyemian == 1)
                {
                    let totalTrNum = $("#tableBoxList1 tr").length
                    if(totalTrNum <= 2 ){
                        return
                    }
                    
                    let pageNum = getBoxPageNum()
                    if(pageIndex > pageNum){
                        //console.log("设置的页码超出页数, pageIndex : " + pageIndex)
                        //curPageIndex = 1
                        return
                    }
                    
                    let startIndex = (pageIndex - 1) * 10 + 1
                    let n = totalTrNum - startIndex
                    let endIndex = 0
                    if(n > 9){
                        endIndex = startIndex + 9
                    }else{
                        endIndex = startIndex + n
                    }
                    
                    let trs = $("#tableBoxList1 tr")
                    //console.log("行数 "+trs.length)
                    let d = 0
                    for(let i = 2; i < trs.length; i++){
                        //console.log("行索引 " + trs.eq(i).attr('index'))
                        let t = trs.eq(i)
                        d = t.attr('index')
                        if(d >= startIndex && d <= endIndex){
                            //console.log("需要显示")
                            //显示行
                            t.show()
                        }else{
                            //隐藏行
                            t.hide()
                        }
                    }
                    
                    curPageIndex = pageIndex
                    
                    let ptr = $("#tableBoxPages1 tr")
                    for(let i = 1; i < pageNum+1; i++){
                        ptr.eq(0).find("td").eq(i).removeClass("page-num-select")
                        if(i == curPageIndex){
                            ptr.eq(0).find("td").eq(i).addClass("page-num-select")
                        }
                    }
                }
                
            }

            function getBoxPageNum()
            {
                if (xianshiyemian == 0)
                {
                    let num = $("#tableBoxList tr").length
                    if(num <= 2 ){
                        return 0
                    }
                    
                    let pageNum = Math.floor(num / 10);
                    if(num % 10 > 0){
                        pageNum += 1;
                    }
                    
                    return pageNum
                }
                else if (xianshiyemian == 1)
                {
                    let num = $("#tableBoxList1 tr").length
                    if(num <= 2 ){
                        return 0
                    }
                    
                    let pageNum = Math.floor(num / 10);
                    if(num % 10 > 0){
                        pageNum += 1;
                    }
                    
                    return pageNum
                }
                
            }

            function onClickPrevPage(){
                //console.log("上一页按钮被点击")
                if(curPageIndex == 1){
                    return
                }
                setCurPage(curPageIndex - 1)
            }

            function onClickNextPage(){
                //console.log("下一页按钮被点击")
                let n = getBoxPageNum()
                if(curPageIndex == n){
                    return
                }
                setCurPage(curPageIndex + 1)
            }
          
            /*——————————————————————————————————————————————————————————*/

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

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

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

</html>

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -543,7 +543,7 @@
                if (!string.IsNullOrWhiteSpace(bind.LocatNo))
                {
                    isNullLocat = 1;
                    locat = Db.Queryable<SysStorageLocat>().First(a=>a.IsDel == "0" && a.WareHouseNo == bind.WareHouseNo && a.RoadwayNo == bind.RoadwayNo && a.LocatNo == bind.LocatNo);
                    locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == bind.WareHouseNo && a.RoadwayNo == bind.RoadwayNo && a.LocatNo == bind.LocatNo);
                    //判断储位地址是否为正在入库
                    if (locat.Status != "2")
                    {
@@ -1089,9 +1089,9 @@
                    #endregion

                    #endregion
                }                
                }
                storageLocat.Status = "1";
                storageLocat.UpdateTime= serverTime; //修改时间
                storageLocat.UpdateTime = serverTime; //修改时间
                storageLocat.UpdateUser = model.CreateUser; //修改人
                //修改储位状态                                           
                Db.Updateable(storageLocat).ExecuteCommand();
@@ -1693,7 +1693,7 @@

                            noticeList.Add(entry);
                        }
                    }                   
                    }
                }
                return noticeList;
            }
@@ -1715,10 +1715,15 @@
            {
                #region 判断

                //0：成品入库 1：采购入库 2：中间品入库 3：退货入库 4：车间余料入库 5：其它入库 6：代储入库 7：寄存入库
                var TypeLot = "1, 2, 5, 6, 7";

                if (string.IsNullOrEmpty(model.AsnNo))
                {
                    throw new Exception("-1:单据号不可为空!");
                }
                //根据单据号获取入库单总单
                var notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo);
                if (model.AsnDetailId == null || model.AsnDetailId == 0)
                {
                    throw new Exception("-1:物料不可为空!");
@@ -1729,7 +1734,12 @@
                }
                if (string.IsNullOrEmpty(model.LotNo))
                {
                    throw new Exception("-1:物料批次不可为空!");
                    //判断是否为不限制批次单据
                    if (!TypeLot.Contains(notice.Type))
                    {
                        throw new Exception("-1:物料批次不可为空!");
                    }

                }
                else
                {
			@@ -543,7 +543,7 @@
			if (!string.IsNullOrWhiteSpace(bind.LocatNo))
			{
			isNullLocat = 1;
			locat = Db.Queryable<SysStorageLocat>().First(a=>a.IsDel == "0" && a.WareHouseNo == bind.WareHouseNo && a.RoadwayNo == bind.RoadwayNo && a.LocatNo == bind.LocatNo);
			locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == bind.WareHouseNo && a.RoadwayNo == bind.RoadwayNo && a.LocatNo == bind.LocatNo);
			//判断储位地址是否为正在入库
			if (locat.Status != "2")
			{
			@@ -1089,9 +1089,9 @@
			#endregion

			#endregion
			}
			}
			storageLocat.Status = "1";
			storageLocat.UpdateTime= serverTime; //修改时间
			storageLocat.UpdateTime = serverTime; //修改时间
			storageLocat.UpdateUser = model.CreateUser; //修改人
			//修改储位状态
			Db.Updateable(storageLocat).ExecuteCommand();
			@@ -1693,7 +1693,7 @@

			noticeList.Add(entry);
			}
			}
			}
			}
			return noticeList;
			}
			@@ -1715,10 +1715,15 @@
			{
			#region 判断

			//0：成品入库 1：采购入库 2：中间品入库 3：退货入库 4：车间余料入库 5：其它入库 6：代储入库 7：寄存入库
			var TypeLot = "1, 2, 5, 6, 7";

			if (string.IsNullOrEmpty(model.AsnNo))
			{
			throw new Exception("-1:单据号不可为空!");
			}
			//根据单据号获取入库单总单
			var notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo);
			if (model.AsnDetailId == null \|\| model.AsnDetailId == 0)
			{
			throw new Exception("-1:物料不可为空!");
			@@ -1729,7 +1734,12 @@
			}
			if (string.IsNullOrEmpty(model.LotNo))
			{
			throw new Exception("-1:物料批次不可为空!");
			//判断是否为不限制批次单据
			if (!TypeLot.Contains(notice.Type))
			{
			throw new Exception("-1:物料批次不可为空!");
			}

			}
			else
			{