修改问题

chengsc

2025-03-28 e00c9e03eeaffad919cf16c95b2d6048e8abfb9d

修改问题

 Pda/View/SoSetting/pinTuoOut.html

@@ -288,7 +288,7 @@
                                        </div>
                                    </td>
                                </tr> -->
                                <tr>
                                <!-- <tr>
                                    <td>
                                        <div class="layui-form-item layout-input" style="margin-top: 6px;">
                                            <label class="layui-form-label lableWidth">追溯条码：</label>
@@ -310,7 +310,7 @@
                                            </div>
                                        </div>
                                    </td>
                                </tr>
                                </tr> -->

                            </table>
                        </div>
@@ -680,7 +680,7 @@
                    isContinue = "0";
                }
                $('#boxNo').val("");
                $('#boxNo3').val("");
                //$('#boxNo3').val("");
            });

            //箱码文本框回车事件
@@ -986,20 +986,20 @@
                        });
                        return;
                    }
                    if (($('#boxNo3').val() != "" && ($('#pickQty1').val() != "" || $('#pickQty1').val() != 0))) {
                        layer.msg("追溯条码和拣货数量不能同时输入！", {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                        return;
                    }
                    if ($('#pickQty1').val() != "" && $('#pickQty1').val() > parseInt($('#pickQty').val())) {
                        layer.msg("拣货数量不能大于待拣数量！", {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                        return;
                    }
                    // if (($('#boxNo3').val() != "" && ($('#pickQty1').val() != "" || $('#pickQty1').val() != 0))) {
                    //     layer.msg("追溯条码和拣货数量不能同时输入！", {
                    //         icon: 2,
                    //         time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    //     });
                    //     return;
                    // }
                    // if ($('#pickQty1').val() != "" && $('#pickQty1').val() > parseInt($('#pickQty').val())) {
                    //     layer.msg("拣货数量不能大于待拣数量！", {
                    //         icon: 2,
                    //         time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    //     });
                    //     return;
                    // }
                }
                // let boxQty = parseInt($('#boxQty').val())
                // let qty = parseInt($('#qty').val()) 
@@ -1032,8 +1032,8 @@
                    "SoDetailId": $("#skuLotNo").val(),
                    "PalletNo": $('#palletNo').val(),
                    "BoxNo": $('#boxNo').val(),
                    "BoxNo3": $('#boxNo3').val(),
                    "PickQty": $('#pickQty1').val(),
                    //"BoxNo3": $('#boxNo3').val(),
                    //"PickQty": $('#pickQty1').val(),
                    "palletNoNew": $('#palletNo3').val(),
                }
                sendData(IP + "/PdaSo/SoSetPinPick", param, 'post', function (res) {

 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs

@@ -5,8 +5,10 @@
using System.Text;
using System.Threading.Tasks;
using Dm;
using Model.InterFaceModel;
using Model.ModelDto.BllCheckDto;
using Model.ModelDto.PdaDto;
using Newtonsoft.Json;
using SqlSugar;
using Utility;
using WMS.BLL.LogServer;
@@ -780,7 +782,9 @@
        /// <param name="palletNo"></param>
        /// <param name="areaNo"></param>
        /// <param name="ruku"></param>
        public async Task AgvTransport(string palletNo, string areaNo, string ruku, int userId)
        public async Task AgvTransport(string palletNo, string areaNo, string ruku, string url, int userId)
        {
            try
        {
            if (string.IsNullOrEmpty(palletNo))
            {
@@ -799,7 +803,7 @@
            var log = await Db.Queryable<LogTask>().FirstAsync(w => w.IsDel == "0" && w.PalletNo == palletNo && (w.Status == "0" || w.Status == "1"));
            if (log != null)
            {
                throw Oops.Bah("该托盘已有小车等待执行或正在执行的任务!");
                    throw Oops.Bah("该托盘已有等待执行或正在执行的任务!");
            }
            var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(w => w.IsDel == "0" && w.PalletNo == palletNo);
            if (stockDetail == null)
@@ -828,7 +832,7 @@
            {
                throw Oops.Bah("托盘储位信息不存在,请检查!");
            }
            if (stockDetail.WareHouseNo != "W02")
                if (stockDetail.WareHouseNo != "W04")
            {
                throw Oops.Bah("该托盘未在平库内,请检查!");
            }
@@ -874,12 +878,12 @@
            await Db.Insertable(exTask).ExecuteCommandAsync();

            //修改库存明细信息
            stockDetail.Status = "4";//移库锁定
            stockDetail.LockQty = stockDetail.Qty;//锁定库存数量
            await Db.Updateable(stockDetail).ExecuteCommandAsync();
            //修改库存信息
            stock.LockQty += (decimal)stockDetail.Qty;
            await Db.Updateable(stock).ExecuteCommandAsync();
                //stockDetail.Status = "4";//移库锁定
                //stockDetail.LockQty = stockDetail.Qty;//锁定库存数量
                //await Db.Updateable(stockDetail).ExecuteCommandAsync();
                ////修改库存信息
                //stock.LockQty += (decimal)stockDetail.Qty;
                //await Db.Updateable(stock).ExecuteCommandAsync();

            //修改起始储位地址状态
            storageLocat.Status = "5";//0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中 
@@ -894,9 +898,54 @@
            //添加操作日志记录
            var k = new OperationCrServer().AddLogOperationCr("PDA模块", "AGV转运", palletNo, "移库", $"PDA呼叫小车对托盘号：{palletNo}发起转运", userId);

            #region 呼叫小车代码
                var outDto = new List<OutCommandDto>();
                outDto.Add(new OutCommandDto()
                {
                    PalletNo = exTask.PalletNo,//托盘号
                    StartLocate = exTask.StartLocat, // 起始位置
                    StartRoadway = storageLocat.RoadwayNo,//其实巷道
                    EndLocate = EndLocat, // 目标位置 
                    TaskNo = exTask.TaskNo, // 任务号
                    TaskType = "2",// 任务类型 (出库)0入 1出 2移 
                    OutMode = "",  //出库口 
                    Order = 1

            #endregion
                });

                // 正式运行程序放开
                var list2 = outDto.Select(m => m.TaskNo).ToList();
                var jsonData = JsonConvert.SerializeObject(outDto);
                string response = "";

                try
                {
                    var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
                    //response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");
                    var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")

                    //////解析返回数据 
                    //var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
                    //if (wcsModel.StatusCode == 0)
                    //{
                    //    //更改任务的发送返回时间//
                    new TaskServer().EditTaskIssueOk(list2, time1, time2);
                    //}
                    //if (wcsModel.StatusCode == -1)
                    //{
                    //    new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.Msg);
                    //    throw new Exception(wcsModel.Msg);
                    //}
                }
                catch (Exception ex)
                {
                    throw new Exception(ex.Message);
                }

            }
            catch (Exception e)
            {
                throw new Exception(e.Message);
            }
        }
        /// <summary>
        /// agv转运呼叫小车取货

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -29,6 +29,747 @@
    {
        private static readonly SqlSugarScope Db = DataContext.Db;

        #region JC34

        /// <summary>
        /// 拼托出库pda拣货-标签
        /// </summary>
        /// <param name="soNo"></param>
        /// <param name="soDetailId"></param>
        /// <param name="palletNo"></param>
        /// <param name="boxNo"></param>
        /// <param name="palletNoNew"></param>
        /// <param name="userId"></param>
        public async Task SoSetPinPick34(string soNo, string soDetailId, string palletNo, string boxNo , string palletNoNew, int userId)
        {
            Db.BeginTran();
            try
            {
                var nowDate = DateTime.Now;//当前时间
                #region 判断

                if (string.IsNullOrWhiteSpace(soNo))
                {
                    throw Oops.Bah("出库单据不能为空");
                }
                if (string.IsNullOrWhiteSpace(soDetailId))
                {
                    throw Oops.Bah("出库物料-批次不能为空");
                }
                if (string.IsNullOrWhiteSpace(palletNo))
                {
                    throw Oops.Bah("托盘码不能为空");
                }
                if (string.IsNullOrWhiteSpace(palletNoNew))
                {
                    throw Oops.Bah("新托盘码不能为空");
                }
                if (palletNo == palletNoNew)//原托盘与新托盘一致
                {
                    if (!string.IsNullOrEmpty(boxNo))
                    {
                        throw Oops.Bah("原托盘与新托盘一致，请选择整托出库");
                    }
                }

                //出库单
                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

                #region 拼托信息
                var sdId = 0;
                bool isNew = false;
                var pinStockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
                if (pinStockDetail != null)
                {
                    if (palletNo != palletNoNew)//非整托拣货
                    {
                        if (pinStockDetail.SONo != notice.SONo)
                        {
                            throw Oops.Bah("拼托托盘上只能放同一个出库单下的物料！");
                        }
                        if (pinStockDetail.SkuName != stockDetail.SkuName || pinStockDetail.LotNo != stockDetail.LotNo)
                        {
                            isNew = true;
                        }
                    }
                    sdId = pinStockDetail.Id;
                }
                else
                {
                    isNew = true;

                    var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
                    if (newPalletInfo == null)
                    {
                        throw Oops.Bah("新托盘信息不存在或已被使用！");
                    }
                    //修改新托盘状态
                    newPalletInfo.Status = "1";
                    await Db.Updateable(newPalletInfo).ExecuteCommandAsync();
                }
                var sd = new DataStockDetail();
                if (isNew)
                {
                    sd.LotNo = stockDetail.LotNo;
                    sd.LotText = stockDetail.LotText;
                    sd.SupplierLot = stockDetail.SupplierLot;
                    sd.SkuNo = stockDetail.SkuNo;
                    sd.SkuName = stockDetail.SkuName;
                    sd.Standard = stockDetail.Standard;

                    sd.FrozenQty = 0;
                    sd.InspectQty = 0;
                    sd.ASNNo = "";
                    sd.ASNDetailNo = null;
                    sd.SONo = soNo;//出库单号
                    sd.WareHouseNo = "";
                    sd.RoadwayNo = "";
                    sd.AreaNo = "";
                    sd.LocatNo = "";
                    sd.PalletNo = palletNoNew;
                    sd.PalletNo2 = "";
                    sd.PalletNo3 = "";

                    sd.CompleteTime = nowDate;
                    sd.ProductionTime = stockDetail.ProductionTime;
                    sd.ExpirationTime = stockDetail.ExpirationTime;
                    sd.Status = "2";//状态，已分配
                    sd.InspectMark = stockDetail.InspectMark;
                    sd.InspectStatus = stockDetail.InspectStatus;
                    sd.BitPalletMark = "0";
                    sd.PackagNo = noticeDetail.PackagNo;
                    sd.IsBale = stockDetail.IsBale;
                    sd.IsBelt = stockDetail.IsBelt;
                    sd.Demo = stockDetail.Demo;
                    sd.OwnerName = stockDetail.OwnerName;
                    sd.OwnerNo = stockDetail.OwnerNo;
                    sd.SupplierName = stockDetail.SupplierName;
                    sd.SupplierNo = stockDetail.SupplierNo;

                    sd.IsDel = "0";
                    sd.CreateUser = userId;
                    sd.CreateTime = nowDate;

                    //新增拼托库存明细信息
                    sdId = await Db.Insertable(sd).ExecuteReturnIdentityAsync();
                }
                #endregion

                decimal pickQty = 0;//拣货的数量
                if (string.IsNullOrWhiteSpace(boxNo))//整托拣货
                {
                    List<DataBoxInfo> boxInfos;
                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo);//找到托盘上所有箱码
                    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("拣货数量不能大于箱内剩余待拣数量");
                    }

                    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.BoxNo == item.BoxNo))
                        {
                            throw Oops.Bah($"当前{item.BoxNo}已拣货完成，请勿重复拣货");
                        }
                        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);

                        if (palletNo != palletNoNew)
                        {
                            item.StockDetailId = sdId;
                            item.BindNo = null;//托盘绑定号
                            item.PalletNo = palletNoNew;
                        }
                        item.Status = "5";//箱支状态，0：未组托  1：已组托 2：已入库 3：已出库 4:已分配 5：已拣货
                        //修改库存箱码明细
                        await Db.Updateable(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();

                    if (palletNo != palletNoNew)
                    {
                        //删除原托盘库存明细
                        await Db.Deleteable(stockDetail).ExecuteCommandAsync();

                        //改变原托盘状态为：未使用
                        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();
                    }
                    else
                    {
                        stockDetail.SONo = soNo;
                        await Db.Updateable(stockDetail).ExecuteCommandAsync();
                    }

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

                    var num = Db.Queryable<BllExportNoticeDetail>().Count(m => m.IsDel == "0" && m.SONo == soNo && m.CompleteQty < m.Qty);
                    if (num <= 0)
                    {
                        notice.Status = "4"; //更改为执行完成
                    }
                    //修改出库单信息
                    await Db.Updateable(notice).ExecuteCommandAsync();
                }
                else
                {
                    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)
                    {
                        throw Oops.Bah("未查询到该箱码的信息");
                    }
                    
                    var comDetailList = await Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToListAsync();
                    
                    //整箱拣货
                    
                    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("拣货数量不能大于箱内剩余待拣数量");
                    }
                    boxInfos = await boxInfo.ToListAsync();
                    foreach (var item in boxInfos)
                    {
                        if (comDetailList.Any(m => m.BoxNo == item.BoxNo))
                        {
                            throw Oops.Bah($"当前{item.BoxNo}已拣货完成，请勿重复拣货");
                        }
                    }
                    

                    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);

                        //修改库存箱码明细
                        item.StockDetailId = sdId;
                        item.BindNo = null;//托盘绑定号
                        item.PalletNo = palletNoNew;
                        item.Status = "5";//箱支状态，0：未组托  1：已组托 2：已入库 3：已出库 4:已分配 5：已拣货
                        await Db.Updateable(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();

                    //删除或修改库存明细
                    stockDetail.BitPalletMark = "1";//修改为零托标识
                    stockDetail.Qty -= pickQty;
                    stockDetail.LockQty -= 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();
                    }
                    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 (isNew)
                {
                    sd.Qty = pickQty;
                    sd.LockQty = pickQty;
                    await Db.Updateable(sd).ExecuteCommandAsync();
                }
                else
                {
                    if (palletNo != palletNoNew)
                    {
                        //修改拼托托盘库存明细
                        pinStockDetail.Qty += pickQty;
                        pinStockDetail.LockQty += pickQty;
                        await Db.Updateable(pinStockDetail).ExecuteCommandAsync();
                    }
                }

                //添加操作日志记录
                var k = new OperationSOServer().AddLogOperationSo("PDA模块", "拣货拼托", soNo, "拣货", $"在PDA上对出库单号为：{soNo}的原托盘码为：{palletNo}，新托盘码为：{palletNoNew}的拣货拼托操作", userId);
                Db.CommitTran();
            }
            catch (Exception e)
            {
                Db.RollbackTran();
                throw e;
            }
        }

        /// <summary>
        /// 拼托出库pda拣货-数量
        /// </summary>
        /// <param name="soNo"></param>
        /// <param name="soDetailId"></param>
        /// <param name="palletNo"></param>
        /// <param name="PickQty"></param>
        /// <param name="palletNoNew"></param>
        /// <param name="userId"></param>
        public async Task SoSetQtyPinPick34(string soNo, string soDetailId, string palletNo, string PickQty, string palletNoNew, int userId)
        {
            Db.BeginTran();
            try
            {
                var nowDate = DateTime.Now;//当前时间
                #region 判断

                if (string.IsNullOrWhiteSpace(soNo))
                {
                    throw Oops.Bah("出库单据不能为空");
                }
                if (string.IsNullOrWhiteSpace(palletNo))
                {
                    throw Oops.Bah("托盘码不能为空");
                }
                if (string.IsNullOrWhiteSpace(palletNoNew))
                {
                    throw Oops.Bah("新托盘码不能为空");
                }

                //出库单
                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;
                if (int.Parse(PickQty) > needQty)
                {
                    throw Oops.Bah("拣货数量不能大于托内剩余待拣数量");
                }

                //库存明细
                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("未查询到该托盘分配的库存信息！");
                }
                if (palletNo == palletNoNew)//原托盘与新托盘一致
                {
                    if (int.Parse(PickQty) != stockDetail.Qty)
                    {
                        throw Oops.Bah("原托盘与新托盘一致，需要把托盘上所有数量拣货");
                    }
                }
                #endregion

                #region 拼托信息
                bool isNew = false;
                var pinStockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
                if (pinStockDetail != null)
                {
                    if (palletNo != palletNoNew)//非整托拣货
                    {
                        if (pinStockDetail.SONo != notice.SONo)
                        {
                            throw Oops.Bah("拼托托盘上只能放同一个出库单下的物料！");
                        }
                        if (pinStockDetail.SkuName != stockDetail.SkuName || pinStockDetail.LotNo != stockDetail.LotNo)
                        {
                            isNew = true;
                        }
                    }
                }
                else
                {
                    isNew = true;

                    var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
                    if (newPalletInfo == null)
                    {
                        throw Oops.Bah("新托盘信息不存在或已被使用！");
                    }
                    //修改新托盘状态
                    newPalletInfo.Status = "1";
                    await Db.Updateable(newPalletInfo).ExecuteCommandAsync();
                }

                if (isNew)
                {
                    var sd = new DataStockDetail();

                    sd.LotNo = stockDetail.LotNo;
                    sd.LotText = stockDetail.LotText;
                    sd.SupplierLot = stockDetail.SupplierLot;
                    sd.SkuNo = stockDetail.SkuNo;
                    sd.SkuName = stockDetail.SkuName;
                    sd.Standard = stockDetail.Standard;

                    sd.Qty = int.Parse(PickQty);
                    sd.LockQty = int.Parse(PickQty);

                    sd.FrozenQty = 0;
                    sd.InspectQty = 0;
                    sd.ASNNo = "";
                    sd.ASNDetailNo = null;
                    sd.SONo = soNo;//出库单号
                    sd.WareHouseNo = "";
                    sd.RoadwayNo = "";
                    sd.AreaNo = "";
                    sd.LocatNo = "";
                    sd.PalletNo = palletNoNew;
                    sd.PalletNo2 = "";
                    sd.PalletNo3 = "";
                    //PalletType = item.PalletType,
                    sd.CompleteTime = nowDate;
                    sd.ProductionTime = stockDetail.ProductionTime;
                    sd.ExpirationTime = stockDetail.ExpirationTime;
                    sd.Status = "2";//状态，已分配
                    sd.InspectMark = stockDetail.InspectMark;
                    sd.InspectStatus = stockDetail.InspectStatus;
                    sd.BitPalletMark = "0";
                    sd.PackagNo = noticeDetail.PackagNo;
                    sd.IsBale = stockDetail.IsBale;
                    sd.IsBelt = stockDetail.IsBelt;
                    sd.Demo = stockDetail.Demo;
                    sd.OwnerName = stockDetail.OwnerName;
                    sd.OwnerNo = stockDetail.OwnerNo;
                    sd.SupplierName = stockDetail.SupplierName;
                    sd.SupplierNo = stockDetail.SupplierNo;

                    sd.IsDel = "0";
                    sd.CreateUser = userId;
                    sd.CreateTime = nowDate;

                    //新增拼托库存明细信息
                    await Db.Insertable(sd).ExecuteReturnIdentityAsync();
                }
                else
                {
                    if (palletNo != palletNoNew)
                    {
                        //修改拼托托盘库存明细
                        pinStockDetail.Qty += int.Parse(PickQty);
                        pinStockDetail.LockQty += int.Parse(PickQty);
                        await Db.Updateable(pinStockDetail).ExecuteCommandAsync();
                    }
                    else
                    {
                        pinStockDetail.SONo = soNo;
                        await Db.Updateable(pinStockDetail).ExecuteCommandAsync();
                    }
                }
                #endregion

                //获取当前托盘拣货明细
                var complete = await Db.Queryable<BllCompleteDetail>().FirstAsync(a => a.IsDel == "0" && a.PalletNo == palletNo && a.SONo == notice.SONo && a.SODetailNo == noticeDetail.Id && a.ExportAllotId == allot.Id && a.StockId == stockDetail.Id);

                //判读是否存在拣货明细
                int isComplete = 0;
                if (complete != null)
                {
                    isComplete = 1;
                }

                var comList = new List<BllCompleteDetail>();
                //判断是否存在拣货明细
                isComplete = 0;//所有无箱码或一级箱码拣货时，拣货明细应重新插入数据(体现多次拣货流程记录)
                if (isComplete == 0)
                {
                    //添加拣货明细
                    var completeDetail = new BllCompleteDetail()
                    {
                        SONo = soNo,
                        SODetailNo = int.Parse(soDetailId),
                        ExportAllotId = allot.Id,
                        StockId = allot.StockId,
                        BoxNo = "",
                        BoxNo2 = "",
                        BoxNo3 = "",

                        LotNo = allot.LotNo,
                        LotText = allot.LotText,
                        SupplierLot = allot.SupplierLot,
                        SkuNo = allot.SkuNo,
                        SkuName = allot.SkuName,
                        Standard = allot.Standard,
                        PalletNo = palletNo,
                        CompleteQty = int.Parse(PickQty),

                        CreateUser = userId,
                        CreateTime = Db.GetDate(),
                    };
                    comList.Add(completeDetail);

                    //添加拣货明细
                    await Db.Insertable(comList).ExecuteCommandAsync();
                }
                else if (isComplete == 1)
                {
                    complete.CompleteQty += int.Parse(PickQty);
                    complete.UpdateUser = userId;
                    complete.UpdateTime = Db.GetDate();

                    await Db.Updateable(complete).ExecuteCommandAsync();
                }

                //修改出库分配信息
                allot.CompleteQty += int.Parse(PickQty);
                allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
                allot.UpdateTime = DateTime.Now;
                await Db.Updateable(allot).ExecuteCommandAsync();

                int isDel = 0;

                if (palletNo != palletNoNew)
                {
                    //删除或修改库存明细
                    stockDetail.BitPalletMark = "1";//修改为零托标识
                    stockDetail.Qty -= int.Parse(PickQty);
                    stockDetail.LockQty -= int.Parse(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
                    {
                        isDel = 1;
                        await Db.Updateable(stockDetail).ExecuteCommandAsync();
                    }
                }
                else
                {
                    isDel = 1;
                }
                //判断托盘上物料是否拣货完毕
                if (isDel == 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 += int.Parse(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();

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

        #endregion

        //验证托盘是否存在并是否可出库
        public async Task<string> IsEnableOkPalletNo(string palletNo)
        {

 Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs

@@ -127,7 +127,7 @@
        public decimal? CompleteQty {get;set;}

        /// <summary>
        /// Desc:状态
        /// Desc:状态 0待下发  1任务下发  2待拣货  3部分拣货  5已完成  6异常取消
        /// Default:0
        /// Nullable:True
        /// </summary>           

 Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs

@@ -130,7 +130,8 @@
        /// <param name="palletNo"></param>
        /// <param name="areaNo"></param>
        /// <param name="ruku"></param>
        Task AgvTransport(string palletNo, string areaNo, string ruku, int userId);
        /// <param name="url"></param>
        Task AgvTransport(string palletNo, string areaNo, string ruku, string url, int userId);
        /// <summary>
        ///  agv转运呼叫小车取货
        /// </summary>

 Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs

@@ -10,6 +10,35 @@
{
    public interface IPdaSoServer
    {

        #region JC34


        /// <summary>
        /// 拼托出库pda拣货-标签
        /// </summary>
        /// <param name="soNo">出库单</param>
        /// <param name="soDetailId">出库单明细ID</param>
        /// <param name="palletNo">托盘号</param> 
        /// <param name="boxNo">箱码</param>
        /// <param name="boxNo2">盒码</param>
        /// <param name="boxNo3">支/袋码</param>
        /// <param name="palletNo">新托盘号</param> 
        /// <param name="userId">操作人</param>
        Task SoSetPinPick34(string soNo, string soDetailId, string palletNo, string boxNo,string palletNoNew, int userId);
        /// <summary>
        /// 拼托出库pda拣货-数量
        /// </summary>
        /// <param name="soNo"></param>
        /// <param name="soDetailId"></param>
        /// <param name="palletNo"></param>
        /// <param name="PickQty"></param>
        /// <param name="palletNoNew"></param>
        /// <param name="userId"></param>
        Task SoSetQtyPinPick34(string soNo, string soDetailId, string palletNo, string PickQty, string palletNoNew, int userId);

        #endregion

        /// <summary>
        /// 验证托盘是否存在并是否可出库
        /// </summary>

 Wms/Wms/Controllers/PdaCrController.cs

@@ -15,6 +15,8 @@
using Model.ModelDto.PdaDto;
using Microsoft.AspNetCore.Identity;
using System.Security.Cryptography;
using Wms.Tools;
using Microsoft.Extensions.Options;

namespace Wms.Controllers
{
@@ -23,11 +25,13 @@
    [Authorize]
    public class PdaCrController : ControllerBase
    {
        private readonly ApiUrlConfig _config; //接口交互路径
        private readonly IPdaCrServer _pdaCrSvc;
        private readonly UserManager _userManager;

        public PdaCrController(IPdaCrServer pdaCrSvc, UserManager userManager)
        public PdaCrController(IOptions<ApiUrlConfig> setting, IPdaCrServer pdaCrSvc, UserManager userManager)
        {
            _config = setting.Value;
            _pdaCrSvc = pdaCrSvc;
            _userManager = userManager;
        }
@@ -231,7 +235,7 @@
        [UnitOfWork]
        public async Task AgvTransport(PdaAgvTransportVm model)
        {
            await _pdaCrSvc.AgvTransport(model.PalletNo, model.AreaNo, model.Ruku, _userManager.UserId);
            await _pdaCrSvc.AgvTransport(model.PalletNo, model.AreaNo, model.Ruku, _config.WcsHost+ _config.IssueComApiUrl, _userManager.UserId);
        }
        /// <summary>
        /// agv转运呼叫小车取货

 Wms/Wms/Controllers/PdaSoController.cs

@@ -251,7 +251,7 @@
        [HttpPost]
        public async Task SoSetPinPick(PdaSoVm model)
        {
            await _pdaSoSvc.SoSetPinPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, model.PalletNoNew, _userManager.UserId);
            await _pdaSoSvc.SoSetPinPick34(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.PalletNoNew, _userManager.UserId);
        }
        /// <summary>
        /// 拼托出库pda拣货-数量
@@ -261,7 +261,7 @@
        [HttpPost]
        public async Task SoSetQtyPinPick(PdaSoVm model)
        {
            await _pdaSoSvc.SoSetQtyPinPick(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, model.PalletNoNew, _userManager.UserId);
            await _pdaSoSvc.SoSetQtyPinPick34(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, model.PalletNoNew, _userManager.UserId);
        }
        #endregion