Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

test

6 小时以前 e9fa2cd033cc5399a4a23601f8155a8cd2079aab

Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

 HTML/views/SOSetting/ExportNotice.html

@@ -490,6 +490,7 @@
                { field: 'SONo', title: '出库单号', align: 'center', fixed: 'left', width: 165, "disabled": true },
                { field: 'Type', title: '单据类型', align: 'center', templet: '#templetType' , width: 120,},
                { field: 'Status', title: '执行状态', align: 'center', templet: '#templetStatus', width: 90, },
                { field: 'OrderCode', title: '下发单号', align: 'center', width: 180 },
                { field: 'LogisticsName', title: '承运商', align: 'center', width: 120, },
                { field: 'CustomerName', title: '客户名称', align: 'center', width: 120, },
                { field: 'WareHouseName', title: '仓库', align: 'center', width: 90, },

 Pda/View/SoSetting/productOutCode.html

@@ -197,7 +197,7 @@
                                <tr>
                                    <td colspan="3">
                                        <div class="layui-form-item">
                                            <label class="layui-form-label" style="width: 17%;">SAP单号：</label>
                                            <label class="layui-form-label" style="width: 17%;">下发单号：</label>
                                            <div class="layui-input-block" style="width: 83%;margin-left:17%;">
                                                <input id="OrderCode" type="text" lay-verify="" disabled placeholder=""
                                                    class="layui-input">
@@ -374,6 +374,7 @@
            $("#palletNo").focus();//光标默认选中        

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

@@ -407,11 +408,31 @@

            form.on('switch(IsZhengTuo)', function (obj) {
                if (obj.elem.checked) {
                    var boxNum=0;
                    var param = {
                        "PalletNo": $("#palletNo").val()
                    }
                    synData(IP + "/PdaSo/CheckBoxForPick", param, 'get', function (res) {
                        if (res.code == 0) { //成功 
                            boxNum=res.data
                            $('#scanQty').val(boxNum);

                        } else { //不成功
                            layer.msg(res.msg, {
                                icon: 2,
                                time: 2000 //2秒关闭（如果不配置，默认是3秒）
                            }, function () { });
                            return;
                        }
                    });
                    $('#BoxDIv').attr("style", "display:none")
                    isContinue = "1";
                    refreshTable();
                    boxes = [];
                } else {
                    $('#BoxDIv').attr("style", "display:block")
                    isContinue = "0";
                    $('#scanQty').val(0);
                }
                $('#boxNo').val("");
            });
@@ -619,6 +640,7 @@
                        console.log(res.data);
                        $("#planQty").val(res.data.PlanQty)
                        $("#finishQty").val(res.data.FinishQty)
                        $("#OrderCode").val(res.data.OrderCode)
                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
@@ -686,10 +708,10 @@
                    canPickBox = true

                } else { //不成功
                    layer.msg("无数据", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () { });
                    // layer.msg("无数据", {
                    //     icon: 2,
                    //     time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    // }, function () { });
                    // $("#boxNum").val(0)
                }
            }
