Merge branch 'yyk'

yuyou_x

2024-03-15 6d2552b84275884e2dfd9e39f8c550642e1cb568

 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs

@@ -890,6 +890,11 @@
            {
                string EndLocat = string.Empty;//目标位置                

                var log = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && (w.Status == "0" || w.Status == "1"));
                if (log != null)
                {
                    throw new Exception("该托盘已有小车等待执行或正在执行的任务!");
                }                
                var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
                if (stockDetail == null)
                {
@@ -1002,6 +1007,12 @@
            }
            try
            {
                var log = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && (w.Status == "0" || w.Status == "1"));
                if (log != null)
                {
                    throw new Exception("该托盘已有小车等待执行或正在执行的任务!");
                }

                var notice = Db.Queryable<BllExportNotice>().First(w => w.IsDel == "0" && w.SONo == soNo);
                if (notice == null)
                {
@@ -1126,7 +1137,7 @@
                if (string.IsNullOrEmpty(endLocat))
                {
                    var locatInfo3 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0" && w.Status == "0")
                                .OrderByDescending(m => new { m.Layer, m.Column, m.Row }).First();
                                .OrderByDescending(m => m.Layer).OrderByDescending(m=>m.Column).OrderByDescending(m=> m.Row).First();

                    if (locatInfo3 != null)
                    {