执行代码清理，修复warning
This commit is contained in:
@@ -89,48 +89,48 @@ namespace Tnb.WarehouseMgr
|
||||
{
|
||||
if (_userManager.User.IsNull())
|
||||
{
|
||||
var curUser = await GetUserIdentity();
|
||||
System.Security.Claims.ClaimsPrincipal curUser = await GetUserIdentity();
|
||||
await SetUserEntity(_userManager, curUser);
|
||||
}
|
||||
|
||||
var curDb = _db.CopyNew();
|
||||
SqlSugarClient curDb = _db.CopyNew();
|
||||
|
||||
try
|
||||
{
|
||||
await curDb.Ado.BeginTranAsync();
|
||||
|
||||
string firstLocationId = "27010980724501", secondLocationId = "27010987857941";
|
||||
var endLocation = await curDb.Queryable<BasLocation>().FirstAsync(it => it.id == secondLocationId);
|
||||
BasLocation endLocation = await curDb.Queryable<BasLocation>().FirstAsync(it => it.id == secondLocationId);
|
||||
|
||||
var setSortings = await curDb.Queryable<WmsSetsortingH>()
|
||||
List<WmsSetsortingH> setSortings = await curDb.Queryable<WmsSetsortingH>()
|
||||
.Where(a => a.status == WmsWareHouseConst.BILLSTATUS_ADD_ID)
|
||||
.Select<WmsSetsortingH>()
|
||||
.OrderBy(a => a.seq)
|
||||
.ToListAsync();
|
||||
var items = await curDb.Queryable<WmsSetsortingH>().Where(it => it.status == WmsWareHouseConst.BILLSTATUS_ON_ID).ToListAsync();
|
||||
var onFlag = items?.Count > 0;
|
||||
List<WmsSetsortingH> items = await curDb.Queryable<WmsSetsortingH>().Where(it => it.status == WmsWareHouseConst.BILLSTATUS_ON_ID).ToListAsync();
|
||||
bool onFlag = items?.Count > 0;
|
||||
|
||||
if (setSortings?.Count > 0 && !onFlag)
|
||||
{
|
||||
var singleSorting = setSortings[0];
|
||||
WmsSetsortingH singleSorting = setSortings[0];
|
||||
|
||||
var setSortingDList = await curDb.Queryable<WmsSetsortingD>().Where(it => it.bill_id == singleSorting.id).ToListAsync();
|
||||
List<WmsSetsortingD> setSortingDList = await curDb.Queryable<WmsSetsortingD>().Where(it => it.bill_id == singleSorting.id).ToListAsync();
|
||||
if (setSortingDList?.Count > 0)
|
||||
{
|
||||
List<WmsCarryMat> carryMats = new();
|
||||
List<WmsCarryCode> carryCodes = new();
|
||||
List<string> carryIds = new();
|
||||
|
||||
foreach (var os in setSortingDList)
|
||||
foreach (WmsSetsortingD os in setSortingDList)
|
||||
{
|
||||
var OutStockStrategyInput = new OutStockStrategyQuery
|
||||
OutStockStrategyQuery OutStockStrategyInput = new()
|
||||
{
|
||||
material_id = os.material_id,
|
||||
warehouse_id = os.warehouse_id,
|
||||
code_batch = os.code_batch,
|
||||
};
|
||||
var outStkCarrys = await _wareHouseService.OutStockStrategy(OutStockStrategyInput);
|
||||
var carryCodesPart = await curDb.Queryable<WmsCarryH>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.carry_id).InnerJoin<BasLocation>((a, b, c) => a.location_id == c.id)
|
||||
List<WmsCarryH> outStkCarrys = await _wareHouseService.OutStockStrategy(OutStockStrategyInput);
|
||||
List<WmsCarryCode> carryCodesPart = await curDb.Queryable<WmsCarryH>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.carry_id).InnerJoin<BasLocation>((a, b, c) => a.location_id == c.id)
|
||||
.Where((a, b) => outStkCarrys.Select(x => x.id).Contains(b.carry_id))
|
||||
.Select<WmsCarryCode>()
|
||||
.ToListAsync();
|
||||
@@ -139,7 +139,7 @@ namespace Tnb.WarehouseMgr
|
||||
if (carryCodesPart?.Count > 0)
|
||||
{
|
||||
carryCodes.AddRange(carryCodesPart);
|
||||
var codeQty = carryCodes.Sum(x => x.codeqty);
|
||||
decimal codeQty = carryCodes.Sum(x => x.codeqty);
|
||||
if (codeQty < os.pr_qty)
|
||||
{
|
||||
throw new AppFriendlyException($"需要出库[{os.pr_qty}],实际库存{codeQty},数量不足", 500);
|
||||
@@ -160,7 +160,7 @@ namespace Tnb.WarehouseMgr
|
||||
break;
|
||||
}
|
||||
}
|
||||
var partCarryMats = curCarryCodes.Adapt<List<WmsCarryMat>>();
|
||||
List<WmsCarryMat> partCarryMats = curCarryCodes.Adapt<List<WmsCarryMat>>();
|
||||
for (int i = 0; i < partCarryMats.Count; i++)
|
||||
{
|
||||
partCarryMats[i].need_qty = curCarryCodes[i].codeqty;
|
||||
@@ -175,17 +175,17 @@ namespace Tnb.WarehouseMgr
|
||||
carryMats = carryMats.OrderBy(o => o.create_time).GroupBy(g => new { g.carry_id, g.material_id, g.code_batch })
|
||||
.Select(x =>
|
||||
{
|
||||
var arr = x.ToArray();
|
||||
WmsCarryMat[] arr = x.ToArray();
|
||||
WmsCarryMat carryMat = arr[^arr.Length];
|
||||
carryMat.need_qty = arr.Sum(d => d.need_qty);
|
||||
return carryMat;
|
||||
})
|
||||
.ToList();
|
||||
await curDb.Insertable(carryMats).ExecuteCommandAsync();
|
||||
_ = await curDb.Insertable(carryMats).ExecuteCommandAsync();
|
||||
|
||||
carryIds = carryMats.Select(x => x.carry_id).Distinct().ToList();
|
||||
|
||||
await curDb.Updateable<WmsCarryH>()
|
||||
_ = await curDb.Updateable<WmsCarryH>()
|
||||
.SetColumns(it => new WmsCarryH
|
||||
{
|
||||
out_status = ((int)EnumOutStatus.全部出).ToString(),
|
||||
@@ -201,24 +201,27 @@ namespace Tnb.WarehouseMgr
|
||||
//天益项目不需要
|
||||
//await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.分拣出).ToString() }).Where(it => sortingOutIds.Contains(it.id)).ExecuteCommandAsync();
|
||||
}
|
||||
var carrys = await curDb.Queryable<WmsCarryH>().Where(it => carryIds.Contains(it.id)).ToArrayAsync();
|
||||
WmsCarryH[] carrys = await curDb.Queryable<WmsCarryH>().Where(it => carryIds.Contains(it.id)).ToArrayAsync();
|
||||
if (carrys?.Length > 0)
|
||||
{
|
||||
if (setSortings?.Count > 0)
|
||||
{
|
||||
var curCarry = carrys[^carrys.Length];
|
||||
var isMatch = await IsCarryAndLocationMatchByCarryStd(curCarry, endLocation);
|
||||
if (!isMatch) throw new AppFriendlyException("库位与载具规格不匹配", 500);
|
||||
WmsCarryH curCarry = carrys[^carrys.Length];
|
||||
bool isMatch = await IsCarryAndLocationMatchByCarryStd(curCarry, endLocation);
|
||||
if (!isMatch)
|
||||
{
|
||||
throw new AppFriendlyException("库位与载具规格不匹配", 500);
|
||||
}
|
||||
}
|
||||
List<WmsPretaskH> preTasks = new();
|
||||
List<string> locIds = new();
|
||||
|
||||
var mid = 6;
|
||||
int mid = 6;
|
||||
|
||||
if (carrys.Length > mid)
|
||||
{
|
||||
var leftCarrys = carrys[..mid];
|
||||
var rightCarrys = carrys[mid..];
|
||||
WmsCarryH[] leftCarrys = carrys[..mid];
|
||||
WmsCarryH[] rightCarrys = carrys[mid..];
|
||||
await InnerGenPreTask(leftCarrys, locIds, firstLocationId, singleSorting.id, singleSorting.bill_code, preTasks, endLocation);
|
||||
await InnerGenPreTask(rightCarrys, locIds, secondLocationId, singleSorting.id, singleSorting.bill_code, preTasks, endLocation);
|
||||
}
|
||||
@@ -227,10 +230,10 @@ namespace Tnb.WarehouseMgr
|
||||
await InnerGenPreTask(carrys, locIds, firstLocationId, singleSorting.id, singleSorting.bill_code, preTasks, endLocation);
|
||||
}
|
||||
List<WmsPretaskCode> pretaskCodes = new();
|
||||
foreach (var pt in preTasks)
|
||||
foreach (WmsPretaskH pt in preTasks)
|
||||
{
|
||||
var partCodes = carryCodes.FindAll(x => x.carry_id == pt.carry_id).Distinct().ToList();
|
||||
var curPreTaskCodes = partCodes.Adapt<List<WmsPretaskCode>>();
|
||||
List<WmsCarryCode> partCodes = carryCodes.FindAll(x => x.carry_id == pt.carry_id).Distinct().ToList();
|
||||
List<WmsPretaskCode> curPreTaskCodes = partCodes.Adapt<List<WmsPretaskCode>>();
|
||||
curPreTaskCodes.ForEach(x =>
|
||||
{
|
||||
x.id = SnowflakeIdHelper.NextId();
|
||||
@@ -239,11 +242,13 @@ namespace Tnb.WarehouseMgr
|
||||
});
|
||||
pretaskCodes.AddRange(curPreTaskCodes);
|
||||
}
|
||||
await _wareHouseService.GenPreTask(preTasks, pretaskCodes);
|
||||
await curDb.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();
|
||||
_ = await _wareHouseService.GenPreTask(preTasks, pretaskCodes);
|
||||
_ = await curDb.Updateable<WmsSetsortingH>().SetColumns(it => new WmsSetsortingH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == singleSorting.id).ExecuteCommandAsync();
|
||||
GenPreTaskUpInput genPreTaskAfterUpInput = new()
|
||||
{
|
||||
CarryIds = preTasks.Select(x => x.carry_id).ToList(),
|
||||
LocationIds = new HashSet<string>(locIds).ToList()
|
||||
};
|
||||
await _wareHouseService.GenInStockTaskHandleAfter(genPreTaskAfterUpInput, it => new WmsCarryH { is_lock = 1, carry_status = ((int)EnumCarryStatus.齐套分拣).ToString() }, it => new BasLocation { is_use = ((int)EnumCarryStatus.齐套分拣).ToString(), is_lock = 1 });
|
||||
}
|
||||
|
||||
@@ -265,7 +270,7 @@ namespace Tnb.WarehouseMgr
|
||||
RequestMethod = App.HttpContext?.Request?.Method,
|
||||
userIdentity = await GetUserIdentity(_userManager.ToKen),
|
||||
};
|
||||
var timedTaskEx = ex.ToTimedTaskException(ei);
|
||||
TimedTaskException timedTaskEx = ex.ToTimedTaskException(ei);
|
||||
//cts?.Cancel();
|
||||
throw timedTaskEx;
|
||||
}
|
||||
@@ -279,14 +284,14 @@ namespace Tnb.WarehouseMgr
|
||||
|
||||
private async Task InnerGenPreTask(WmsCarryH[] carrys, List<string> locIds, string eLocationId, string requireId, string requireCode, List<WmsPretaskH> preTasks, BasLocation endLocation)
|
||||
{
|
||||
foreach (var carry in carrys)
|
||||
foreach (WmsCarryH carry in carrys)
|
||||
{
|
||||
WmsPointH sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == carry.location_id);
|
||||
WmsPointH ePoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == eLocationId);
|
||||
|
||||
if (sPoint != null && ePoint != null)
|
||||
{
|
||||
var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id);
|
||||
List<WmsPointH>? points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id);
|
||||
if (points?.Count > 0)
|
||||
{
|
||||
locIds.AddRange(points.Select(x => x.location_id).ToList()!);
|
||||
@@ -294,11 +299,15 @@ namespace Tnb.WarehouseMgr
|
||||
//根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序）
|
||||
if (points?.Count > 0)
|
||||
{
|
||||
if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500);
|
||||
var curPreTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it =>
|
||||
if (points.Count <= 2)
|
||||
{
|
||||
var sPoint = it.FirstOrDefault();
|
||||
var ePoint = it.LastOrDefault();
|
||||
throw new AppFriendlyException("该路径不存在", 500);
|
||||
}
|
||||
|
||||
List<WmsPretaskH> curPreTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it =>
|
||||
{
|
||||
WmsPointH? sPoint = it.FirstOrDefault();
|
||||
WmsPointH? ePoint = it.LastOrDefault();
|
||||
|
||||
WmsPretaskH preTask = new()
|
||||
{
|
||||
@@ -340,20 +349,23 @@ namespace Tnb.WarehouseMgr
|
||||
|
||||
public override async Task ModifyAsync(WareHouseUpInput input)
|
||||
{
|
||||
if (input == null) throw new ArgumentNullException(nameof(input));
|
||||
if (input == null)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(input));
|
||||
}
|
||||
//根据载具更新明细表状态
|
||||
try
|
||||
{
|
||||
await _db.Ado.BeginTranAsync();
|
||||
|
||||
var carryId = input.carryIds[^input.carryIds.Count];
|
||||
var ssds = await _db.Queryable<WmsSetsortingD>().Where(it => it.bill_id == input.requireId).ToListAsync();
|
||||
var carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carryId).ToListAsync();
|
||||
string carryId = input.carryIds[^input.carryIds.Count];
|
||||
List<WmsSetsortingD>? ssds = await _db.Queryable<WmsSetsortingD>().Where(it => it.bill_id == input.requireId).ToListAsync();
|
||||
List<WmsCarryCode> carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carryId).ToListAsync();
|
||||
|
||||
var sortingCoees = carryCodes.Adapt<List<WmsSetsortingCode>>();
|
||||
List<WmsSetsortingCode> sortingCoees = carryCodes.Adapt<List<WmsSetsortingCode>>();
|
||||
sortingCoees.ForEach(x =>
|
||||
{
|
||||
var billDId = ssds?.Find(xx => xx.material_id == x.material_id && xx.code_batch == x.code_batch)?.id;
|
||||
string? billDId = ssds?.Find(xx => xx.material_id == x.material_id && xx.code_batch == x.code_batch)?.id;
|
||||
if (billDId.IsNullOrEmpty())
|
||||
{
|
||||
billDId = ssds?.Find(xx => xx.material_id == x.material_id)?.id;
|
||||
@@ -365,43 +377,36 @@ namespace Tnb.WarehouseMgr
|
||||
x.create_id = _userManager.UserId;
|
||||
x.create_time = DateTime.Now;
|
||||
});
|
||||
await _db.Insertable(sortingCoees).ExecuteCommandAsync();
|
||||
var detailIds = sortingCoees.Select(x => x.bill_d_id).ToList();
|
||||
var curSortingDetails = ssds.FindAll(x => detailIds.Contains(x.id));
|
||||
var dic = sortingCoees.GroupBy(g => g.bill_d_id).ToDictionary(x => x.Key, x => x.Select(x => x.codeqty).ToList());
|
||||
foreach (var osd in curSortingDetails)
|
||||
_ = await _db.Insertable(sortingCoees).ExecuteCommandAsync();
|
||||
List<string> detailIds = sortingCoees.Select(x => x.bill_d_id).ToList();
|
||||
List<WmsSetsortingD> curSortingDetails = ssds.FindAll(x => detailIds.Contains(x.id));
|
||||
Dictionary<string, List<int>> dic = sortingCoees.GroupBy(g => g.bill_d_id).ToDictionary(x => x.Key, x => x.Select(x => x.codeqty).ToList());
|
||||
foreach (WmsSetsortingD osd in curSortingDetails)
|
||||
{
|
||||
if (dic.ContainsKey(osd.id))
|
||||
{
|
||||
osd.qty += dic[osd.id].Sum(d => d);
|
||||
if (osd.qty >= osd.pr_qty)
|
||||
{
|
||||
osd.line_status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID;
|
||||
}
|
||||
else
|
||||
{
|
||||
osd.line_status = WmsWareHouseConst.BILLSTATUS_ON_ID;
|
||||
}
|
||||
osd.line_status = osd.qty >= osd.pr_qty ? WmsWareHouseConst.BILLSTATUS_COMPLETE_ID : WmsWareHouseConst.BILLSTATUS_ON_ID;
|
||||
}
|
||||
}
|
||||
await _db.Updateable(curSortingDetails).ExecuteCommandAsync();
|
||||
_ = await _db.Updateable(curSortingDetails).ExecuteCommandAsync();
|
||||
if (curSortingDetails.All(it => it.line_status == WmsWareHouseConst.BILLSTATUS_COMPLETE_ID))
|
||||
{
|
||||
await _db.Updateable<WmsSetsortingH>().SetColumns(it => new WmsSetsortingH { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync();
|
||||
_ = await _db.Updateable<WmsSetsortingH>().SetColumns(it => new WmsSetsortingH { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync();
|
||||
}
|
||||
var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId);
|
||||
WmsCarryH carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId);
|
||||
if (carry != null)
|
||||
{
|
||||
if (carry.location_id?.IsNotEmptyOrNull() ?? false)
|
||||
{
|
||||
await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_use = ((int)EnumCarryStatus.空闲).ToString() }).Where(it => it.id == carry.location_id).ExecuteCommandAsync();
|
||||
_ = await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_use = ((int)EnumCarryStatus.空闲).ToString() }).Where(it => it.id == carry.location_id).ExecuteCommandAsync();
|
||||
}
|
||||
carry.out_status = ((int)EnumOutStatus.正常).ToString();
|
||||
carry.carry_status = ((int)EnumCarryStatus.齐套).ToString();
|
||||
carry.location_id = null;
|
||||
carry.location_code = null;
|
||||
await _db.Updateable(carry).UpdateColumns(it => new { it.out_status, it.carry_status, it.location_id, it.location_code }).ExecuteCommandAsync();
|
||||
await _db.Deleteable<WmsCarryMat>().Where(it => it.carry_id == carryId).ExecuteCommandAsync();
|
||||
_ = await _db.Updateable(carry).UpdateColumns(it => new { it.out_status, it.carry_status, it.location_id, it.location_code }).ExecuteCommandAsync();
|
||||
_ = await _db.Deleteable<WmsCarryMat>().Where(it => it.carry_id == carryId).ExecuteCommandAsync();
|
||||
}
|
||||
|
||||
await _db.Ado.CommitTranAsync();
|
||||
|
||||
Reference in New Issue
Block a user