@@ -714,19 +736,18 @@
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }); return;
                }
                if (isContinue == "0") {
                    if ($('#boxNo').val() == "") {
                        layer.msg("请输入箱码", {
                if($("#planQty").val()!=$("#scanQty").val()){
                    layer.msg("已扫数量和计划数量不一致！", {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }); return;
                    }
                    if ($('#boxQty').val() == "") {
                        layer.msg("箱内数量为空，不能拣货", {
                if (isContinue == "0") {					
                    if (boxes == null || boxes.length<=0) {
                        layer.msg("请扫描标签码", {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                        return;
                        }); return;
                    }                
                }
                if (canPickBox == false) {
@@ -745,13 +766,17 @@

            //确认拣货 
            function reqPickScatter() {
                var boxList=[];
                for(var i=0;i<boxes.length;i++){
                    boxList.push(boxes[i].BoxNo)
                }
                var param = {
                    "SoNo": $("#bar").val(),
                    "SoDetailId": $("#skuLotNo").val(),
                    "PalletNo": $('#palletNo').val(),
                    "BoxNo": $('#boxNo').val()
                    "BoxNoList": boxList
                }
                sendData(IP + "/PdaSo/SoSetPick", param, 'post', function (res) {
                sendData(IP + "/PdaSo/SoSetPickCode", param, 'post', function (res) {
                    //console.log(res);

                    if (res.code == 0) { //成功
@@ -763,6 +788,8 @@
                            $("#boxNo").val('');
                            updateQtyList();
                            getBar();
                            refreshTable();
                            boxes = [];
                        });
                    } else { //不成功
                        layer.msg(res.msg, {

 Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs

@@ -66,7 +66,10 @@
        /// Desc:承运商物流
        /// </summary>           
        public string LogisticsName { get; set; }

        /// <summary>
        /// 上游系统单号
        /// </summary>
        public string OrderCode { get; set; }

        /// <summary>
        /// 收货地址

 Wms/Model/ModelDto/PdaDto/PdaSoDto.cs

@@ -13,6 +13,7 @@
        public decimal? PickQty { get; set; }                       // 托盘待拣数量--
        public decimal? PickedQty { get; set; }                       // 托盘已拣数量
        public string SkuNo { get; set; }                           // 物料编号
        public string OrderCode { get; set; } //上游系统单号
    }
    public class BoxInfo
    {

 Wms/Model/ModelVm/PdaVm/PdaSoVm.cs

@@ -57,6 +57,11 @@
        /// 箱码
        /// </summary>
        public string BoxNo { get; set; }

        /// <summary>
        /// 箱码集合
        /// </summary>
        public List<string> BoxNoList{ get; set; }

        /// <summary>
        /// 盒码

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -1852,8 +1852,9 @@
                var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "1" && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
                return allotList;
            }
            var noticeList = Db.Queryable<BllExportNotice>().Where(w => w.IsDel == "0" && (w.Status == "3" || w.Status == "4")).Select(s => s.SONo).ToList();
            //获取状态为待拣货或者部分拣货的出库单
            var allotList2 = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "2" || m.Status == "3" || m.Status == "5") && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
            var allotList2 = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "2" || m.Status == "3" || m.Status == "5") && m.PalletNo == palletNo && noticeList.Contains(m.SONo)).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();

            //var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToList();
            //获取出库单据不为待拣货 执行完毕 订单关闭 等待执行的单据
@@ -1964,7 +1965,7 @@
            {
                OutModel = data.OutMode,
                Standard = data.Standard,
                PickQty = data.Qty,
                PickQty = data.Qty - data.CompleteQty,
                PickedQty = data.CompleteQty
            };
            return data2;
@@ -1978,10 +1979,16 @@
            {
                throw Oops.Bah("未查询到出库单的明细");
            }
            var notice = await Db.Queryable<BllExportNotice>().FirstAsync(m => m.SONo == detail.SONo && m.IsDel == "0");
            if (notice == null)
            {
                throw Oops.Bah("未查询到出库单信息");
            }
            var data = new OutPdaInfo()
            {
                PlanQty = detail.Qty,
                FinishQty = detail.CompleteQty
                FinishQty = detail.CompleteQty,
                OrderCode = notice.OrderCode,
            };
            return data;
        }
@@ -2112,8 +2119,11 @@
                }
                if (string.IsNullOrEmpty(boxNo))
                {
                    throw new Exception("标签条码不可为空!");
                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.PalletNo == palletNo).ToList();
                    boxNum = boxInfo.Sum(s => s.Qty);
                }
                else
                {
                var boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo == boxNo && w.PalletNo == palletNo).ToList();
                if (boxInfo.Count <= 0)
                {
@@ -2128,7 +2138,7 @@
                    throw new Exception("标签条码未在该托盘内!");
                }
                boxNum = boxInfo.Sum(s => s.Qty);

                }
                return boxNum;
            }
            catch (Exception ex)
@@ -3156,6 +3166,475 @@
                throw new Exception(e.Message);
            }
        }
        /// <summary>
        /// 成品出库pda拣货-JC34
        /// </summary>
        /// <param name="soNo"></param>
        /// <param name="soDetailId"></param>
        /// <param name="palletNo"></param>
        /// <param name="boxNoList"></param>
        /// <param name="userId"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public async Task SoSetPickCode34(string soNo, string soDetailId, string palletNo, List<string> boxNoList, int userId)
        {            
            try
            {
                #region 判断

                if (string.IsNullOrWhiteSpace(soNo))
                {
                    throw Oops.Bah("出库单据不能为空");
                }
                if (string.IsNullOrWhiteSpace(soDetailId))
                {
                    throw Oops.Bah("出库物料-批次不能为空");
                }
                if (string.IsNullOrWhiteSpace(palletNo))
                {
                    throw Oops.Bah("托盘码不能为空");
                }
                //开启事务
                Db.BeginTran();

                //出库单
                var notice = await Db.Queryable<BllExportNotice>().FirstAsync(m => m.IsDel == "0" && m.SONo == soNo);
                if (notice == null)
                {
                    throw Oops.Bah("未查询到该出库单的信息");
                }
                if (notice.Status != "3")
                {
                    throw Oops.Bah("出库单的状态不是正在执行，不能拣货");
                }
                //出库单明细
                var noticeDetail = await Db.Queryable<BllExportNoticeDetail>()
                    .FirstAsync(m => m.IsDel == "0" && m.Id == int.Parse(soDetailId));
                if (noticeDetail == null)
                {
                    throw Oops.Bah("未查询到该出库单明细的信息");
                }
                //出库分配信息
                var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m =>
                    m.IsDel == "0" && (m.Status == "2" || m.Status == "3") && m.SONo == soNo &&
                    m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
                if (allot == null)
                {
                    throw Oops.Bah("未查询到该托盘的分配信息");
                }
                //剩余拣货数量（待拣减去已拣）
                var needQty = allot.Qty - allot.CompleteQty;

                //库存明细
                var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.Id == allot.StockId);
                if (stockDetail == null)
                {
                    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

                if (boxNoList == null || boxNoList.Count <= 0)//整托拣货
                {
                    List<DataBoxInfo> boxInfos;
                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);//找到托盘上所有箱码
                    boxInfos = await boxInfo.ToListAsync();
                    if (boxInfo.Count() <= 0)
                    {
                        throw Oops.Bah("该托盘上没有可拣货的箱子");
                    }
                    var boxQty = await boxInfo.GroupBy(m => m.PalletNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
                    if (boxQty[0] > needQty)
                    {
                        throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
                    }
                    decimal pickQty = 0;//拣货的数量
                    var comDetailList = await Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToListAsync();
                    var comList = new List<BllCompleteDetail>();
                    foreach (var item in boxInfos)
                    {
                        if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3) && item.BoxNo3 != null)
                        {
                            throw Oops.Bah($"当前{item.BoxNo}中{item.BoxNo3}已拣货完成，请勿重复拣货");
                        }
                        if (item.SkuNo != allot.SkuNo || item.LotNo != allot.LotNo)
                        {
                            throw Oops.Bah("当前托盘上有其他不同物料批次，拣货失败");
                        }
                        //添加拣货明细
                        var completeDetail = new BllCompleteDetail()
                        {
                            SONo = soNo,
                            SODetailNo = int.Parse(soDetailId),
                            ExportAllotId = allot.Id,
                            StockId = allot.StockId,
                            BoxNo = item.BoxNo,
                            BoxNo2 = item.BoxNo2,
                            BoxNo3 = item.BoxNo3,

                            LotNo = allot.LotNo,
                            LotText = allot.LotText,
                            SupplierLot = allot.SupplierLot,
                            SkuNo = allot.SkuNo,
                            SkuName = allot.SkuName,
                            Standard = allot.Standard,
                            PalletNo = palletNo,
                            CompleteQty = item.Qty,

                            CreateUser = userId
                        };
                        comList.Add(completeDetail);

                        //删除库存箱码明细
                        await Db.Deleteable(item).ExecuteCommandAsync();
                        pickQty += item.Qty;
                    }
                    //添加拣货明细
                    await Db.Insertable(comList).ExecuteCommandAsync();
                    //修改出库分配信息
                    allot.CompleteQty += pickQty;
                    allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
                    allot.UpdateTime = DateTime.Now;
                    await Db.Updateable(allot).ExecuteCommandAsync();
                    //删除库存明细
                    await Db.Deleteable(stockDetail).ExecuteCommandAsync();
                    //删除或修改库存
                    stock.Qty -= pickQty;
                    stock.LockQty -= pickQty;
                    if (stock.LockQty < 0)
                    {
                        stock.LockQty = 0;
                    }
                    if (stock.Qty <= 0)
                    {
                        await Db.Deleteable(stock).ExecuteCommandAsync();
                    }
                    else
                    {
                        await Db.Updateable(stock).ExecuteCommandAsync();
                    }
                    //判断托盘上还有没有其他物料
                    var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
                    if (palletData == null)
                    {
                        //改变托盘状态为：未使用
                        var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
                        if (pallet == null)
                        {
                            throw Oops.Bah("未在托盘表中查询到托盘信息");
                        }
                        pallet.Status = "0";
                        await Db.Updateable(pallet).ExecuteCommandAsync();
                    }

                    //修改出库单明细拣货数量
                    noticeDetail.CompleteQty += pickQty;
                    await Db.Updateable(noticeDetail).ExecuteCommandAsync();

                    var num = await Db.Queryable<BllExportNoticeDetail>()
                        .CountAsync(m => m.IsDel == "0" && m.SONo == soNo && m.CompleteQty < m.Qty);
                    if (num <= 0)
                    {
                        notice.Status = "4"; //更改为执行完成
                        //修改出库单信息
                        await Db.Updateable(notice).ExecuteCommandAsync();
                        if (notice.IsWave == "1")
                        {
                            var waveNum = await Db.Queryable<BllExportNotice>().CountAsync(m => m.IsDel == "0" && m.WaveNo == notice.WaveNo && m.Status != "4");
                            if (waveNum == 0)
                            {
                                var wave = await Db.Queryable<BllWaveMage>().FirstAsync(m => m.IsDel == "0" && m.WaveNo == notice.WaveNo);
                                if (wave != null)
                                {
                                    wave.Status = "4";
                                    wave.UpdateUser = userId;
                                    wave.UpdateTime = DateTime.Now;
                                    await Db.Updateable(wave).ExecuteCommandAsync();
                                }
                            }
                        }
                    }

                }
                else
                {
                    foreach (var boxNo in boxNoList)
                    {
                        var biaoShi = "0";//0：整箱拣货、1：整盒拣货、 2：散支拣货
                        List<DataBoxInfo> boxInfos;
                        var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
                        if (await boxInfo.CountAsync() == 0)
                        {
                            biaoShi = "1";
                            boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo2 == boxNo);
                            if (await boxInfo.CountAsync() == 0)
                            {
                                biaoShi = "2";
                                boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo3 == boxNo);
                                if (await boxInfo.CountAsync() == 0)
                                {
                                    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") //散支拣货
                        {
                            boxInfos = boxInfos.Where(m => m.BoxNo3 == boxNo).ToList();

                            if (boxInfos.Count() == 0)
                            {
                                throw Oops.Bah("未查询到该箱码及追溯码的信息");
                            }
                            if (boxInfos.Count() > 1)
                            {
                                throw Oops.Bah("该追溯支码的信息大于1条，信息错误，请核实！");
                            }

                            if (boxInfos.Any(m => m.PalletNo != palletNo))
                            {
                                throw Oops.Bah("该托盘与箱码没有绑定关系");
                            }
                            var boxQty = boxInfos.First().Qty;
                            //if (boxQty > needQty)
                            //{
                            //    throw Oops.Bah("拣货数量不能大于剩余待拣数量");
                            //}

                            foreach (var item in boxInfos)
                            {
                                if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
                                {
                                    throw Oops.Bah($"当前{item.BoxNo}中{item.BoxNo3}已拣货完成，请勿重复拣货");
                                }
                            }
                        }
                        else if (biaoShi == "1")//整盒拣货
                        {
                            if (boxInfo.Count() == 0)
                            {
                                throw Oops.Bah("未查询到该盒码的信息");
                            }
                            if (boxInfo.Any(m => m.PalletNo != palletNo))
                            {
                                throw Oops.Bah("该托盘与盒码没有绑定关系");
                            }
                            var boxQty = await boxInfo.GroupBy(m => m.BoxNo2).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
                            //if (boxQty[0] > needQty)
                            //{
                            //    throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
                            //}

                            foreach (var item in boxInfos)
                            {
                                if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
                                {
                                    throw Oops.Bah($"当前{item.BoxNo}中{item.BoxNo3}已拣货完成，请勿重复拣货");
                                }
                            }
                        }
                        else //整箱拣货
                        {
                            if (boxInfo.Count() == 0)
                            {
                                throw Oops.Bah("未查询到该箱码的信息");
                            }
                            if (boxInfo.Any(m => m.PalletNo != palletNo))
                            {
                                throw Oops.Bah("该托盘与箱码没有绑定关系");
                            }
                            var boxQty = await boxInfo.GroupBy(m => m.BoxNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
                            //if (boxQty[0] > needQty)
                            //{
                            //    throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
                            //}

                            foreach (var item in boxInfos)
                            {
                                if (comDetailList.Any(m => m.BoxNo == item.BoxNo))
                                {
                                    throw Oops.Bah($"当前{item.BoxNo}已拣货完成，请勿重复拣货");
                                }
                            }
                        }
                        decimal pickQty = 0;//拣货的数量

                        var comList = new List<BllCompleteDetail>();
                        foreach (var item in boxInfos)
                        {
                            //添加拣货明细
                            var completeDetail = new BllCompleteDetail()
                            {
                                SONo = soNo,
                                SODetailNo = int.Parse(soDetailId),
                                ExportAllotId = allot.Id,
                                StockId = allot.StockId,
                                BoxNo = item.BoxNo,
                                BoxNo2 = item.BoxNo2,
                                BoxNo3 = item.BoxNo3,

                                LotNo = allot.LotNo,
                                LotText = allot.LotText,
                                SupplierLot = allot.SupplierLot,
                                SkuNo = allot.SkuNo,
                                SkuName = allot.SkuName,
                                Standard = allot.Standard,
                                PalletNo = palletNo,
                                CompleteQty = item.Qty,

                                CreateUser = userId
                            };
                            comList.Add(completeDetail);

                            if (biaoShi != "3")
                            {
                                //删除库存箱码明细
                                await Db.Deleteable(item).ExecuteCommandAsync();

                                pickQty += item.Qty;
                            }
                        }
                        //改变库内箱码是否零箱信息
                        if (biaoShi == "1" || biaoShi == "2")
                        {
                            var boxSurplusList = new List<DataBoxInfo>();
                            if (biaoShi == "1")
                            {
                                boxSurplusList = boxInfo.Where(m => m.BoxNo2 != boxNo).ToList();
                            }
                            else
                            {
                                boxSurplusList = boxInfo.Where(m => m.BoxNo3 != boxNo).ToList();
                            }
                            foreach (var item in boxSurplusList)
                            {
                                item.BitBoxMark = "1";
                                await Db.Updateable(item).ExecuteCommandAsync();
                            }
                        }

                        await Db.Insertable(comList).ExecuteCommandAsync();
                        //修改出库分配信息
                        allot.CompleteQty += pickQty;
                        allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
                        allot.UpdateTime = DateTime.Now;
                        if (allot.Status == "5")
                        {
                            //判断该托盘是否还存在物料 存在改为待回库 待回库完成后改为已完成
                        }
                        await Db.Updateable(allot).ExecuteCommandAsync();

                        //删除或修改库存明细
                        stockDetail.BitPalletMark = "1";//修改为零托标识
                        stockDetail.Qty -= pickQty;
                        stockDetail.LockQty -= pickQty;
                        if (stockDetail.LockQty < 0)
                        {
                            stockDetail.LockQty = 0;
                        }
                        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.LockQty < 0)
                        {
                            stock.LockQty = 0;
                        }
                        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();
                        }
                        //修改出库单明细拣货数量
                        noticeDetail.CompleteQty += pickQty;
                        await Db.Updateable(noticeDetail).ExecuteCommandAsync();

                        var num = await Db.Queryable<BllExportNoticeDetail>()
                            .CountAsync(m => m.IsDel == "0" && m.SONo == soNo && m.CompleteQty < m.Qty);
                        if (num <= 0)
                        {
                            notice.Status = "4"; //更改为执行完成
                                                 //修改出库单信息
                            await Db.Updateable(notice).ExecuteCommandAsync();
                            if (notice.IsWave == "1")
                            {
                                var waveNum = await Db.Queryable<BllExportNotice>()
                                    .CountAsync(m => m.IsDel == "0" && m.WaveNo == notice.WaveNo && m.Status != "4");
                                if (waveNum == 0)
                                {
                                    var wave = await Db.Queryable<BllWaveMage>().FirstAsync(m => m.IsDel == "0" && m.WaveNo == notice.WaveNo);
                                    if (wave != null)
                                    {
                                        wave.Status = "4";
                                        wave.UpdateUser = userId;
                                        wave.UpdateTime = DateTime.Now;
                                        await Db.Updateable(wave).ExecuteCommandAsync();
                                    }
                                }
                            }
                        }
                    }
                }
                //添加操作日志记录
                var k = new OperationSOServer().AddLogOperationSo("PDA模块", "拣货出库", soNo, "拣货", $"在PDA上对出库单号为：{soNo}的托盘码为：{palletNo}的拣货操作", userId);
                Db.CommitTran();
            }
            //catch (AppFriendlyException e)
            //{
            //    Db.RollbackTran();
            //}
            catch (Exception e)
            {
                Db.RollbackTran();
                throw new Exception(e.Message);
            }
        }
        //出库pda拣货
        public async Task SoSetQtyPick(string soNo, string soDetailId, string palletNo, string PickQty, int userId)
        {

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -948,6 +948,7 @@
                    WaveNo = a.WaveNo,
                    IsDespatch = a.IsDespatch,
                    Demo = a.Demo,
                    OrderCode = a.OrderCode,

                    CreateUserName = c.RealName,
                    UpdateUserName = c.RealName,

 Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs

@@ -161,6 +161,17 @@
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        Task SoSetPick34(string soNo, string soDetailId, string palletNo, string boxNo, string pickQty1, int userId);
        /// <summary>
        /// 成品出库pda拣货-JC34
        /// </summary>
        /// <param name="soNo"></param>
        /// <param name="soDetailId"></param>
        /// <param name="palletNo"></param>
        /// <param name="boxNoList"></param>
        /// <param name="userId"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        Task SoSetPickCode34(string soNo, string soDetailId, string palletNo, List<string> boxNoList, int userId);

        /// <summary>
        /// 出库pda拣货

 Wms/Wms/Controllers/PdaSoController.cs

@@ -184,6 +184,16 @@
            //await _pdaSoSvc.SoSetPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, _userManager.UserId);
            await _pdaSoSvc.SoSetPick34(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.PickQty, _userManager.UserId);
        }
        /// <summary>
        /// 成品出库pda拣货-JC34
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task SoSetPickCode(PdaSoVm model)
        {
            await _pdaSoSvc.SoSetPickCode34(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNoList, _userManager.UserId);
        }

        /// <summary>
        /// 出库pda拣货