diff --git a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs
index 0afd2d19..e9d315a5 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs
@@ -34,10 +34,12 @@ namespace Tnb.WarehouseMgr
             var serviceTypes = App.EffectiveTypes.Where(u => u.IsClass && !u.IsInterface && !u.IsAbstract && typeof(IWHStorageService).IsAssignableFrom(u)).ToList();
             foreach (var serviceType in serviceTypes)
             {
-                var callerName = serviceType.GetCustomAttribute<CallerAttribute>()?.Name;
-                if (!callerName.IsNullOrEmpty())
+                var callerName = serviceType.GetCustomAttribute<CallerAttribute>()?.Name ?? string.Empty;
+                if (callerName.IsNullOrEmpty() && !serviceType.IsNull())
                 {
-                    _stroageMap[callerName!] = (IWHStorageService)Activator.CreateInstance(serviceType)!;
+                    var obj = Activator.CreateInstance(serviceType) as IWHStorageService;
+                    if (obj == null) continue;
+                    _stroageMap[callerName] = obj;
                 }
             }
         }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index bb4e1fd1..ae11f831 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -251,14 +251,13 @@ namespace Tnb.WarehouseMgr
                 {
                     var moveNum = itGroup.First().move_num;
                     var items = itGroup.Adapt<List<WmsDistaskH>>();
-
-                    items.ForEach(x => SnowflakeIdHelper.NextId());
                     items.ForEach(x =>
                     {
+                        x.id = SnowflakeIdHelper.NextId();
                         x.status = WmsWareHouseConst.TASK_BILL_STATUS_DZX_ID;
                         x.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE).GetAwaiter().GetResult();
                     });
