修改测试问题

chengsc

2025-05-23 3f9d7eb876f6d60d92e7f8a71240097b6ac50eb6

 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs

@@ -12,6 +12,7 @@
using Newtonsoft.Json;
using SqlSugar;
using Utility;
using Utility.Tools;
using WMS.BLL.LogServer;
using WMS.DAL;
using WMS.Entity.BllAsnEntity;
@@ -893,20 +894,22 @@
                //添加操作日志记录
                var k = new OperationCrServer().AddLogOperationCr("PDA模块", "AGV转运", palletNo, "移库", $"PDA呼叫小车对托盘号：{palletNo}发起转运", userId);

                var outDto = new List<OutCommandDto>();
                outDto.Add(new OutCommandDto()
                var outDto = new List<OutCommandDto>
                {
                    TaskNo = moveTask.TaskNo, // 任务号
                    TaskType = "2",// 任务类型 0入 1出 2移 
                    PalletNo = moveTask.PalletNo,//托盘号
                    new OutCommandDto()
                    {
                        TaskNo = moveTask.TaskNo, // 任务号
                        TaskType = "2",// 任务类型 0入 1出 2移 
                        PalletNo = moveTask.PalletNo,//托盘号

                    StartLocate = moveTask.StartLocat, // 起始位置
                    EndLocate = EndLocat, // 目标位置 
                    
                    Order = 999,
                    Type = PLCTypeEnum.AGV
                        StartLocate = moveTask.StartLocat, // 起始位置
                        EndLocate = EndLocat, // 目标位置 

                });
                        Order = 999,
                        Type = PLCTypeEnum.AGV

                    }
                };

                // 正式运行程序放开
                var list2 = outDto.Select(m => m.TaskNo).ToList();
@@ -916,21 +919,21 @@
                try
                {
                    var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
                    //response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");
                    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);
                    //}
                    //解析返回数据 
                    var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
                    if (wcsModel.code == 200)
                    {
                       // 更改任务的发送返回时间//
                        new TaskServer().EditTaskIssueOk(list2, time1, time2);
                    }
                    else
                    {
                        new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.message);
                        throw new Exception(wcsModel.message);
                    }
                }
                catch (Exception ex)
                {
@@ -1111,16 +1114,16 @@
                endLocat = locatInfo2.LocatNo;
            }

            if (string.IsNullOrEmpty(endLocat))
            {
                var locatInfo3 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0")
                            .OrderByDescending(m => m.Layer).OrderByDescending(m => m.Column).OrderByDescending(m => m.Row).First();
            //if (string.IsNullOrEmpty(endLocat))
            //{
            //    var locatInfo3 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0")
            //                .OrderByDescending(m => m.Layer).OrderByDescending(m => m.Column).OrderByDescending(m => m.Row).First();

                if (locatInfo3 != null)
                {
                    endLocat = locatInfo3.LocatNo;
                }
            }
            //    if (locatInfo3 != null)
            //    {
            //        endLocat = locatInfo3.LocatNo;
            //    }
            //}
            return endLocat;
        }
        #endregion