Merge branch 'master' into djp

test

4 小时以前 c5dc821692c0529e3a688af84c647bf80cc49360

Merge branch 'master' into djp

 HTML/js/public.js

@@ -2,7 +2,7 @@
// var IP = "http://172.16.71.101:8082/";//接口IP
//var IP = "http://localhost:13243/api";
//var IP = "http://localhost:50515/api";  //本地
var IP="https://localhost:5001/api";
var IP="https://localhost:44363/api";
// var IP = "http://localhost:44318/api";
//var IP = "http://192.168.1.6:8017";
//var IP = "http://192.168.1.226:8086";  

 HTML/views/SOSetting/ExportNotice.html

@@ -368,7 +368,7 @@
                                                </a>`;
                                    }
                                    
                                    if( (d.Status == '2' || d.Status == '3') && d.Type=='0'){
                                    if( (d.Status == '2' || d.Status == '3')){
                                        html += `<a class="layui-btn layui-btn-normal layui-btn-xs outClass" lay-event="outKu">
                                                    <i class="layui-icon layui-icon-ok"></i>出库
                                                </a>`;

 HTML/views/StatisticalReport/BoxInfor.html

@@ -407,6 +407,7 @@
                { field: 'BitPalletMark', title: '零托标记', align: 'center', templet: '#BitPalletMarkStatus', width: 100, },

                { field: 'ProductionTime', title: '生产日期', align: 'center', templet: '#templetProductionTime' },
                { field: 'ExpirationTime', title: '过期日期', align: 'center', templet: '#templetExpirationTime' },
                { field: 'OwnerNo', title: '货主编码', align: 'center', width: 100, },
                { field: 'OwnerName', title: '货主名称', align: 'center', width: 100, },
                { field: 'SupplierNo', title: '供应商编码', align: 'center', width: 100, },

 Pda/View/HouseDataSetting/agvTransport.html

@@ -138,6 +138,15 @@
                                <img src="/assets/down_arraw.png">
                            </div>
                        </div>
                         <div id="" class="layui-form-item layout-dropdownlist">
                            <label class="layui-form-label" lang>目标储位：</label>
                            <div class="layui-input-block" id="selectLocatNoEnd">
                                <select id="LocatNoEnd" lay-filter="getLocatNoEnd" lay-search>
                                    <option value=""></option>
                                </select>
                                <img src="/assets/down_arraw.png">
                            </div>
                        </div>
                        <div id="" class="layui-form-item layout-dropdownlist">
                            <label class="layui-form-label" lang>入库口：</label>
                            <div class="layui-input-block" id="selectRuku">
@@ -447,6 +456,45 @@
                    }
                });
            }
             //选中出库单事件
             form.on('select(getQuyu)', function (data) {
                  //先更新一下目标区域
                updateLocatNoEndList()
            });
            //点击目标储位下拉框事件
            $("#selectLocatNoEnd").click(function () {
                if ($("#Quyu").val() == "") {
                    layer.msg('请先选择目标区域', {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    });
                    return
                }
             
            })
            /* 绑定目标储位信息 */
            function updateLocatNoEndList() {
                $("#LocatNoEnd").empty()
                $("#LocatNoEnd").append('<option value =>' + '</option>');
                form.render('select');

                var param = {
                    "AreaNo": $("#Quyu").val()
                };
                sendData(IP + "/PdaCr/GetLocatByArea", param, 'get', function (res) {
                    if (res.code == 0) { //成功
                        for (var i = 0; i < res.data.length; i++) {
                            $("#LocatNoEnd").append('<option value =' + res.data[i] + '>' + res.data[i]+ '</option>');
                        }
                        form.render('select');
                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function() {});
                    }
                });
            }

            //点击出库单据下拉框事件
            $("#selectOutNo").click(function () {
@@ -652,6 +700,7 @@
                    var param = {
                        PalletNo: $("#STOCKCODE").val(),
                        AreaNo: $("#Quyu").val(),
                        LocatNoEnd: $("#LocatNoEnd").val(),
                        Ruku: $("#Ruku").val()
                    }
                    //呼叫小车

 Pda/View/SoSetting/pinTuoOut.html

@@ -1300,6 +1300,25 @@
                    }
                });
            }
            //下拉单据选中后事件
            form.on('select(getbar2)', function (data) {
                if ($('#palletNo2').val() == "") {
                    layer.msg("请输入托盘条码", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () {
                        //回调
                    });
                    return
                }
                if ($('#bar2').val() == "") {
                    clear21();
                    return
                }
                updateSkuLotNoList2();
                updateQtyList2();
                getBar2();
            });

            //初始化渲染 物料-批次
            function updateSkuLotNoList2() {

 Pda/View/SoSetting/productOutCode.html

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

<head>
    <meta charset="UTF-8" />
    <meta name="viewport" content="user-scalable=0,width=device-width,initial-scale=1.0" />
    <!-- <meta name="viewport" content="width=device-width, initial-scale=0.665, minimum-scale=0.5, maximum-scale=2.0, user-scalable=no" /> -->
    <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">
        .layout-bill-info {
            height: auto;
            /* background-color: #009E94; */
        }

        .layout-tbl-submit {
            margin-top: 10px;
        }

        /* .out-scatter-num {
                 background-color: #009688; 
				
            } */
        .out-scatter-num .local-input {
            width: 40%;
            height: 25px;
            float: left;
        }

        .out-scatter-num .local-ok button {
            height: 25px;
            border: 0;
            color: #FFFFFF;
            background-color: #0a93e3;
            border-radius: 3px;
            padding: 2px;
            margin-left: 10px;
            width: 100%;
        }

        .out-scatter-num .layui-input-block {
            width: 100%;
            /* background-color: #009E94; */
            margin-left: 0;
        }

        .out-scatter-num .local-ok {
            width: 20%;
            height: 25px;
            float: left;
        }

        .btn-ok-blue {
            border: none;
            color: #FFFFFF;
            background-color: #0a93e3;
            width: 48%;
            height: 36px;
            border-radius: 5px;
        }

        .btn-ok-red {
            border: none;
            color: #FFFFFF;
            background-color: #9f1707;
            width: 48%;
            height: 36px;
            border-radius: 5px;
        }

        .btn-ok-blue:active {
            opacity: 0.8;
        }

        .btn-ok-red:active {
            opacity: 0.8;
        }

        .layout-tbl-paging {
            margin-top: 20px;
        }

        .foot-container {
            text-align: center;
        }

        .layout-tab-page {
            height: auto;
        }

        .layui-form-checkbox {
            margin: auto;
            /* padding-left: 2px; */
            /* padding-right: 2px; */
        }

        .div-tbl-title {
            width: 98%;
            margin: auto;
            /* background-color: #4476A7; */
            height: 30px;
        }

        .div-tbl-title table {
            width: 100%;
            height: 30px;
        }

        td {
            word-break: break-all;
            word-wrap: break-word;
        }

        .layui-input-block .layui-input,
        .layui-input-block .layui-textarea {
            padding-left: 0rem;
            font-size: 13px;
        }

        .lableWidth {
            width: 17%;
        }

        .layui-input-block {
            width: 83%;
            margin-left: 17%;
        }

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

        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" />
</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">成品拣货</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">主页</a></li>
                    <li><a href="../login.html">重新登录</a></li>
                </ul>
            </div>


            <div id="" class="layout-bill-info">
                    <form class="layui-form" action="" style="height: auto;">

                        <div id="layout-bill" class="layui-form-item layout-dropdownlist">
                            <label class="layui-form-label lableWidth">出库单：</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 id="layout-skuLotNo" class="layui-form-item layout-dropdownlist">
                            <label class="layui-form-label lableWidth">物料 - 批次：</label>
                            <div class="layui-input-block">
                                <select id="skuLotNo" lay-filter="getSkuLotNo" lay-search>
                                    <option value=""></option>
                                </select>
                                <img src="/assets/down_arraw.png">
                            </div>
                        </div>
                        <div id="" class="layout-tab-page">
                            <table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
                                <tr>
                                    <td colspan="3">
                                        <div class="layui-form-item">
                                            <label class="layui-form-label" style="width: 17%;">SAP单号：</label>
                                            <div class="layui-input-block" style="width: 83%;margin-left:17%;">
                                                <input id="OrderCode" type="text" lay-verify="" disabled placeholder=""
                                                    class="layui-input">
                                            </div>
                                        </div>
                                    </td>

                                </tr>
                                <tr>
                                    <td>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label" style="width: 50%;">计划数量：</label>
                                            <div class="layui-input-block" style="width: 50%;margin-left:50%;">
                                                <input id="planQty" type="text" lay-verify="" disabled placeholder=""
                                                    class="layui-input">
                                            </div>
                                        </div>
                                    </td>
                                    <td>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label" style="width: 50%">完成数量：</label>
                                            <div class="layui-input-block" style="width: 50%;margin-left:50%;">
                                                <input id="finishQty" type="text" lay-verify="" disabled placeholder=""
                                                    class="layui-input">
                                            </div>
                                        </div>

                                    </td>
                                    <td>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label" style="width: 34%;">出库口：</label>
                                            <div class="layui-input-block" style="width: 66%;margin-left:34%;">
                                                <input id="outModel" type="text" lay-verify="" disabled placeholder=""
                                                    class="layui-input">
                                            </div>
                                        </div>
                                    </td>
                                </tr>
                                <tr>
                                    <td colspan="3">
                                        <div class="layui-form-item">
                                            <label class="layui-form-label" style="width: 17%;">规格：</label>
                                            <div class="layui-input-block" style="width: 83%;margin-left:17%;">
                                                <input id="standard" type="text" lay-verify="" disabled placeholder=""
                                                    class="layui-input">
                                            </div>
                                        </div>
                                    </td>

                                </tr>
                            </table>
                        </div>

                        <div id="layout-pallet" class="layui-form-item layout-input">
                            <label class="layui-form-label lableWidth">托盘条码：</label>
                            <div class="layui-input-block">
                                <input id="palletNo" type="text" lay-verify="stock" placeholder="请扫描托盘条码"
                                    autocomplete="off" class="layui-input" style="height:24px">
                            </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="IsZhengTuo" id="IsZhengTuo" lay-skin="switch"
                                    lay-text="是|否" lay-filter="IsZhengTuo">
                            </div>
                        </div>
                        <div id="BoxDIv" class="layout-tab-page">
                            <table class="layout-tab-content" border="" cellspacing="" cellpadding="">
                                <tr>
                                    <td>
                                        <div class="layui-form-item layout-input">
                                            <label class="layui-form-label lableWidth">标签条码：</label>
                                            <div class="layui-input-block">
                                                <input id="boxNo" type="text" placeholder="请扫描标签条码" autocomplete="off"
                                                    class="layui-input">
                                            </div>
                                        </div>
                                    </td>
                                </tr>								
                            </table>
                        </div>
                        <div id="" class="layout-tab-page">
                            <table class="layout-tab-content" border="" cellspacing="" cellpadding="">
                                <tr>
                                    <td>
                                        <table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
                                            <tr>
                                                <td>
                                                    <div class="layui-form-item">
                                                        <label class="layui-form-label lableWidth">待拣数量：</label>
                                                        <div class="layui-input-block">
                                                            <input id="pickQty" type="text" lay-verify="" disabled
                                                                placeholder="" class="layui-input">
                                                        </div>
                                                    </div>
                                                </td>
                                                <td>
                                                    <div class="layui-form-item">
                                                        <label class="layui-form-label lableWidth">已扫数量：</label>
                                                        <div class="layui-input-block">
                                                            <input id="scanQty" type="text" lay-verify="" disabled
                                                                placeholder="" class="layui-input">
                                                        </div>
                                                    </div>
                                                </td>
												
                                            </tr>
                                        </table>
                                    </td>
                                </tr>
                            </table>
                            <table class="layout-tab-content">
                                <tr>
                                    <td style="width: 33%;"></td>
                                    <td>
                                        <button class="layout-btn layout-btn-red" lang type="button" lay-submit
                                            lay-filter="formPickScatter">拣货</button>
                                    </td>
                                    <td style="width: 33%;"></td>
									
                                </tr>
                            </table>
                            <div id="" style="text-align: right;margin-top: 10px; display: none;">
                                <div id="" class="cut-line">
                                    <img src="/assets/fengexian.png">
                                </div>
                            </div>
                        </div>

                    </form>
                </div>

                <div class="layout-tbl-paging" id="">
                    <table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
                        <tr id="tableHead">
                            <th style="width: 54%;">标签条码</th>
                            <th style="width: 20%;">数量</th>	
                        </tr>
                        <tr id="boxCell" style="display: none;">
                            <td name="boxNo">AG000001</td>
                            <td name="qty">30</td>
                        </tr>
                    </table>

                </div>
			
        </div>

    </div>


    <script src="/js/jquery-3.5.1.min.js"></script>
    <script src="/layui/layui.js"></script>
    <script src="/js/jquery.cookie.js"></script>
    <script src="/js/public.js"></script>

    <script>
        layui.use(['form', 'jquery'], function () {
            var form = layui.form;

            /* 标签切换代码 */

            var xianshiyemian = 0;


            var boxes = [];
            var scanQty=0;
            //是否整托拣货
            var isContinue = "0";
            var tableData = null
            var tableData2 = null
            var canPickBox = true
            $("#palletNo").focus();//光标默认选中		

            function clear1() {
                $('#outModel').val("");//出库口
                $('#standard').val("");//规格

                $('#pickQty').val("");//待拣数量
            }
            function clear2() {
                //物料批次
                $("#skuLotNo").empty()
                $("#skuLotNo").append('<option value =>' + '</option>');
                form.render('select');
            }
            function clear3() {
                $("#planQty").val("");  //计划数量
                $("#finishQty").val("");//完成数量
            }
            function clear4() {
                $('#boxNo').val("");//箱码
                $('#boxQty').val("");//箱内数量
            }
            //当托盘条码输入框文本改变时,检查一下托盘状态 
            $("#palletNo").on('input', function () {

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

            form.on('switch(IsZhengTuo)', function (obj) {
                if (obj.elem.checked) {
                    $('#BoxDIv').attr("style", "display:none")
                    isContinue = "1";
                } else {
                    $('#BoxDIv').attr("style", "display:block")
                    isContinue = "0";
                }
                $('#boxNo').val("");
            });

            //箱码文本框回车事件
            $("#boxNo").blur(function () {

            });
            //当箱码输入框文本改变时
            $("#boxNo").on('input', function () {
                if ($("#boxNo").val() == "" || $("#boxNo").val().length < 20) {
                    return
                }
                if ($("#palletNo").val() == "" || $("#palletNo").val().length < 8) {
                    layer.msg("请先扫描托盘条码", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () {
                        //回调
                    });
                    $("#boxNo").val('')
                    return;
                }
                var box;
                if ($("#boxNo").val().length >= 20) {
                    var boxNum=0;
                    var param = {
                        "PalletNo": $("#palletNo").val(),
                        "BoxNo":$("#boxNo").val()
                    }
                    synData(IP + "/PdaSo/CheckBoxForPick", param, 'get', function (res) {
                        if (res.code == 0) { //成功 
                            boxNum=res.data
                            box={BoxNo: $("#boxNo").val(), Qty:boxNum }

                        } else { //不成功
                            layer.msg(res.msg, {
                                icon: 2,
                                time: 2000 //2秒关闭（如果不配置，默认是3秒）
                            }, function () { });
                            return;
                        }
                    });
					
                    var isExist = boxes.some(function(item) {
                        return item.BoxNo === box.BoxNo;
                    });
                    if (isExist) {
                        layer.msg("该条码已扫描！", {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () {
                            //回调
                        });
                        $("#boxNo").val('')
                        return;
                    } 
                    boxes.push(box);
                    tableData = deepCopy(boxes)
                    refreshTable(tableData)
                    $("#boxNo").val('')

                    scanQty=scanQty+boxNum
                    $('#scanQty').val(scanQty);
                }
            })

            //检查托盘状态
            function checkPalletState() {

                var param = {
                    "PalletNo": $("#palletNo").val()
                }
                synData(IP + "/PdaSo/IsEnableOkPalletNo", param, 'post', function (res) {

                    if (res.code == 0) { //成功 
                        updateBillList();
                        if ($('#bar').val() == "") {
                            clear1();
                            return;
                        } else {
                            updateSkuLotNoList();
                            updateQtyList();
                            getBar();
                        }

                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () { });
                    }
                });
            }
            //下拉单据选中后事件
            form.on('select(getbar)', function (data) {
                if ($('#palletNo').val() == "") {
                    layer.msg("请输入托盘条码", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () {
                        //回调
                    });
                    return
                }
                if ($('#bar').val() == "") {
                    clear1();
                    clear2();
                    clear3();
                    return
                }
                updateSkuLotNoList();
                updateQtyList();
                getBar();
            });
            //下拉物料批次选中后事件
            form.on('select(getSkuLotNo)', function (data) {
                if ($('#palletNo').val() == "") {
                    layer.msg("请输入托盘条码", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () {
                        clear1();
                        clear3();
                    });
                    return
                }
                if ($('#skuLotNo').val() == "") {
                    clear1();
                    clear3();
                    return
                }
                updateQtyList();
                getBar();
            });

            //初始化渲染 出库单
            function updateBillList() {

                $("#bar").empty()
                $("#bar").append('<option value =>' + '</option>');
                form.render('select');

                var param = {
                    PalletNo: $("#palletNo").val(),
                };
                synData(IP + "/PdaSo/GetRunSoNoticeList", param, 'post', function (res) {
                    if (res.code == 0) { //成功
                        console.log(res.data);
                        for (var i = 0; i < res.data.length; i++) {
                            if (i == 0) {
                                $("#bar").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
                            } else {
                                $("#bar").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
                            }
                        }
                        form.render('select');

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

            //初始化渲染 物料-批次
            function updateSkuLotNoList() {
                clear2();

                var param = {
                    PalletNo: $("#palletNo").val(),
                    SoNo: $("#bar").val(),
                };
                synData(IP + "/PdaSo/GetSoSkuLotNoListByPallet", param, 'post', function (res) {
                    if (res.code == 0) { //成功
                        for (var i = 0; i < res.data.length; i++) {
                            if (i == 0) {
                                $("#skuLotNo").append('<option value =' + res.data[i].SoDetailId + ' selected>' + res.data[i].SkuName + " - " + res.data[i].LotNo + '</option>');

                            } else {
                                $("#skuLotNo").append('<option value =' + res.data[i].SoDetailId + '>' + res.data[i].SkuName + " - " + res.data[i].LotNo + '</option>');
                            }
                        }
                        form.render('select');

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

            //初始化渲单据的计划数量和完成数量
            function updateQtyList() {
                clear3();
                var param = {
                    SoDetailId: $("#skuLotNo").val(),
                };
                synData(IP + "/PdaSo/GetPlanAndFinishQty", param, 'post', function (res) {
                    if (res.code == 0) { //成功
                        console.log(res.data);
                        $("#planQty").val(res.data.PlanQty)
                        $("#finishQty").val(res.data.FinishQty)
                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () { });
                    }
                });
            }

            //根据单据获取出库口
            function getBar() {
                clear1();

                var param = {
                    PalletNo: $("#palletNo").val(),
                    SoDetailId: $("#skuLotNo").val(),
                }
                synData(IP + "/PdaSo/GetOutlets", param, 'post', function (res) {
                    if (res.code == 0) { //成功
                        let data = res.data
                        console.log(res.data);
                        $('#outModel').val(res.data.OutModel);
                        $('#standard').val(res.data.Standard);

                        $('#pickQty').val(res.data.PickQty);
                    } else { //不成功
                        if ($("#planQty").val() == $("#finishQty").val()) {
                            return;
                        }
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () { });
                    }
                });

            }

            //渲染表格数据				
            function refreshTable(list) {
                //先清空一下信息列表
                let trs = $("#tableBoxList tr")
                let len = trs.length
                for (i = len - 1; i >= 2; i--) {
                    trs[i].remove();
                }

                if (list != null && list.length > 0) { //成功

                    var arrTrs = new Array()
                    let idx = 0
                    for (var i in list) {
                        // list[i].BoxCode
                        var tr = $("#boxCell").eq(0).clone();
                        tr.appendTo("#tableBoxList");
                        // tr.attr('id', list[i].BoxCode)
                        idx++;
                        tr.attr('index', idx)
                        tr.find("td[name='boxNo']").html(list[i].BoxNo);
                        tr.find("td[name='qty']").html(list[i].Qty);

                        tr.show();
                        arrTrs[i] = tr
                    }
                    canPickBox = true

                } else { //不成功
                    layer.msg("无数据", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () { });
                    // $("#boxNum").val(0)
                }
            }
            //单拣货（确认按钮）
            form.on('submit(formPickScatter)', function (data) {

                if ($('#bar').val() == "") {
                    layer.msg("请选择出库单", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }); return;
                }
                if ($('#bar').val() == "") {
                    layer.msg("请选择物料-批次", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }); return;
                }
                if ($('#palletNo').val() == "") {
                    layer.msg("请输入托盘码", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }); return;
                }
                if (isContinue == "0") {
                    if ($('#boxNo').val() == "") {
                        layer.msg("请输入箱码", {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }); return;
                    }
                    if ($('#boxQty').val() == "") {
                        layer.msg("箱内数量为空，不能拣货", {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                        return;
                    }				
                }
                if (canPickBox == false) {

                    layer.msg("请求未完成，不要重复请求", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    });
                    return;
                }

                reqPickScatter()

                return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
            });

            //确认拣货 
            function reqPickScatter() {
                var param = {
                    "SoNo": $("#bar").val(),
                    "SoDetailId": $("#skuLotNo").val(),
                    "PalletNo": $('#palletNo').val(),
                    "BoxNo": $('#boxNo').val()
                }
                sendData(IP + "/PdaSo/SoSetPick", param, 'post', function (res) {
                    //console.log(res);

                    if (res.code == 0) { //成功
                        layer.msg(res.msg, {
                            icon: 1,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () {
                            canPickBox = true//回调
                            $("#boxNo").val('');
                            updateQtyList();
                            getBar();
                        });
                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () {
                            canPickBox = true;//回调
                        });
                    }
                });
            }

            //----------------------------------------------------------------------------------
            //主页及重新登录
            $("#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>

 Pda/js/public.js

@@ -2,7 +2,7 @@
// var IP = "https://localhost:44368";
//var IP = "http://localhost:13243/api";
//var IP = "http://localhost:50515/api";
var IP = "https://localhost:5001/api";
var IP = "https://localhost:44363/api";
//var IP = "http://192.168.1.2:8017/";
// var IP = "http://192.168.10.112/WmsService/";
// var IP = "http://192.168.1.226:8086";

 Wms/Model/ModelVm/PdaVm/PdaCrVm.cs

@@ -65,6 +65,10 @@
        /// </summary>
        public string AreaNo { get; set; }
        /// <summary>
        /// 目标储位
        /// </summary>
        public string LocatNoEnd { get; set; }
        /// <summary>
        /// 入库口
        /// </summary>
        public string Ruku { get; set; }

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -325,6 +325,14 @@
                            CreateUser = 0,
                            CreateTime = comTime
                        };
                        if (!string.IsNullOrEmpty(detail.Lot1))
                        {
                            sd1.ProductionTime = Convert.ToDateTime(detail.Lot1);//生产日期
                        }
                        if (!string.IsNullOrEmpty(detail.Lot2))
                        {
                            sd1.ExpirationTime = Convert.ToDateTime(detail.Lot2);//到期日期
                        }
                        var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == sd1.PalletNo && !string.IsNullOrEmpty(w.LocatNo));
                        if (palletData != null)
                        {
@@ -1188,7 +1196,15 @@
                    throw new Exception("未查询到托盘信息，请核实！");
                }
                // 验证入库单明细是否存在
                var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo && m.LotNo.Contains(model.LotNo));
                var detail = new BllArrivalNoticeDetail();
                if (string.IsNullOrEmpty(model.LotNo))
                {
                    detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo);
                }
                else
                {
                    detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo && m.LotNo.Contains(model.LotNo));
                }
                if (detail == null)
                {
                    throw new Exception("当前物料及批次与单据无关联，请核实!");
@@ -1327,14 +1343,23 @@
                    throw new Exception("当前托盘含有贴标物料信息，不能组托");
                }
                // 判断库存明细是否已有此托盘信息  
                var sd1 = Db.Queryable<DataStockDetail>()
                    .First(m => m.IsDel == "0" && m.ASNDetailNo == bind.ASNDetailNo && m.PalletNo == model.PalletNo && m.SkuNo == detail.SkuNo && m.LotNo == bind.LotNo);
                var sd1 = new DataStockDetail();
                if (!string.IsNullOrEmpty(bind.LotNo))
                {
                    sd1 = Db.Queryable<DataStockDetail>()
                    .First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo && m.SkuNo == detail.SkuNo && m.LotNo == bind.LotNo);//&& m.ASNDetailNo == bind.ASNDetailNo
                }
                else
                {
                    sd1 = Db.Queryable<DataStockDetail>()
                    .First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo && m.SkuNo == detail.SkuNo);// && m.ASNDetailNo == bind.ASNDetailNo
                }
                var sdId1 = 0;
                if (sd1 != null)
                {
                    sdId1 = sd1.Id;
                    // 库存已存在 更新数据
                    sd1.Qty = bind.Qty;
                    sd1.Qty += bind.Qty;
                    sd1.CompleteTime = comTime;
                    sd1.UpdateUser = userId;
                    sd1.UpdateTime = comTime;

 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs

@@ -836,7 +836,7 @@

                if (models.WareHouseNo == "W02")
                {
                    storageArea = await Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo != storageLocat.AreaNo && w.WareHouseNo == "W04" && (w.AreaNo == "B01" || w.AreaNo == "B02")).OrderBy(o => o.AreaNo).ToListAsync();
                    storageArea = await Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo != storageLocat.AreaNo && w.WareHouseNo == "W04" && (w.AreaNo == "B01" || w.AreaNo == "B02" || w.AreaNo == "B05")).OrderBy(o => o.AreaNo).ToListAsync();
                }
                else
                {
@@ -845,6 +845,29 @@
                
            }
            return storageArea;
        }
        /// <summary>
        /// 根据区域号获取储位地址集合
        /// </summary>
        /// <param name="areaNo"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public List<string> GetLocatByArea(string areaNo)
        {
            try
            {
                if (string.IsNullOrEmpty(areaNo))
                {
                    throw new Exception("请选择区域");
                }
                var _list = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.AreaNo == areaNo && w.WareHouseNo == "W04").Select(s => s.LocatNo).ToList();

                return _list;
            }
            catch (Exception ex)
            {
                throw new Exception(ex.Message);
            }
        }
        /// <summary>
        /// 获取已分配的出库单据
@@ -1056,7 +1079,7 @@
            }
        }*/

        public async Task AgvTransport(string palletNo, string areaNo, string ruku, string url, int userId)
        public async Task AgvTransport(string palletNo, string areaNo,string locatNoEnd, string ruku, string url, int userId)
        {
            try
            {
@@ -1091,7 +1114,14 @@
                    {
                        throw Oops.Bah("所选区域信息不存在,请检查!");
                    }
                    EndLocat = await GetLocat(areaNo);
                    if (!string.IsNullOrEmpty(locatNoEnd))
                    {
                        EndLocat = locatNoEnd;//指定储位地址
                    }
                    else
                    {
                        EndLocat = await GetLocat(areaNo);//系统分配储位地址
                    }                    
                }
                else
                {
@@ -1106,9 +1136,9 @@
                {
                    throw Oops.Bah("托盘储位信息不存在,请检查!");
                }
                if (stockDetail.WareHouseNo != "W04")
                if (stockDetail.WareHouseNo != "W04" && stockDetail.WareHouseNo != "W02")
                {
                    throw Oops.Bah("该托盘未在平库内,请检查!");
                    throw Oops.Bah("该托盘未在平库或货架库内,请检查!");
                }

                //起始储位信息
@@ -1120,7 +1150,7 @@
                //目标储位信息
                //var storageLocatEnd = new SysStorageLocat();

                var storageLocatEnd = await Db.Queryable<SysStorageLocat>().FirstAsync(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0");
                var storageLocatEnd = await Db.Queryable<SysStorageLocat>().FirstAsync(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0" && w.WareHouseNo == "W04" && w.AreaNo == areaNo);
                if (storageLocatEnd == null)
                {
                    throw Oops.Bah("目标储位信息不存在,请检查!");

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -23,6 +23,7 @@
using System.Threading.Tasks;
using Utility;
using WMS.BLL.Logic;
using System.Web;

namespace WMS.BLL.BllPdaServer
{
@@ -2093,6 +2094,49 @@
            return list;
        }

        /// <summary>
        /// 出库拣货获取扫描标签数量
        /// </summary>
        /// <param name="palletNo"></param>
        /// <param name="boxNo"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public decimal CheckBoxForPick(string palletNo ,string boxNo)
        {
            try
            {
                decimal boxNum = 0;
                if (string.IsNullOrEmpty(palletNo))
                {
                    throw new Exception("托盘条码不可为空!");
                }
                if (string.IsNullOrEmpty(boxNo))
                {
                    throw new Exception("标签条码不可为空!");
                }
                var boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo == boxNo && w.PalletNo == palletNo).ToList();
                if (boxInfo.Count <= 0)
                {
                    boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo2 == boxNo && w.PalletNo == palletNo).ToList();
                    if (boxInfo.Count <= 0)
                    {
                        boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo3 == boxNo && w.PalletNo == palletNo).ToList();
                    }
                }
                if (boxInfo == null || boxInfo.Count <= 0)
                {
                    throw new Exception("标签条码未在该托盘内!");
                }
                boxNum = boxInfo.Sum(s => s.Qty);

                return boxNum;
            }
            catch (Exception ex)
            {
                throw new Exception(ex.Message);
            }
        }

        //获取库内无箱码的托盘分配信息
        public async Task<List<BoxInfo>> GetAllotPlnInfo(string soDetailId, string palletNo)
        {
@@ -2830,6 +2874,11 @@
                        throw Oops.Bah("追溯条码和拣货数量不能同时输入");
                    }
                    boxInfos = await boxInfo.ToListAsync();

                    if (boxInfos[0].SkuNo != allot.SkuNo || boxInfos[0].LotNo != allot.LotNo)
                    {
                        throw Oops.Bah("箱码物料批次和选择物料批次不一致！");
                    }

                    var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToList();
                    if (biaoShi == "2") //散支拣货
@@ -3669,7 +3718,7 @@
            {
                throw Oops.Bah("未获取到对应储位信息，请检查!");
            }
            if (locat.Status != "3")
            if (locat.Status != "1")
            {
                throw Oops.Bah("当前储位不是有物品，请检查!");
            }
@@ -3752,7 +3801,7 @@
                #region 添加出库操作日志记录信息

                //添加操作日志记录
                var k = new OperationSOServer().AddLogOperationSo("出库作业", "拣货明细", soNo, "完成", $"用PDA完成了单据号为{soNo}的平库出库", userId);
                var k = new OperationSOServer().AddLogOperationSo("出库作业", "拣货明细", palletNo, "完成", $"用PDA完成了托盘号为{palletNo}的平库出库", userId);

                #endregion


 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -1067,10 +1067,10 @@
                        inspectStatus = "0,1";
                        break;
                    case "9"://生产领料出库
                        if (house != "W02")
                        {
                            throw new Exception("生产领料出库只能选择原料库");
                        }
                        //if (house != "W02")
                        //{
                        //    throw new Exception("生产领料出库只能选择原料库");
                        //}
                        skuType = "(0,1,3)";
                        inspectStatus = "1";
                        break;
@@ -1187,10 +1187,10 @@
                switch (model.WareHouseNo)
                {
                    case "W01"://成品库
                        if (skuList.Any(m => m.Type != "2"))
                        {
                            throw new Exception("仓库与出库物料不符");
                        }
                        //if (skuList.Any(m => m.Type != "2"))
                        //{
                        //    throw new Exception("仓库与出库物料不符");
                        //}
                        break;
                    case "W02"://原料库
                        if (skuList.Any(m => m.Type == "2"))
@@ -3338,6 +3338,22 @@
                throw new Exception(e.Message);
            }
        }
        public string GetHouseByPalletNo(string palletNo)
        {
            try
            {
                var datail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
                if (datail == null)
                {
                    throw new Exception("未查询到托盘信息");
                }
                return datail.WareHouseNo;
            }
            catch (Exception e)
            {
                throw new Exception(e.Message);
            }
        }

        public List<OutCommandDto> IssueOutHouseLk(string soNo, string outMode, int userId, string url, out string str)
        {

 Wms/WMS.BLL/HttpServer.cs

@@ -6,6 +6,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Utility.Tools;
using WMS.BLL.Logic;
using WMS.BLL.LogServer;
@@ -1992,7 +1993,64 @@
                throw new Exception(e.Message);
            }
        }
        /// <summary>
        /// PDA平库下发出库
        /// </summary>
        /// <param name="soNo"></param>
        /// <param name="detailId"></param>
        /// <param name="palletNo"></param>
        /// <param name="userId"></param>
        /// <exception cref="Exception"></exception>
        public void IssueOutHousePk(string soNo, string detailId, string palletNo, int userId)
        {
            try
            {
                var notice = Db.Queryable<BllExportNotice>().First(m => m.SONo == soNo && m.IsDel == "0");
                if (notice == null)
                {
                    throw new Exception($"未找到{soNo}出库单信息");
                }
                var detail=Db.Queryable<DataStockDetail>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
                if (detail.WareHouseNo != "W04")
                {
                    throw new Exception("仓库号错误");
                }
                var intDetailId = int.Parse(detailId);
                if (intDetailId <= 0)
                {
                    throw new Exception("选择的出库单明细参数错误");
                }
                //开启事务
                Db.BeginTran();

                notice.Status = "3";//正在进行
                Db.Updateable(notice).ExecuteCommand();

                //所有要出库的出库分配信息(未下发的信息和待拣货的信息)
                var allot = Db.Queryable<BllExportAllot>().Where(a => a.IsDel == "0" && a.PalletNo == palletNo && a.Status == "0").ToList();
                if (allot == null || allot.Count <= 0) //判断是否有需要下发的出库流水
                {
                    throw new Exception("当前出库单据无需要下发的托盘");
                }
                //出库流水（更改状态）
                foreach (var item in allot)
                {
                    item.Status = "2";
                    Db.Updateable(item).ExecuteCommand();
                }

                //添加操作日志记录
                var k = new OperationSOServer().AddLogOperationSo("PDA模块", "下发出库", soNo, "出库", $"点击出库按钮出库单号为：{soNo}的出库单", userId);
                //提交事务
                Db.CommitTran();
            }
            catch (Exception e)
            {
                //回滚事务
                Db.RollbackTran();
                throw new Exception(e.Message);
            }
        }

        #region MyRegion


 Wms/WMS.BLL/SysServer/StorageAreaServer.cs

@@ -155,24 +155,35 @@
                    return str;
                }
                //获取立体库最大编码
                var area = Db.Queryable<SysStorageArea>().Where(a => a.IsDel == "0").OrderByDescending(a=>a.CreateTime).First();
                //验证是否存在区域信息
                if (area == null)
                var area = new SysStorageArea();
                string areaStr = "A";
                if (model.WareHouseNo == "W04")
                {
                    model.AreaNo = "A01";
                    area = Db.Queryable<SysStorageArea>().Where(a => a.IsDel == "0" && a.WareHouseNo == "W04").OrderByDescending(a => a.CreateTime).First();
                    areaStr = "B";
                }
                else
                {
                    var arr = area.AreaNo.Split("A");
                    area = Db.Queryable<SysStorageArea>().Where(a => a.IsDel == "0" && (a.WareHouseNo == "W01" || a.WareHouseNo == "W02")).OrderByDescending(a => a.CreateTime).First();
                }
                
                //验证是否存在区域信息
                if (area == null)
                {
                    model.AreaNo = $"{areaStr}01";
                }
                else
                {
                    var arr = area.AreaNo.Split(areaStr);
                    int a = int.Parse(arr[1]) + 1;
                    //判断是否小于10
                    if (a < 10)
                    {
                        model.AreaNo = "A0" + (int.Parse(arr[1]) + 1).ToString();
                        model.AreaNo = $"{areaStr}0" + (int.Parse(arr[1]) + 1).ToString();
                    }
                    else
                    {
                        model.AreaNo = "A" + (int.Parse(arr[1]) + 1).ToString();
                        model.AreaNo = $"{areaStr}" + (int.Parse(arr[1]) + 1).ToString();
                    }

                }

 Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs

@@ -175,6 +175,8 @@
        /// <returns>出库单的仓库号</returns>
        string GetHouseBySo(string soNo);

        string GetHouseByPalletNo(string palletNo);

        /// <summary>
        /// 下发出库 立库
        /// </summary>

 Wms/WMS.IBLL/IHttpServer.cs

@@ -91,6 +91,16 @@
        /// <param name="str"></param>
        /// <returns></returns>
        List<OutCommandDto> IssueOutHouseLk(string soNo, string detailId, string outMode, string palletNo, int userId, string url, out string str);

        /// <summary>
        /// PDA平库下发出库
        /// </summary>
        /// <param name="soNo"></param>
        /// <param name="detailId"></param>
        /// <param name="palletNo"></param>
        /// <param name="userId"></param>
        /// <exception cref="Exception"></exception>
        void IssueOutHousePk(string soNo, string detailId, string palletNo, int userId);
        #endregion



 Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs

@@ -110,6 +110,13 @@
        /// <returns></returns>
        Task<List<SysStorageArea>> GetStorageArea(string palletNo);
        /// <summary>
        /// 根据区域号获取储位地址集合
        /// </summary>
        /// <param name="areaNo"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        List<string> GetLocatByArea(string areaNo);
        /// <summary>
        /// 获取已分配的出库单据
        /// </summary>
        /// <returns></returns>
@@ -133,7 +140,7 @@
        /// <param name="areaNo"></param>
        /// <param name="ruku"></param>
        /// <param name="url"></param>
        Task AgvTransport(string palletNo, string areaNo, string ruku, string url, int userId);
        Task AgvTransport(string palletNo, string areaNo, string locatNoEnd, string ruku, string url, int userId);
        /// <summary>
        /// 呼叫agv转运空托盘
        /// </summary>

 Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs

@@ -122,7 +122,14 @@
        /// <param name="boxNo3">支/袋码</param>
        /// <returns></returns>
        Task<List<BoxInfo>> GetDataComBoxInfo(string soDetailId, string palletNo, string boxNo, string boxNo3);

        /// <summary>
        /// 出库拣货获取扫描标签数量
        /// </summary>
        /// <param name="palletNo"></param>
        /// <param name="boxNo"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        decimal CheckBoxForPick(string palletNo, string boxNo);
        /// <summary>
        /// 获取库内无箱码的托盘分配信息
        /// </summary>

 Wms/Wms/Controllers/DownApiController.cs

@@ -174,23 +174,38 @@
                {
                    return Ok(new HttpReturnModel { Success = "-1", Message = "未获取到当前操作人信息"});
                }
                //验证出库口
                if (string.IsNullOrWhiteSpace(outMode))
                {
                    return Ok(new HttpReturnModel { Success = "-1", Message = "请选择出库地址" });
                }
                
                var house = _exNoticeSvc.GetHouseBySo(soNo);
                if (house != "W01")
                { 
                    house= _exNoticeSvc.GetHouseByPalletNo(palletNo);
                }
                if (house == "W01")
                {
                    //验证出库口
                    if (string.IsNullOrWhiteSpace(outMode))
                    {
                        return Ok(new HttpReturnModel { Success = "-1", Message = "请选择出库地址" });
                    }
                    //var list = _exNoticeSvc.IssueOutHouseMk(soNo, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);

                    return Ok(new HttpReturnModel { Success = "0", Message = "str", Data = "list" });
                }
                else if (house == "W02")
                {
                    var list = _http.IssueOutHouseLk(soNo,soDetailId, outMode,palletNo, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
                    //验证出库口
                    if (string.IsNullOrWhiteSpace(outMode))
                    {
                        return Ok(new HttpReturnModel { Success = "-1", Message = "请选择出库地址" });
                    }
                    var list = _http.IssueOutHouseLk(soNo, soDetailId, outMode, palletNo, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);

                    return Ok(new HttpReturnModel { Success = "0", Message = str, Data = list});
                    return Ok(new HttpReturnModel { Success = "0", Message = str, Data = list });
                }
                else if (house == "W04")
                {
                    _http.IssueOutHousePk(soNo, soDetailId, palletNo, int.Parse(userId));
                    return Ok(new HttpReturnModel { Success = "0", Message = "下发成功" });
                }
                else
                {

 Wms/Wms/Controllers/PdaCrController.cs

@@ -19,6 +19,7 @@
using Microsoft.Extensions.Options;
using Model.ModelDto.DataDto;
using Model.ModelDto;
using Model.ModelVm.BllSoVm;

namespace Wms.Controllers
{
@@ -237,7 +238,26 @@
        [UnitOfWork]
        public async Task AgvTransport(PdaAgvTransportVm model)
        {
            await _pdaCrSvc.AgvTransport(model.PalletNo, model.AreaNo, model.Ruku, _config.WcsHost+ _config.IssueComApiUrl, _userManager.UserId);
            await _pdaCrSvc.AgvTransport(model.PalletNo, model.AreaNo, model.LocatNoEnd, model.Ruku, _config.WcsHost + _config.IssueComApiUrl, _userManager.UserId);
        }
        /// <summary>
        /// 根据区域号获取储位地址集合
        /// </summary>
        /// <param name="areaNo"></param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetLocatByArea(string areaNo)
        {
            try
            {
                var _list = _pdaCrSvc.GetLocatByArea(areaNo);

                return Ok(new { code = 0, count = 0, msg = "获取成功", data = _list });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }
        /// <summary>
        /// 呼叫agv转运空托盘

 Wms/Wms/Controllers/PdaSoController.cs

@@ -153,6 +153,27 @@
        }

        /// <summary>
        /// 出库拣货获取扫描标签数量
        /// </summary>
        /// <param name="palletNo"></param>
        /// <param name="boxNo"></param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult CheckBoxForPick(string palletNo, string boxNo)
        {
            try
            {
                var boxNum = _pdaSoSvc.CheckBoxForPick(palletNo, boxNo);

                return Ok(new { code = 0, msg = "拣货明细信息", data = boxNum });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }

        /// <summary>
        /// 出库pda拣货
        /// </summary>
        /// <param name="model">SoDetailId:出库单明细ID、PalletNo:托盘码</param>