-                    var areaPreTasks = itGroup.ToList();
+
                     if (moveNum == 1)
                     {
                         items.ForEach(x =>
@@ -269,6 +268,7 @@ namespace Tnb.WarehouseMgr
                     }
                     else if (moveNum > 1)
                     {
+                        var areaPreTasks = itGroup.ToList();
                         //搬运数量==预任务数，可以生成任务执行，为任务链
                         if (moveNum == areaPreTasks.Count)
                         {
@@ -296,7 +296,7 @@ namespace Tnb.WarehouseMgr
                         {
                             var curPreTaskCodes = preTaskCodes.FindAll(x => x.bill_id == disTask.pretask_id);
                             var curDisTaskCodes = curPreTaskCodes.Adapt<List<WmsDistaskCode>>();
-                            curPreTaskCodes.ForEach(x =>
+                            curDisTaskCodes.ForEach(x =>
                             {
                                 x.id = SnowflakeIdHelper.NextId();
                                 x.bill_id = disTask.id;
@@ -387,15 +387,16 @@ namespace Tnb.WarehouseMgr
 
                 await _db.Updateable<WmsDistaskH>().SetColumns(it => new WmsDistaskH { status = WmsWareHouseConst.TASK_BILL_STATUS_RUNING_ID }).Where(it => input.disTaskIds.Contains(it.id)).ExecuteCommandAsync();
                 //清空载具库位数据
-                var carryIds = await _db.Queryable<WmsDistaskH>().Where(it => input.disTaskIds.Contains(it.id)).Select(it => it.carry_id).ToListAsync();
-                if (carryIds?.Count > 0)
+                var carryAndLocIds = await _db.Queryable<WmsDistaskH>().Where(it => input.disTaskIds.Contains(it.id)).Select(it => new { it.carry_id, it.startlocation_id }).ToListAsync();
+                if (carryAndLocIds?.Count > 0)
                 {
+                    var carryIds = carryAndLocIds.Select(x => x.carry_id).ToList();
                     await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { location_id = null, location_code = null }).Where(it => carryIds.Contains(it.id)).ExecuteCommandAsync();
                 }
-                var startLocationIds = await _db.Queryable<WmsDistaskH>().Where(it => input.disTaskIds.Contains(it.id)).Select(it => it.startlocation_id).ToListAsync();
                 //更新起始库位，状态改为空闲、锁定状态，未锁定
-                if (startLocationIds?.Count > 0)
+                if (carryAndLocIds?.Count > 0)
                 {
+                    var startLocationIds = carryAndLocIds.Select(x => x.startlocation_id).ToList();
                     await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_use = ((int)EnumCarryStatus.空闲).ToString(), is_lock = 0 }).Where(it => startLocationIds.Contains(it.id)).ExecuteCommandAsync();
                 }
 
@@ -440,13 +441,11 @@ namespace Tnb.WarehouseMgr
                             var loc = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == multiList[i].endlocation_id);
                             await _db.Updateable<WmsCarryCode>().SetColumns(it => new WmsCarryCode { warehouse_id = loc.wh_id, location_id = multiList[i].endlocation_id, location_code = multiList[i].endlocation_code }).Where(it => it.id == multiList[i].carry_id).ExecuteCommandAsync();
                         }
-
                     }
                 }
                 //更新库位信息，使用状态为 使用，锁定状态为未锁定
                 if (disTasks?.Count > 0)
                 {
-                    var destLocIds = disTasks.Select(it => it.endlocation_id).ToList();
                     var multis = disTasks.Select(it => (it.endlocation_id, it.carry_status)).ToList();
                     for (int i = 0; i < multis.Count; i++)
                     {
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
index bc7caca0..5219afc2 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
@@ -150,7 +150,7 @@ namespace Tnb.WarehouseMgr
                             carryMats = carryMats.OrderBy(o => o.create_time).GroupBy(g => new { g.carry_id, g.material_id, g.code_batch })
                                      .Select(x =>
                                      {
-                                         WmsCarryMat? carryMat = x.FirstOrDefault()!;
+                                         WmsCarryMat? carryMat = x.FirstOrDefault();
                                          carryMat.need_qty = x.Sum(d => d.need_qty);
                                          return carryMat;
                                      })
@@ -505,7 +505,7 @@ namespace Tnb.WarehouseMgr
                         {
                             outstockDs.ForEach(x => x.line_status = WmsWareHouseConst.BILLSTATUS_ON_ID);
                             await _db.Updateable(outstockDs).UpdateColumns(it => it.line_status).ExecuteCommandAsync();
-                            await _db.Updateable<WmsOutstockH>().SetColumns(it => new WmsOutstockH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it=>it.id == outstock.id).ExecuteCommandAsync();
+                            await _db.Updateable<WmsOutstockH>().SetColumns(it => new WmsOutstockH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == outstock.id).ExecuteCommandAsync();
                             GenPreTaskUpInput genPreTaskAfterUpInput = new();
                             genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList();
                             genPreTaskAfterUpInput.LocationIds = new HashSet<string>(locIds).ToList();
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
index a2c1a441..d1f52154 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
@@ -99,34 +99,37 @@ namespace Tnb.WarehouseMgr
                 {
                     var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id);
                     //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序）
+                    if (points?.Count <= 2) throw new AppFriendlyException("该路径不存在", 500);
                     if (points?.Count > 0)
                     {
-                        if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500);
                         var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it =>
                         {
                             var sPoint = it.FirstOrDefault();
                             var ePoint = it.LastOrDefault();
 
-                            WmsPretaskH preTask = new();
-                            preTask.org_id = _userManager.User.OrganizeId;
-                            preTask.startlocation_id = sPoint?.location_id!;
-                            preTask.startlocation_code = sPoint?.location_code!;
-                            preTask.endlocation_id = ePoint?.location_id!;
-                            preTask.endlocation_code = ePoint?.location_code!;
-                            preTask.start_floor = sPoint?.floor.ToString();
-                            preTask.end_floor = ePoint?.floor.ToString();
-                            preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
-                            preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
-                            preTask.biz_type = input.data[nameof(WmsPretaskH.biz_type)]?.ToString()!;
-                            preTask.task_type = WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID;
-                            preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!;
-                            preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!;
-                            preTask.area_id = sPoint?.area_id!;
-                            preTask.area_code = it.Key;
-                            preTask.require_id = input.data[nameof(WmsHandleH.require_id)].ToString();
-                            preTask.require_code = input.data[nameof(WmsHandleH.require_code)]?.ToString()!;
-                            preTask.create_id = _userManager.UserId;
-                            preTask.create_time = DateTime.Now;
+                            WmsPretaskH preTask = new()
+                            {
+                                org_id = _userManager.User.OrganizeId,
+                                startlocation_id = sPoint?.location_id ?? "",
+                                startlocation_code = sPoint?.location_code ?? "",
+                                endlocation_id = ePoint?.location_id ?? "",
+                                endlocation_code = ePoint?.location_code ?? "",
+                                start_floor = sPoint?.floor.ToString(),
+                                end_floor = ePoint?.floor.ToString(),
+                                bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(),
+                                status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID,
+                                biz_type = input.data[nameof(WmsPretaskH.biz_type)]?.ToString() ?? "",
+                                task_type = WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID,
+                                carry_id = input.data[nameof(preTask.carry_id)]?.ToString() ?? "",
+                                carry_code = input.data[nameof(preTask.carry_code)]?.ToString() ?? "",
+                                area_id = sPoint?.area_id ?? "",
+                                area_code = it.Key,
+                                require_id = input.data[nameof(WmsHandleH.require_id)].ToString(),
+                                require_code = input.data[nameof(WmsHandleH.require_code)]?.ToString(),
+                                create_id = _userManager.UserId,
+                                create_time = DateTime.Now,
+                            };
+
                             return preTask;
                         }).ToList();
                         //生成预任务条码信息
@@ -221,7 +224,6 @@ namespace Tnb.WarehouseMgr
                                 {
                                     foreach (var jo in jArr.Children())
                                     {
-                                        var materialId = jo.Value<string>(nameof(WmsInstockCode.material_id));
                                         var materialCode = jo.Value<string>(nameof(WmsInstockCode.material_code));
                                         var codeBatch = jo.Value<string>(nameof(WmsInstockCode.code_batch));
                                         var b = items.Find(x => x.material_code == materialCode && x.code_batch == codeBatch);
@@ -229,7 +231,7 @@ namespace Tnb.WarehouseMgr
                                         {
                                             var c = DeepCopyHelper<WmsInstockCode>.DeepCopy(b);
                                             c.id = SnowflakeIdHelper.NextId();
-                                            c.bill_d_id = instockDetails.Find(x => x.material_code == materialCode && x.code_batch == codeBatch)?.id!;
+                                            c.bill_d_id = b.id;
                                             c.barcode = jo.Value<string>(nameof(WmsInstockCode.barcode))!;
                                             c.codeqty = jo.Value<int>(nameof(WmsInstockCode.codeqty));
                                             instockCOdes.Add(c);
@@ -297,7 +299,7 @@ namespace Tnb.WarehouseMgr
                         }
                     }
                     await _db.Updateable(instockDetails).ExecuteCommandAsync();
-                    var allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it=>it.bill_id ==input.requireId).ToListAsync();
+                    var allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => it.bill_id == input.requireId).ToListAsync();
                     if (allInstockDetails.All(x => x.line_status == WmsWareHouseConst.BILLSTATUS_COMPLETE_ID))
                     {
                         await _db.Updateable<WmsInstockH>().SetColumns(it => new WmsInstockH { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync();
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs
index cfc398cd..7b5c05af 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs
@@ -21,6 +21,7 @@ using Tnb.WarehouseMgr.Entities.Consts;
 using Tnb.WarehouseMgr.Entities.Dto;
 using Tnb.WarehouseMgr.Entities.Enums;
 using Tnb.WarehouseMgr.Interfaces;
+using UAParser;
 
 namespace Tnb.WarehouseMgr
 {
@@ -69,11 +70,19 @@ namespace Tnb.WarehouseMgr
                         List<WmsCarryMat> carryMats = new();
                         List<WmsCarryCode> carryCodes = new();
                         List<string> carryIds = new();
+
+                        var whereExpr = Expressionable.Create<WmsCarryH, WmsCarryCode, BasLocation>()
+                                            .And((a, b, c) => a.is_lock == 0)
+                                            .And((a, b, c) => !string.IsNullOrEmpty(a.location_id))
+                                            .And((a, b, c) => a.status == (int)EnumCarryStatus.占用);
                         foreach (var os in setSortingDList)
                         {
+                            whereExpr.And((a, b, c) => b.material_id == os.material_id)
+                                     .And((a, b, c) => c.wh_id == os.warehouse_id)
+                                     .AndIF(!string.IsNullOrEmpty(os.code_batch), (a, b, c) => b.code_batch == os.code_batch);
+
                             var carryCodesPart = await _db.Queryable<WmsCarryH>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.carry_id).InnerJoin<BasLocation>((a, b, c) => a.location_id == c.id)
-                                                      .Where((a, b, c) => b.material_id == os.material_id && a.is_lock == 0 && !string.IsNullOrEmpty(a.location_id) && a.status == (int)EnumCarryStatus.占用 && c.wh_id == os.warehouse_id)
-                                                      .WhereIF(!string.IsNullOrEmpty(os.code_batch), (a, b) => b.code_batch == os.code_batch)
+                                                      .Where(whereExpr.ToExpression())
                                                       .Select<WmsCarryCode>()
                                                       .ToListAsync();
                             if (carryCodesPart?.Count > 0)
@@ -158,7 +167,7 @@ namespace Tnb.WarehouseMgr
                                 pretaskCodes.AddRange(curPreTaskCodes);
                             }
                             await _wareHouseService.GenPreTask(preTasks, pretaskCodes);
-                            await _db.Updateable<WmsSetsortingH>().SetColumns(it => new WmsSetsortingH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).ExecuteCommandAsync();
+                            await _db.Updateable<WmsSetsortingH>().SetColumns(it => new WmsSetsortingH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it=> it.id == singleSorting.id).ExecuteCommandAsync();
                             GenPreTaskUpInput genPreTaskAfterUpInput = new();
                             genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList();
                             genPreTaskAfterUpInput.LocationIds = new HashSet<string>(locIds).ToList();