From 418133e475dbe720a75a12a25e978b4dd29cad93 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 4 Jul 2023 09:45:22 +0800 Subject: [PATCH] =?UTF-8?q?wms=20=E6=9C=8D=E5=8A=A1=E6=B6=88=E9=99=A4warni?= =?UTF-8?q?ng?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/Dp.cs | 2 +- .../Tnb.WarehouseMgr/WareHouseService.cs | 2 +- .../WmsCarryMoveInStockService.cs | 2 +- .../WmsCarryMoveOutStockService.cs | 8 ++++---- WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs | 2 +- .../Tnb.WarehouseMgr/WmsCarryUnbindService.cs | 2 +- .../Tnb.WarehouseMgr/WmsDeliveryService.cs | 4 ++-- .../Tnb.WarehouseMgr/WmsEmptyInstockService.cs | 8 ++++---- .../Tnb.WarehouseMgr/WmsEmptyOutstockService .cs | 8 ++++---- .../Tnb.WarehouseMgr/WmsInStockService.cs | 2 +- .../Tnb.WarehouseMgr/WmsKittingInStkService.cs | 8 ++++---- .../Tnb.WarehouseMgr/WmsOutBaleService.cs | 8 ++++---- .../Tnb.WarehouseMgr/WmsPDACarryBindService.cs | 4 ++-- .../WmsPDACarryMoveInStockService.cs | 8 ++++---- .../WmsPDACarryMoveOutStockService.cs | 8 ++++---- .../WmsPDACarryUnbindService .cs | 2 +- .../Tnb.WarehouseMgr/WmsPDADeliveryService.cs | 16 ++++++++-------- .../WmsPDAEmptyInstockService.cs | 4 ++-- .../WmsPDAEmptyOutstockService .cs | 2 +- .../WmsPDAExceptionCompleteService.cs | 2 +- .../Tnb.WarehouseMgr/WmsPDAFeedingService.cs | 2 +- .../Tnb.WarehouseMgr/WmsPDAInStockService.cs | 4 ++-- .../Tnb.WarehouseMgr/WmsPDAInbaleService.cs | 4 ++-- .../WmsPDAOutBaleServiceService.cs | 2 +- .../Tnb.WarehouseMgr/WmsPDATransferService.cs | 8 ++++---- .../Tnb.WarehouseMgr/WmsSetSortingService.cs | 2 +- .../Tnb.WarehouseMgr/WmskittingOutService.cs | 2 +- 27 files changed, 63 insertions(+), 63 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/Dp.cs b/WarehouseMgr/Tnb.WarehouseMgr/Dp.cs index cea22b84..4ba914fc 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/Dp.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/Dp.cs @@ -50,7 +50,7 @@ namespace Tnb.WarehouseMgr } if (sRoads_EPointIds?.Count > 0) { - var subRoads = roads.FindAll(x => sRoads_EPointIds.Contains(x.startpoint_id) && !isVisited[x.endpoint_id]); + var subRoads = roads?.FindAll(x => sRoads_EPointIds.Contains(x.startpoint_id) && !isVisited[x.endpoint_id]); if (subRoads?.Count > 0) { for (int i = 0; i < subRoads.Count; i++) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 63917c94..41cb4497 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -514,7 +514,7 @@ namespace Tnb.WarehouseMgr await _db.Ado.CommitTranAsync(); } } - catch (Exception ex) + catch (Exception) { await _db.Ado.RollbackTranAsync(); } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs index e6df3d6f..93da5a11 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs @@ -151,7 +151,7 @@ namespace Tnb.WarehouseMgr await _db.Ado.CommitTranAsync(); } - catch (Exception ex) + catch (Exception) { await _db.Ado.RollbackTranAsync(); throw; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs index 5a01a90e..c4e28b0b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs @@ -68,8 +68,8 @@ namespace Tnb.WarehouseMgr //入库取终点 //var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 }; var carry = await _db.Queryable().FirstAsync(it => it.id == input.data[nameof(WmsMoveOutstock.carry_id)].ToString()); - WmsPointH sPoint = null; - WmsPointH ePoint = null; + WmsPointH? sPoint = null; + WmsPointH? ePoint = null; if (input.data.ContainsKey(nameof(WmsPointH.location_id))) { ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); @@ -118,7 +118,7 @@ namespace Tnb.WarehouseMgr if (loc.is_sign ==0 ) { preTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值 } - var isOk = await _wareHouseService.GenPreTask(preTasks,null); + var isOk = await _wareHouseService.GenPreTask(preTasks,null!); if (isOk) { var preTaskUpInput = new GenPreTaskUpInput(); @@ -143,7 +143,7 @@ namespace Tnb.WarehouseMgr await _db.Ado.CommitTranAsync(); } - catch (Exception ex) + catch (Exception) { await _db.Ado.RollbackTranAsync(); throw; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs index 0aba37d9..86984f8b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs @@ -181,7 +181,7 @@ namespace Tnb.WarehouseMgr //删除载具条码 await _db.Deleteable().Where(it => it.carry_id == carryObj.id).ExecuteCommandHasChangeAsync(); } - catch (Exception ex) + catch (Exception) { } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs index f458c58b..4be4e239 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs @@ -94,7 +94,7 @@ namespace Tnb.WarehouseMgr } carry.carry_status = ((int)EnumCarryStatus.空闲).ToString(); row = await _db.Updateable(carry).ExecuteCommandAsync(); - subCarry.carry_status = ((int)EnumCarryStatus.空闲).ToString(); + subCarry!.carry_status = ((int)EnumCarryStatus.空闲).ToString(); row = await _db.Updateable(subCarry).ExecuteCommandAsync(); isOk = (row > 0); if (!isOk) throw Oops.Oh(ErrorCode.COM1001); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs index df656f83..228a5137 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs @@ -111,8 +111,8 @@ namespace Tnb.WarehouseMgr await _runService.Create(templateEntity, input); // 计算路径，插入预任务申请 - WmsPointH sPoint = null; - WmsPointH ePoint = null; + WmsPointH? sPoint = null; + WmsPointH? ePoint = null; if (input.data.ContainsKey(nameof(WmsDelivery.startlocation_id))) { sPoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.startlocation_id)].ToString()); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs index 80e2155d..02c57517 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs @@ -71,8 +71,8 @@ namespace Tnb.WarehouseMgr //入库取终点 var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString()!, Size = 1 }; var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput); - WmsPointH sPoint = null; - WmsPointH ePoint = null; + WmsPointH? sPoint = null; + WmsPointH? ePoint = null; if (input.data.ContainsKey(nameof(WmsPointH.location_id))) { sPoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); @@ -116,7 +116,7 @@ namespace Tnb.WarehouseMgr preTask.create_time = DateTime.Now; return preTask; }).ToList(); - var isOk = await _wareHouseService.GenPreTask(preTasks,null); + var isOk = await _wareHouseService.GenPreTask(preTasks,null!); if (isOk) { var preTaskUpInput = new GenPreTaskUpInput(); @@ -154,7 +154,7 @@ namespace Tnb.WarehouseMgr await _db.Ado.CommitTranAsync(); } - catch (Exception ex) + catch (Exception) { await _db.Ado.RollbackTranAsync(); throw; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs index e22b93d0..440ed7ae 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs @@ -81,8 +81,8 @@ namespace Tnb.WarehouseMgr && a.carry_status == ((int)EnumCarryStatus.空闲).ToString() && a.is_lock == 0 && b.is_lock == 0 && b.is_type == ((int)EnumLocationType.存储库位).ToString()) .ToListAsync(); - WmsPointH sPoint = null; - WmsPointH ePoint = null; + WmsPointH? sPoint = null; + WmsPointH? ePoint = null; if (input.data.ContainsKey(nameof(WmsPointH.location_id))) { ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); @@ -137,7 +137,7 @@ namespace Tnb.WarehouseMgr { preTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值 } - isOk = await _wareHouseService.GenPreTask(preTasks, null); + isOk = await _wareHouseService.GenPreTask(preTasks, null!); } if (isOk) @@ -175,7 +175,7 @@ namespace Tnb.WarehouseMgr await _db.Ado.CommitTranAsync(); } - catch (Exception ex) + catch (Exception) { await _db.Ado.RollbackTranAsync(); throw; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs index 1aeb40d0..0581e074 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs @@ -153,7 +153,7 @@ namespace Tnb.WarehouseMgr await _db.Ado.CommitTranAsync(); } - catch (Exception ex) + catch (Exception) { await _db.Ado.RollbackTranAsync(); } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsKittingInStkService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsKittingInStkService.cs index 57d856cf..afe444a5 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsKittingInStkService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsKittingInStkService.cs @@ -72,8 +72,8 @@ namespace Tnb.WarehouseMgr //入库取终点 //出库起点 var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString()!, Size = 1 }; var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput); - WmsPointH sPoint = null; - WmsPointH ePoint = null; + WmsPointH? sPoint = null; + WmsPointH? ePoint = null; if (input.data.ContainsKey(nameof(WmsPointH.location_id))) { sPoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); @@ -197,9 +197,9 @@ namespace Tnb.WarehouseMgr await _db.Ado.CommitTranAsync(); } - catch (Exception ex) + catch (Exception) { - await _db.Ado.RollbackTranAsync(); + await _db.Ado.RollbackTranAsync(); throw; } return Task.FromResult(true); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutBaleService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutBaleService.cs index bc9210e6..d38712ef 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutBaleService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutBaleService.cs @@ -71,8 +71,8 @@ namespace Tnb.WarehouseMgr //入库取终点 //var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 }; var carry = await _db.Queryable().FirstAsync(it => it.id == input.data[nameof(WmsOutbale.carry_id)].ToString()); - WmsPointH sPoint = null; - WmsPointH ePoint = null; + WmsPointH? sPoint = null; + WmsPointH? ePoint = null; if (input.data.ContainsKey(nameof(WmsPointH.location_id))) { ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); @@ -122,7 +122,7 @@ namespace Tnb.WarehouseMgr { preTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值 } - var isOk = await _wareHouseService.GenPreTask(preTasks, null); + var isOk = await _wareHouseService.GenPreTask(preTasks, null!); if (isOk) { var preTaskUpInput = new GenPreTaskUpInput(); @@ -147,7 +147,7 @@ namespace Tnb.WarehouseMgr await _db.Ado.CommitTranAsync(); } - catch (Exception ex) + catch (Exception) { await _db.Ado.RollbackTranAsync(); throw; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs index 61a57092..dd207182 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs @@ -84,7 +84,7 @@ namespace Tnb.WarehouseMgr create_time = DateTime.Now }; var row = await _db.Insertable(wmsCarryD).ExecuteCommandAsync(); - carry.carry_status = ((int)EnumCarryStatus.占用).ToString(); + carry!.carry_status = ((int)EnumCarryStatus.占用).ToString(); row = await _db.Updateable(carry).ExecuteCommandAsync(); subCarry.carry_status = ((int)EnumCarryStatus.占用).ToString(); row = await _db.Updateable(subCarry).ExecuteCommandAsync(); @@ -121,7 +121,7 @@ namespace Tnb.WarehouseMgr } await _db.Ado.CommitTranAsync(); } - catch (Exception ex) + catch (Exception) { await _db.Ado.RollbackTranAsync(); throw; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs index b799a1e7..6b87d88e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs @@ -71,8 +71,8 @@ namespace Tnb.WarehouseMgr //入库取终点 //出库起点 var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString()!, Size = 1 }; var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput); - WmsPointH sPoint = null; - WmsPointH ePoint = null; + WmsPointH? sPoint = null; + WmsPointH? ePoint = null; if (input.data.ContainsKey(nameof(WmsPointH.location_id))) { sPoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); @@ -116,7 +116,7 @@ namespace Tnb.WarehouseMgr preTask.create_time = DateTime.Now; return preTask; }).ToList(); - var isOk = await _wareHouseService.GenPreTask(preTasks, null); + var isOk = await _wareHouseService.GenPreTask(preTasks, null!); if (isOk) { var preTaskUpInput = new GenPreTaskUpInput(); @@ -141,7 +141,7 @@ namespace Tnb.WarehouseMgr await _db.Ado.CommitTranAsync(); } - catch (Exception ex) + catch (Exception) { await _db.Ado.RollbackTranAsync(); throw; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs index 372ff3da..036ed9f3 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs @@ -67,8 +67,8 @@ namespace Tnb.WarehouseMgr await _runService.Create(templateEntity, input); //出库取起点 var carry = await _db.Queryable().FirstAsync(it => it.id == input.data[nameof(WmsMoveOutstock.carry_id)].ToString()); - WmsPointH sPoint = null; - WmsPointH ePoint = null; + WmsPointH? sPoint = null; + WmsPointH? ePoint = null; if (input.data.ContainsKey(nameof(WmsPointH.location_id))) { ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); @@ -119,7 +119,7 @@ namespace Tnb.WarehouseMgr { preTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值 } - var isOk = await _wareHouseService.GenPreTask(preTasks, null); + var isOk = await _wareHouseService.GenPreTask(preTasks, null!); if (isOk) { var preTaskUpInput = new GenPreTaskUpInput(); @@ -143,7 +143,7 @@ namespace Tnb.WarehouseMgr await _db.Ado.CommitTranAsync(); } - catch (Exception ex) + catch (Exception) { await _db.Ado.RollbackTranAsync(); throw; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs index ccb87675..2e4ebb7a 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs @@ -112,7 +112,7 @@ namespace Tnb.WarehouseMgr await _db.Ado.CommitTranAsync(); } - catch (Exception ex) + catch (Exception) { await _db.Ado.RollbackTranAsync(); throw; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDADeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDADeliveryService.cs index 70997e37..c2abfc96 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDADeliveryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDADeliveryService.cs @@ -36,13 +36,13 @@ namespace Tnb.WarehouseMgr public class WmsPDADeliveryService : BaseWareHouseService, IPdaStroage { private const string BizTypeId = "26125644258853"; - private readonly ISqlSugarClient? _db; - private readonly IRunService? _runService; - private readonly IVisualDevService? _visualDevService; - private readonly IBasLocationService? _basLocationService; - private readonly IWareHouseService? _wareHouseService; - private readonly IBillRullService? _billRullService; - private readonly IUserManager? _userManager; + private readonly ISqlSugarClient _db; + private readonly IRunService _runService; + private readonly IVisualDevService _visualDevService; + private readonly IBasLocationService _basLocationService; + private readonly IWareHouseService _wareHouseService; + private readonly IBillRullService _billRullService; + private readonly IUserManager _userManager; public WmsPDADeliveryService( ISqlSugarRepository repository, IRunService runService, @@ -69,7 +69,7 @@ namespace Tnb.WarehouseMgr /// public async Task GetUnStoreLocationListByCarryId([FromRoute] string carryId) { - var items = await _db.Queryable().LeftJoin((a, b) => a.location_id == b.id) + var items = await _db!.Queryable().LeftJoin((a, b) => a.location_id == b.id) .Where(a => a.id == carryId) .Select((a, b) => new { diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs index 90b8591b..051aa9d9 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs @@ -115,7 +115,7 @@ namespace Tnb.WarehouseMgr preTask.create_time = DateTime.Now; return preTask; }).ToList(); - var isOk = await _wareHouseService.GenPreTask(preTasks,null); + var isOk = await _wareHouseService.GenPreTask(preTasks,null!); if (isOk) { var preTaskUpInput = new GenPreTaskUpInput(); @@ -129,7 +129,7 @@ namespace Tnb.WarehouseMgr WmsHandleH handleH = new(); handleH.org_id = _userManager.User.OrganizeId; handleH.startlocation_id = input.data[nameof(WmsPointH.location_id)]?.ToString()!; - handleH.endlocation_id = endLocations[0].id; + handleH.endlocation_id = endLocations![0].id; handleH.bill_code = input.data[nameof(WmsHandleH.bill_code)]?.ToString()!; handleH.biz_type = input.data[nameof(WmsHandleH.biz_type)]?.ToString()!; handleH.carry_id = input.data[nameof(WmsHandleH.carry_id)]?.ToString()!; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs index baa5f93f..a38bbb9e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs @@ -134,7 +134,7 @@ namespace Tnb.WarehouseMgr { preTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值 } - isOk = await _wareHouseService.GenPreTask(preTasks, null); + isOk = await _wareHouseService.GenPreTask(preTasks, null!); } if (isOk) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAExceptionCompleteService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAExceptionCompleteService.cs index 12f92255..a64b2feb 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAExceptionCompleteService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAExceptionCompleteService.cs @@ -73,7 +73,7 @@ namespace Tnb.WarehouseMgr await _db.Ado.CommitTranAsync(); } - catch (Exception ex) + catch (Exception) { await _db.Ado.RollbackTranAsync(); throw; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs index 5908ac4a..a76e9516 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs @@ -149,7 +149,7 @@ namespace Tnb.WarehouseMgr //删除载具条码 await _db.Deleteable().Where(it => it.carry_id == carryObj.id).ExecuteCommandHasChangeAsync(); } - catch (Exception ex) + catch (Exception) { } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs index aff09c11..16303ca6 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs @@ -76,7 +76,7 @@ namespace Tnb.WarehouseMgr { await _db.Ado.BeginTranAsync(); - JArray jArr = null; + JArray? jArr = null; if (input.data.ContainsKey("tablefield115")) { jArr = JArray.Parse(input.data["tablefield115"].ToString()!); @@ -256,7 +256,7 @@ namespace Tnb.WarehouseMgr await _db.Ado.CommitTranAsync(); } - catch (Exception ex) + catch (Exception) { await _db.Ado.RollbackTranAsync(); throw; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs index b38da441..7322f013 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs @@ -72,8 +72,8 @@ namespace Tnb.WarehouseMgr var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString()!, Size = 1 }; var inbaleItem = await _db.Queryable().SingleAsync(it => it.bill_code == input.data[nameof(WmsInbale.bill_code)].ToString()); var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput); - WmsPointH sPoint = null; - WmsPointH ePoint = null; + WmsPointH? sPoint = null; + WmsPointH? ePoint = null; if (input.data.ContainsKey(nameof(WmsPointH.location_id))) { sPoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAOutBaleServiceService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAOutBaleServiceService.cs index d7435614..32c5d512 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAOutBaleServiceService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAOutBaleServiceService.cs @@ -143,7 +143,7 @@ namespace Tnb.WarehouseMgr await _db.Ado.CommitTranAsync(); } - catch (Exception ex) + catch (Exception) { await _db.Ado.RollbackTranAsync(); throw; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs index d141ab91..85a8f39c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs @@ -68,8 +68,8 @@ namespace Tnb.WarehouseMgr VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFERPDA_ID, true); await _runService.Create(templateEntity, input); // 计算路径，插入预任务申请 - WmsPointH sPoint = null; - WmsPointH ePoint = null; + WmsPointH? sPoint = null; + WmsPointH? ePoint = null; if (input.data.ContainsKey(nameof(WmsTransfer.startlocation_id))) { sPoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.startlocation_id)].ToString()); @@ -113,7 +113,7 @@ namespace Tnb.WarehouseMgr preTask.create_time = DateTime.Now; return preTask; }).ToList(); - var isOk = await _wareHouseService.GenPreTask(preTasks, null); + var isOk = await _wareHouseService.GenPreTask(preTasks, null!); if (isOk) { //查询库位表 @@ -139,7 +139,7 @@ namespace Tnb.WarehouseMgr await _db.Ado.CommitTranAsync(); } - catch (Exception ex) + catch (Exception) { await _db.Ado.RollbackTranAsync(); throw; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs index 6221d0c4..b45f486b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs @@ -169,7 +169,7 @@ namespace Tnb.WarehouseMgr await _db.Ado.CommitTranAsync(); } - catch (Exception ex) + catch (Exception) { await _db.Ado.RollbackTranAsync(); throw; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs index c3079634..fd50e85e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs @@ -184,7 +184,7 @@ namespace Tnb.WarehouseMgr await _warehouseService.GenPreTask(preTasks, null!); var subCarrys = await _db.Queryable().Where(it => it.carry_id == ko.carry_id).ToListAsync(); var carryIds = subCarrys.Select(x => x.carry_id).Concat(new[] { ko.carry_id }).Distinct().ToList(); - GenPreTaskUpInput genPreTaskInput = new() { CarryIds = carryIds, LocationIds = new List { carry.location_id!, ko.location_id! } }; + GenPreTaskUpInput genPreTaskInput = new() { CarryIds = carryIds!, LocationIds = new List { carry.location_id!, ko.location_id! } }; await _warehouseService.GenInStockTaskHandleAfter(genPreTaskInput, it => new WmsCarryH { is_lock = 1, carry_status = ((int)EnumCarryStatus.齐套).ToString() }, it => new BasLocation { is_lock = 1 }); }