JC34WMS.git - Gitblit

parent: 2056ae6f | 补丁 | 提交 | ignore whitespace

chengsc

2025-06-04 32cfcc52c647b5dab8db7c5ca7b54ab3041e9d36

修改车间出入库

7个文件已修改

	Pda/View/AsnSetting/WorkshopIn.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Pda/View/SoSetting/WorkshopOut.html	549 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs	145 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/Wms/Controllers/PdaAsnController.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/Wms/Controllers/PdaSoController.cs	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Pda/View/AsnSetting/WorkshopIn.html

@@ -420,10 +420,12 @@

            //箱回车事件
            function checkBoxInfo() {
                
                
                var param = {
                    "BoxNo": $("#BoxCode").val(),
                    "boxNo": $("#BoxCode").val(),
                }
                sendData(IP + "/PdaAsn/GetWmsBoxInfos", param, 'post', function (res) {
                synData(IP + "/PdaAsn/GetWmsBoxInfos", param, 'get', function (res) {
                    
                    if (res.code == 0) { //成功
                        $("#BoxNum").val(res.data[0].Qty);

 Pda/View/SoSetting/WorkshopOut.html

@@ -0,0 +1,549 @@
<!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>

            <button id="option1" class="layout-btn" type="button">标签</button>
            <button id="option2" class="layout-btn" type="button">数量</button>
            <br /><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-input">
                            <label class="layui-form-label" lang>托盘条码：</label>
                            <div class="layui-input-block">
                                <input id="PalletNo" 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>
                        
                        <table class="layout-tbl-input" border="" cellspacing="" cellpadding="">
                            <tr>
                                <td>
                                    <div id="" class="layui-form-item layout-boxinfo">
                                        <label class="layui-form-label" style=" width: 21%;" lang>批次:</label>
                                        <div class="layui-input-block" style=" width: 79%;margin-left: 21%;" >
                                            <input id="LotNo" 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" style=" width: 21%;" lang>物料名称：</label>
                                        <div class="layui-input-block" style=" width: 79%;margin-left: 21%;" >
                                            <input id="SkuName" 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>

            </div>
            <!-- 无码 -->
            <div id="content2">
                <div id="zongDiv2" class="layout-bill-info" style="height: 255px;">
                    <form class="layui-form" id="form2" action="">
                       <div id="" class="layui-form-item layout-input">
                            <label class="layui-form-label" lang>物料编码：</label>
                            <div class="layui-input-block">
                                <input id="SkuNo" 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="LotNo2" 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="PalletNo2" 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="SkuQty2" type="number" lay-verify="stock" lang langholder
                                    placeholder="请输入物料数量" autocomplete="off" class="layui-input"
                                    oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
                            </div>
                        </div>
                        <div id="" class="layui-form-item layout-dropdownlist">
                            <label class="layui-form-label" lang>车间：</label>
                            <div class="layui-input-block" id="selectAreaDiv2">
                                <select id="area2" lay-filter="getarea2" lay-search>
                                    <option value="B06">1002</option>
                                    <option value="B09">1003一楼</option>
                                    <option value="B07">1003二楼</option>
                                </select>
                                <img src="/assets/down_arraw.png">
                            </div>
                        </div>
                        <table class="layout-tbl-submit" border="" cellspacing="" cellpadding="">
                            <tr>
                                <td style="width: 23%;"></td>
                                <td>
                                    <button class="layout-btn layout-btn-red" lang type="button" lay-submit
                                        lay-filter="formBind">出库</button>
                                </td>
                                <td style="width: 33%;"></td>

                            </tr>
                        </table>

                    </form>
                </div>

                <br>
                <br>
                <div id="demodiv1">
                    <br><br><br><br><br><br><br>
                </div>


                <!-- <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>
                            <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

            /* 标签切换代码 */
            $('#demodiv').hide();
            $('#demodiv1').hide();
            var xianshiyemian = 0;

            $('#option1').attr("style", "background-color: red;width: 50%;float: left;text-align: center;"); //选中后颜色
            $('#option2').attr("style", "background-color: #999;width: 50%;float: right;text-align: center;"); //默认颜色
            $('#content2').hide();
            $(document).ready(function () {
                $('#option1').click(function () {
                    // qingkong();
                    xianshiyemian = 0;
                    $('#content1').show();
                    $('#option1').attr("style", "background-color: red;width: 50%;float: left;text-align: center;"); //选中后颜色

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

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


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

                });
            });

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

            initLanguage()
            setLanguage()

             
            //是否连续组托
            isContinue = "0";


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

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

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

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

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

                            $("#SkuQty").focus();

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

            }


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

            //箱回车事件
            function checkBoxInfo() {
                var param = {
                    "BoxNo": $("#BoxCode").val(),
                }
                sendData(IP + "/PdaSo/GetWmsBoxInfos", param, 'get', function (res) {
                    
                    if (res.code == 0) { //成功
                        $("#SkuName").val(res.data[0].SkuName);
                        $("#LotNo").val(res.data[0].LotNo);
                        
                    } else { //不成功
                        layer.msg(res.msg, {
                                icon: 2,
                                time: 2000 //2秒关闭（如果不配置，默认是3秒）
                            });
                         
                    }
                });

            } 
            
            //绑定到托盘事件
            form.on('submit(formBind)', function (data) {
                if (xianshiyemian == 0) {
                    
                    if ($("#PalletNo").val() == "") {
                        layer.msg('请扫描托盘条码', {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                        return;
                    }
                    if ($("#BoxCode").val() == "") {
                        layer.msg('请扫描外箱条码', {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                        return;
                    }
                    var param = {
                        PalletNo: $("#PalletNo").val(),
                        BoxNo: $("#BoxCode").val(),
                        TableType: xianshiyemian,
                    }
                    //组盘
                    sendData(IP + "/PdaSo/ChejianPick", param, 'post', function (res) {
                        if (res.code == 0) { //成功
                            layer.msg(res.msg, {
                                icon: 1,
                                time: 1000 //2秒关闭（如果不配置，默认是3秒）
                            }, function () {
                                $("#BoxCode").val("");
                                $("#SkuName").val("");
                                $("#LotNo").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 ($("#SkuNo").val() == "") {
                        layer.msg('请输入物料', {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                        return;
                    }
                    if ($("#PalletNo2").val() == "") {
                        layer.msg('请扫描托盘条码', {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                        return;
                    }
                     var param = {
                        PalletNo: $("#PalletNo2").val(),
                        SkuNo: $("#SkuNo").val(),
                        LotNo: $("#LotNo2").val(),
                        SkuQty: parseFloat($("#SkuQty2").val()), //物料数量
                        AreaNo:$("#area").val(),
                        TableType: xianshiyemian,
                    }
                    console.log(param)
                    //组盘
                    sendData(IP + "/PdaAsn/ChejianIn", param, 'post', function (res) {
                        if (res.code == 0) { //成功
                            layer.msg(res.msg, {
                                icon: 1,
                                time: 1000 //2秒关闭（如果不配置，默认是3秒）
                            }, function () {
                                $("#PalletNo2").val("");
                                $("#SkuNo").val("");
                                $("#SkuQty2").val("");
                                $("#LotNo2").val("");
                                 
                            });
                        } else { //不成功
                            layer.msg(res.msg, {
                                icon: 2,
                                time: 2000 //2秒关闭（如果不配置，默认是3秒）
                            }, function () {
                                //回调
                            });
                        }
                    });
                }

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

            

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

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

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

</html>

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -2530,9 +2530,15 @@
                }
                else
                {
                    var sd2 = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo && m.IsDel == "0" && !string.IsNullOrWhiteSpace(m.AreaNo));
                    if (sd2.Count(m=>m.AreaNo!= areaNo) > 0)
                    {
                        throw new Exception("当前托盘位置与选择的不同，请核实");
                    }
                    // 库存不存在 插入数据
                    sd1 = new DataStockDetail()
                    {
                        ASNNo = "",
                        LotNo = boxInfoOne.LotNo,
                        LotText = boxInfoOne.LotText,
                        SupplierLot = boxInfoOne.SupplierLot,

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -1475,6 +1475,151 @@
            }
        }

        //车间pda拣货
        public async Task ChejianPick(string palletNo, string boxNo, int userId)
        {
            Db.BeginTran();
            try
            {
                #region 判断

                if (string.IsNullOrWhiteSpace(palletNo))
                {
                    throw Oops.Bah("托盘码不能为空");
                }
                if (string.IsNullOrEmpty(boxNo))
                {
                    throw Oops.Bah("追溯条码和拣货数量不能同时输入");
                }

                //箱码明细
                List<DataBoxInfo> boxInfos;
                var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
                if (await boxInfo.CountAsync() == 0)
                {
                    throw Oops.Bah("未查询到该箱码及追溯码的信息");
                }
                boxInfos = await boxInfo.ToListAsync();

                //库存明细
                var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNo && m.SkuNo == boxInfos.First().SkuNo && m.LotNo == boxInfos.First().LotNo);
                if (stockDetail == null)
                {
                    throw Oops.Bah("未查询到该托盘分配的库存明细信息！");
                }
                var areaList = new List<string>() { "B06", "B07", "B09" };
                if (!areaList.Contains(stockDetail.AreaNo))
                {
                    throw Oops.Bah("托盘不是车间托盘！");
                }
                //库存总表
                var stock = await Db.Queryable<DataStock>().FirstAsync(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
                if (stock == null)
                {
                    throw Oops.Bah("未查询到该托盘分配的库存信息！");
                }
                #endregion


                var pickQty = boxInfos.Sum(m => m.Qty);


                //删除或修改库存明细
                stockDetail.BitPalletMark = "1";//修改为零托标识
                stockDetail.Qty -= pickQty;
                if (stockDetail.Qty == stockDetail.LockQty)
                {
                    stockDetail.Status = "2";
                }
                else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
                {
                    stockDetail.Status = "1";
                }
                else
                {
                    stockDetail.Status = "0";
                }

                if (stockDetail.Qty <= 0)
                {
                    await Db.Deleteable(stockDetail).ExecuteCommandAsync();
                }
                else
                {
                    await Db.Updateable(stockDetail).ExecuteCommandAsync();
                }   
                stock.Qty -= pickQty;
                //stock.LockQty -= pickQty;
                if (stock.Qty <= 0)
                {
                    await Db.Deleteable(stock).ExecuteCommandAsync();
                }
                else
                {
                    await Db.Updateable(stock).ExecuteCommandAsync();
                }
                var num2 = await Db.Queryable<DataStockDetail>().CountAsync(m => m.IsDel == "0" && m.PalletNo == palletNo);
                if (num2 <= 0)
                {
                    //改变托盘状态
                    var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == palletNo && m.IsDel == "0");
                    if (pallet == null)
                    {
                        throw Oops.Bah("未在托盘表中查询到托盘信息");
                    }
                    pallet.Status = "0";
                    await Db.Updateable(pallet).ExecuteCommandAsync();
                }
                 
                //添加操作日志记录
                var k = new OperationSOServer().AddLogOperationSo("PDA模块", "车间出库", boxNo, "拣货", $"在PDA上对箱号为：{boxNo}的托盘码为：{palletNo}的拣货操作", userId);
                Db.CommitTran();
            }
            catch (AppFriendlyException e)
            {
                Db.RollbackTran();
            }
            catch (Exception e)
            {
                Db.RollbackTran();
                throw new Exception(e.Message);
            }
        }

        /// <summary>
        /// 根据箱码获取标签箱码信息（车间入库-获取WMS生成的箱信息）
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public List<BoxInfoDto> GetWmsBoxInfos(string boxNo)
        {
            try
            {
                if (string.IsNullOrEmpty(boxNo))
                {
                    throw new Exception("请扫描外箱条码!");
                }

                string sqlString = $@"SELECT BoxNo, SkuNo, SkuName, LotNo FROM DataBoxInfo 
                                        WHERE IsDel = '0' and BoxNo = '{boxNo}'
                                        GROUP BY BoxNo,SkuNo,SkuName,LotNo; ";
                var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);

                if (models.Count != 0)
                {
                    return models;
                }
                else
                {
                    throw new Exception("没有查询到箱码信息");
                }

            }
            catch (Exception ex)
            {
                throw ex;
            }
        }

        #endregion


 Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs

@@ -37,6 +37,11 @@
        /// <param name="userId"></param>
        Task SoSetQtyPinPick34(string soNo, string soDetailId, string palletNo, string PickQty, string palletNoNew, int userId);


        Task ChejianPick(string palletNo, string boxNo, int userId);

        List<BoxInfoDto> GetWmsBoxInfos(string boxNo);

        #endregion

        /// <summary>

 Wms/Wms/Controllers/PdaAsnController.cs

@@ -197,7 +197,7 @@
        /// </summary>
        /// <param name="boxNo">BoxNo:箱号</param>
        /// <returns></returns>
        [HttpPost]
        [HttpGet]
        public IActionResult GetWmsBoxInfos(string boxNo)
        {
            try

 Wms/Wms/Controllers/PdaSoController.cs

@@ -174,6 +174,25 @@
            await _pdaSoSvc.SoSetQtyPick(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, _userManager.UserId);
        }

        /// <summary>
        /// 根据箱码获取标签箱码信息（车间入库-获取WMS生成的箱信息）
        /// </summary>
        /// <param name="boxNo">BoxNo:箱号</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetWmsBoxInfos(string boxNo)
        {
            try
            {
                var models = _pdaSoSvc.GetWmsBoxInfos(boxNo);

                return Ok(new { code = 0, msg = "标签箱码信息", data = models });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }

        /// <summary>
        /// 空托出库
@@ -298,6 +317,18 @@
        {
            await _pdaSoSvc.SoSetQtyPinPick34(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, model.PalletNoNew, _userManager.UserId);
        }

        /// <summary>
        /// 车间pda拣货-标签
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task ChejianPick(PdaSoVm model)
        {
            await _pdaSoSvc.ChejianPick(model.PalletNo, model.BoxNo, _userManager.UserId);
        }

        #endregion

        #region JC23版取样

			@@ -420,10 +420,12 @@

			//箱回车事件
			function checkBoxInfo() {


			var param = {
			"BoxNo": $("#BoxCode").val(),
			"boxNo": $("#BoxCode").val(),
			}
			sendData(IP + "/PdaAsn/GetWmsBoxInfos", param, 'post', function (res) {
			synData(IP + "/PdaAsn/GetWmsBoxInfos", param, 'get', function (res) {

			if (res.code == 0) { //成功
			$("#BoxNum").val(res.data[0].Qty);

			@@ -0,0 +1,549 @@
			<!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>

			<button id="option1" class="layout-btn" type="button">标签</button>
			<button id="option2" class="layout-btn" type="button">数量</button>
			<br /><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-input">
			<label class="layui-form-label" lang>托盘条码：</label>
			<div class="layui-input-block">
			<input id="PalletNo" 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>

			<table class="layout-tbl-input" border="" cellspacing="" cellpadding="">
			<tr>
			<td>
			<div id="" class="layui-form-item layout-boxinfo">
			<label class="layui-form-label" style=" width: 21%;" lang>批次:</label>
			<div class="layui-input-block" style=" width: 79%;margin-left: 21%;" >
			<input id="LotNo" 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" style=" width: 21%;" lang>物料名称：</label>
			<div class="layui-input-block" style=" width: 79%;margin-left: 21%;" >
			<input id="SkuName" 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>

			</div>
			<!-- 无码 -->
			<div id="content2">
			<div id="zongDiv2" class="layout-bill-info" style="height: 255px;">
			<form class="layui-form" id="form2" action="">
			<div id="" class="layui-form-item layout-input">
			<label class="layui-form-label" lang>物料编码：</label>
			<div class="layui-input-block">
			<input id="SkuNo" 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="LotNo2" 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="PalletNo2" 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="SkuQty2" type="number" lay-verify="stock" lang langholder
			placeholder="请输入物料数量" autocomplete="off" class="layui-input"
			oninput="value=value.replace(/^(0+)\|[^\d]+/g,'')">
			</div>
			</div>
			<div id="" class="layui-form-item layout-dropdownlist">
			<label class="layui-form-label" lang>车间：</label>
			<div class="layui-input-block" id="selectAreaDiv2">
			<select id="area2" lay-filter="getarea2" lay-search>
			<option value="B06">1002</option>
			<option value="B09">1003一楼</option>
			<option value="B07">1003二楼</option>
			</select>
			<img src="/assets/down_arraw.png">
			</div>
			</div>
			<table class="layout-tbl-submit" border="" cellspacing="" cellpadding="">
			<tr>
			<td style="width: 23%;"></td>
			<td>
			<button class="layout-btn layout-btn-red" lang type="button" lay-submit
			lay-filter="formBind">出库</button>
			</td>
			<td style="width: 33%;"></td>

			</tr>
			</table>

			</form>
			</div>

			<br>
			<br>
			<div id="demodiv1">
			<br><br><br><br><br><br><br>
			</div>


			<!-- <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>
			<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

			/* 标签切换代码 */
			$('#demodiv').hide();
			$('#demodiv1').hide();
			var xianshiyemian = 0;

			$('#option1').attr("style", "background-color: red;width: 50%;float: left;text-align: center;"); //选中后颜色
			$('#option2').attr("style", "background-color: #999;width: 50%;float: right;text-align: center;"); //默认颜色
			$('#content2').hide();
			$(document).ready(function () {
			$('#option1').click(function () {
			// qingkong();
			xianshiyemian = 0;
			$('#content1').show();
			$('#option1').attr("style", "background-color: red;width: 50%;float: left;text-align: center;"); //选中后颜色

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

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


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

			});
			});

			/——————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————/

			initLanguage()
			setLanguage()


			//是否连续组托
			isContinue = "0";


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

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

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

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

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

			$("#SkuQty").focus();

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

			}


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

			//箱回车事件
			function checkBoxInfo() {
			var param = {
			"BoxNo": $("#BoxCode").val(),
			}
			sendData(IP + "/PdaSo/GetWmsBoxInfos", param, 'get', function (res) {

			if (res.code == 0) { //成功
			$("#SkuName").val(res.data[0].SkuName);
			$("#LotNo").val(res.data[0].LotNo);

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

			}
			});

			}

			//绑定到托盘事件
			form.on('submit(formBind)', function (data) {
			if (xianshiyemian == 0) {

			if ($("#PalletNo").val() == "") {
			layer.msg('请扫描托盘条码', {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			});
			return;
			}
			if ($("#BoxCode").val() == "") {
			layer.msg('请扫描外箱条码', {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			});
			return;
			}
			var param = {
			PalletNo: $("#PalletNo").val(),
			BoxNo: $("#BoxCode").val(),
			TableType: xianshiyemian,
			}
			//组盘
			sendData(IP + "/PdaSo/ChejianPick", param, 'post', function (res) {
			if (res.code == 0) { //成功
			layer.msg(res.msg, {
			icon: 1,
			time: 1000 //2秒关闭（如果不配置，默认是3秒）
			}, function () {
			$("#BoxCode").val("");
			$("#SkuName").val("");
			$("#LotNo").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 ($("#SkuNo").val() == "") {
			layer.msg('请输入物料', {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			});
			return;
			}
			if ($("#PalletNo2").val() == "") {
			layer.msg('请扫描托盘条码', {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			});
			return;
			}
			var param = {
			PalletNo: $("#PalletNo2").val(),
			SkuNo: $("#SkuNo").val(),
			LotNo: $("#LotNo2").val(),
			SkuQty: parseFloat($("#SkuQty2").val()), //物料数量
			AreaNo:$("#area").val(),
			TableType: xianshiyemian,
			}
			console.log(param)
			//组盘
			sendData(IP + "/PdaAsn/ChejianIn", param, 'post', function (res) {
			if (res.code == 0) { //成功
			layer.msg(res.msg, {
			icon: 1,
			time: 1000 //2秒关闭（如果不配置，默认是3秒）
			}, function () {
			$("#PalletNo2").val("");
			$("#SkuNo").val("");
			$("#SkuQty2").val("");
			$("#LotNo2").val("");

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

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



			/——————————————————————————————————————————————————————————/

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

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

			</html>

			@@ -2530,9 +2530,15 @@
			}
			else
			{
			var sd2 = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo && m.IsDel == "0" && !string.IsNullOrWhiteSpace(m.AreaNo));
			if (sd2.Count(m=>m.AreaNo!= areaNo) > 0)
			{
			throw new Exception("当前托盘位置与选择的不同，请核实");
			}
			// 库存不存在插入数据
			sd1 = new DataStockDetail()
			{
			ASNNo = "",
			LotNo = boxInfoOne.LotNo,
			LotText = boxInfoOne.LotText,
			SupplierLot = boxInfoOne.SupplierLot,

			@@ -1475,6 +1475,151 @@
			}
			}

			//车间pda拣货
			public async Task ChejianPick(string palletNo, string boxNo, int userId)
			{
			Db.BeginTran();
			try
			{
			#region 判断

			if (string.IsNullOrWhiteSpace(palletNo))
			{
			throw Oops.Bah("托盘码不能为空");
			}
			if (string.IsNullOrEmpty(boxNo))
			{
			throw Oops.Bah("追溯条码和拣货数量不能同时输入");
			}

			//箱码明细
			List<DataBoxInfo> boxInfos;
			var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
			if (await boxInfo.CountAsync() == 0)
			{
			throw Oops.Bah("未查询到该箱码及追溯码的信息");
			}
			boxInfos = await boxInfo.ToListAsync();

			//库存明细
			var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNo && m.SkuNo == boxInfos.First().SkuNo && m.LotNo == boxInfos.First().LotNo);
			if (stockDetail == null)
			{
			throw Oops.Bah("未查询到该托盘分配的库存明细信息！");
			}
			var areaList = new List<string>() { "B06", "B07", "B09" };
			if (!areaList.Contains(stockDetail.AreaNo))
			{
			throw Oops.Bah("托盘不是车间托盘！");
			}
			//库存总表
			var stock = await Db.Queryable<DataStock>().FirstAsync(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
			if (stock == null)
			{
			throw Oops.Bah("未查询到该托盘分配的库存信息！");
			}
			#endregion


			var pickQty = boxInfos.Sum(m => m.Qty);


			//删除或修改库存明细
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= pickQty;
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			stockDetail.Status = "2";
			}
			else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
			{
			stockDetail.Status = "1";
			}
			else
			{
			stockDetail.Status = "0";
			}

			if (stockDetail.Qty <= 0)
			{
			await Db.Deleteable(stockDetail).ExecuteCommandAsync();
			}
			else
			{
			await Db.Updateable(stockDetail).ExecuteCommandAsync();
			}
			stock.Qty -= pickQty;
			//stock.LockQty -= pickQty;
			if (stock.Qty <= 0)
			{
			await Db.Deleteable(stock).ExecuteCommandAsync();
			}
			else
			{
			await Db.Updateable(stock).ExecuteCommandAsync();
			}
			var num2 = await Db.Queryable<DataStockDetail>().CountAsync(m => m.IsDel == "0" && m.PalletNo == palletNo);
			if (num2 <= 0)
			{
			//改变托盘状态
			var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == palletNo && m.IsDel == "0");
			if (pallet == null)
			{
			throw Oops.Bah("未在托盘表中查询到托盘信息");
			}
			pallet.Status = "0";
			await Db.Updateable(pallet).ExecuteCommandAsync();
			}

			//添加操作日志记录
			var k = new OperationSOServer().AddLogOperationSo("PDA模块", "车间出库", boxNo, "拣货", $"在PDA上对箱号为：{boxNo}的托盘码为：{palletNo}的拣货操作", userId);
			Db.CommitTran();
			}
			catch (AppFriendlyException e)
			{
			Db.RollbackTran();
			}
			catch (Exception e)
			{
			Db.RollbackTran();
			throw new Exception(e.Message);
			}
			}

			/// <summary>
			/// 根据箱码获取标签箱码信息（车间入库-获取WMS生成的箱信息）
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public List<BoxInfoDto> GetWmsBoxInfos(string boxNo)
			{
			try
			{
			if (string.IsNullOrEmpty(boxNo))
			{
			throw new Exception("请扫描外箱条码!");
			}

			string sqlString = $@"SELECT BoxNo, SkuNo, SkuName, LotNo FROM DataBoxInfo
			WHERE IsDel = '0' and BoxNo = '{boxNo}'
			GROUP BY BoxNo,SkuNo,SkuName,LotNo; ";
			var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);

			if (models.Count != 0)
			{
			return models;
			}
			else
			{
			throw new Exception("没有查询到箱码信息");
			}

			}
			catch (Exception ex)
			{
			throw ex;
			}
			}

			#endregion

			@@ -37,6 +37,11 @@
			/// <param name="userId"></param>
			Task SoSetQtyPinPick34(string soNo, string soDetailId, string palletNo, string PickQty, string palletNoNew, int userId);


			Task ChejianPick(string palletNo, string boxNo, int userId);

			List<BoxInfoDto> GetWmsBoxInfos(string boxNo);

			#endregion

			/// <summary>

			@@ -197,7 +197,7 @@
			/// </summary>
			/// <param name="boxNo">BoxNo:箱号</param>
			/// <returns></returns>
			[HttpPost]
			[HttpGet]
			public IActionResult GetWmsBoxInfos(string boxNo)
			{
			try

			@@ -174,6 +174,25 @@
			await _pdaSoSvc.SoSetQtyPick(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, _userManager.UserId);
			}

			/// <summary>
			/// 根据箱码获取标签箱码信息（车间入库-获取WMS生成的箱信息）
			/// </summary>
			/// <param name="boxNo">BoxNo:箱号</param>
			/// <returns></returns>
			[HttpGet]
			public IActionResult GetWmsBoxInfos(string boxNo)
			{
			try
			{
			var models = _pdaSoSvc.GetWmsBoxInfos(boxNo);

			return Ok(new { code = 0, msg = "标签箱码信息", data = models });
			}
			catch (Exception e)
			{
			return Ok(new { code = 1, msg = e.Message });
			}
			}

			/// <summary>
			/// 空托出库
			@@ -298,6 +317,18 @@
			{
			await _pdaSoSvc.SoSetQtyPinPick34(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, model.PalletNoNew, _userManager.UserId);
			}

			/// <summary>
			/// 车间pda拣货-标签
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			[HttpPost]
			public async Task ChejianPick(PdaSoVm model)
			{
			await _pdaSoSvc.ChejianPick(model.PalletNo, model.BoxNo, _userManager.UserId);
			}

			#endregion

			#region JC23版取样