wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

执行代码清理，修复warning

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:59:12 +08:00
parent c6b8dfc861
commit 1dbb17f103
118 changed files with 5046 additions and 4111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
View File

@@ -75,8 +75,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);
InStockStrategyQuery inStockStrategyInput = new() { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString()!, Size = 1 };
List<BasLocation> endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);
WmsPointH sPoint = null!;
WmsPointH ePoint = null!;
if (input.data.ContainsKey(nameof(WmsHandleH.startlocation_id)))
@@ -85,24 +85,32 @@ namespace Tnb.WarehouseMgr
}
if (endLocations?.Count > 0)
{
var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == input.data[nameof(WmsCarryD.carry_id)].ToString());
var loc = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == endLocations[0].id);
var isMatch = await IsCarryAndLocationMatchByCarryStd(carry, loc);
if (!isMatch) throw new AppFriendlyException("库位与载具规格不匹配", 500);
WmsCarryH carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == input.data[nameof(WmsCarryD.carry_id)].ToString());
BasLocation loc = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == endLocations[0].id);
bool isMatch = await IsCarryAndLocationMatchByCarryStd(carry, loc);
if (!isMatch)
{
throw new AppFriendlyException("库位与载具规格不匹配", 500);
}
ePoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == endLocations[0].id);
}
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 <= 2) throw new AppFriendlyException("该路径不存在", 500);
if (points?.Count <= 2)
{
throw new AppFriendlyException("该路径不存在", 500);
}
if (points?.Count > 0)
{
var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it =>
List<WmsPretaskH> preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it =>
{
var sPoint = it.FirstOrDefault();
var ePoint = it.LastOrDefault();
WmsPointH? sPoint = it.FirstOrDefault();
WmsPointH? ePoint = it.LastOrDefault();
WmsPretaskH preTask = new()
{
@@ -137,13 +145,13 @@ namespace Tnb.WarehouseMgr
}).ToList();
//生成预任务条码信息
List<WmsPretaskCode> pretaskCodes = new();
foreach (var pt in preTasks)
foreach (WmsPretaskH? pt in preTasks)
{
if (jArr?.Children().Count() > 0)
{
foreach (var jo in jArr.Children())
foreach (JToken jo in jArr.Children())
{
var ptc = pt.Adapt<WmsPretaskCode>();
WmsPretaskCode ptc = pt.Adapt<WmsPretaskCode>();
ptc.id = SnowflakeIdHelper.NextId();
ptc.bill_id = pt.id;
ptc.material_id = jo.Value<string>(nameof(WmsPretaskCode.material_id))!;
@@ -158,25 +166,27 @@ namespace Tnb.WarehouseMgr
}
//生成预任务，同时如果包含条码信息同时插入条码记录
var isOk = await _wareHouseService.GenPreTask(preTasks, pretaskCodes);
bool isOk = await _wareHouseService.GenPreTask(preTasks, pretaskCodes);
if (isOk)
{
var requireIdField = "require_id";
string requireIdField = "require_id";
var preTaskUpInput = new GenPreTaskUpInput();
preTaskUpInput.RquireId = input.data[nameof(WmsHandleH.require_id)].ToString()!;
preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault()!.location_id!;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault()!.location_code!;
preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList()!;
GenPreTaskUpInput preTaskUpInput = new()
{
RquireId = input.data[nameof(WmsHandleH.require_id)].ToString()!,
CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!,
CarryStartLocationId = points.FirstOrDefault()!.location_id!,
CarryStartLocationCode = points.FirstOrDefault()!.location_code!,
LocationIds = points.Select(x => x.location_id).ToList()!
};
if (input.data.ContainsKey(requireIdField) && input.data[requireIdField].IsNotEmptyOrNull())
{
//创建预任务操作记录
var operBillId = string.Empty;
var instockH = await _db.Queryable<WmsInstockH>().FirstAsync(it => it.id == input.data[requireIdField].ToString());
string operBillId = string.Empty;
WmsInstockH instockH = await _db.Queryable<WmsInstockH>().FirstAsync(it => it.id == input.data[requireIdField].ToString());
if (instockH != null)
{
var handleH = instockH.Adapt<WmsHandleH>();
WmsHandleH handleH = instockH.Adapt<WmsHandleH>();
operBillId = handleH.id = SnowflakeIdHelper.NextId();
handleH.startlocation_id = input.data[nameof(WmsHandleH.startlocation_id)]?.ToString()!;
handleH.carry_id = input.data[nameof(WmsHandleH.carry_id)]?.ToString()!;
@@ -187,25 +197,27 @@ namespace Tnb.WarehouseMgr
jArr = JArray.Parse(input.data["tablefield115"].ToString()!);
if (jArr?.Children().Count() > 0)
{
foreach (var jo in jArr.Children())
foreach (JToken jo in jArr.Children())
{
var materialId = jo.Value<string>(nameof(WmsHandleCode.material_id));
WmsHandleCode handleCode = new();
handleCode.org_id = _userManager.User.OrganizeId;
handleCode.bill_id = operBillId;
handleCode.material_id = materialId!;
handleCode.material_code = jo.Value<string>(nameof(WmsHandleCode.material_code))!;
handleCode.barcode = jo.Value<string>(nameof(WmsHandleCode.barcode))!;
handleCode.code_batch = jo.Value<string>(nameof(WmsHandleCode.code_batch));
handleCode.codeqty = jo.Value<int>(nameof(WmsHandleCode.codeqty));
handleCode.unit_id = _db.Queryable<BasMaterial>().Single(it => it.id == materialId).unit_id;
handleCode.create_id = _userManager.UserId;
handleCode.create_time = DateTime.Now;
string? materialId = jo.Value<string>(nameof(WmsHandleCode.material_id));
WmsHandleCode handleCode = new()
{
org_id = _userManager.User.OrganizeId,
bill_id = operBillId,
material_id = materialId!,
material_code = jo.Value<string>(nameof(WmsHandleCode.material_code))!,
barcode = jo.Value<string>(nameof(WmsHandleCode.barcode))!,
code_batch = jo.Value<string>(nameof(WmsHandleCode.code_batch)),
codeqty = jo.Value<int>(nameof(WmsHandleCode.codeqty)),
unit_id = _db.Queryable<BasMaterial>().Single(it => it.id == materialId).unit_id,
create_id = _userManager.UserId,
create_time = DateTime.Now
};
preTaskUpInput.PreTaskHandleCodes.Add(handleCode);
}
}
//生成载具条码记录
var carryCodes = preTaskUpInput.PreTaskHandleCodes.Adapt<List<WmsCarryCode>>();
List<WmsCarryCode> carryCodes = preTaskUpInput.PreTaskHandleCodes.Adapt<List<WmsCarryCode>>();
carryCodes.ForEach(x =>
{
@@ -215,25 +227,25 @@ namespace Tnb.WarehouseMgr
x.warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString();
});
//生成入库申请条码
var instockDetails = await _db.Queryable<WmsInstockD>()
List<WmsInstockD> instockDetails = await _db.Queryable<WmsInstockD>()
.Where(b => b.bill_id == input.data[requireIdField].ToString())
.ToListAsync();
var items = instockDetails.Adapt<List<WmsInstockCode>>();
List<WmsInstockCode> items = instockDetails.Adapt<List<WmsInstockCode>>();
//items.ForEach(it => it.org_id = _userManager.User.OrganizeId);
List<WmsInstockCode> instockCOdes = new();
jArr = JArray.Parse(input.data["tablefield115"].ToString()!);
if (jArr?.Children().Count() > 0)
{
foreach (var jo in jArr.Children())
foreach (JToken jo in jArr.Children())
{
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);
string? materialCode = jo.Value<string>(nameof(WmsInstockCode.material_code));
string? codeBatch = jo.Value<string>(nameof(WmsInstockCode.code_batch));
WmsInstockCode? b = items.Find(x => x.material_code == materialCode && x.code_batch == codeBatch);
if (b != null)
{
var c = DeepCopyHelper<WmsInstockCode>.DeepCopy(b);
WmsInstockCode c = DeepCopyHelper<WmsInstockCode>.DeepCopy(b);
c.id = SnowflakeIdHelper.NextId();
c.bill_d_id = b.id;
c.barcode = jo.Value<string>(nameof(WmsInstockCode.barcode))!;
@@ -242,18 +254,18 @@ namespace Tnb.WarehouseMgr
}
}
}
var orgId = _userManager.User.OrganizeId;
await _db.Insertable(carryCodes).ExecuteCommandAsync();
await _db.Insertable(instockCOdes).CallEntityMethod(it => it.Create(orgId)).ExecuteCommandAsync();
string orgId = _userManager.User.OrganizeId;
_ = await _db.Insertable(carryCodes).ExecuteCommandAsync();
_ = await _db.Insertable(instockCOdes).CallEntityMethod(it => it.Create(orgId)).ExecuteCommandAsync();
// 更新临时条码表 状态is_end
await _db.Updateable<WmsTempCode>().SetColumns(it => new WmsTempCode { is_end = 1 }).Where(it => instockCOdes.Select(x => x.barcode).Contains(it.barcode)).ExecuteCommandAsync();
_ = await _db.Updateable<WmsTempCode>().SetColumns(it => new WmsTempCode { is_end = 1 }).Where(it => instockCOdes.Select(x => x.barcode).Contains(it.barcode)).ExecuteCommandAsync();
await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput,
it => new WmsCarryH { carry_code = input.data[nameof(WmsCarryH.carry_code)].ToString()!, is_lock = 1, carry_status = ((int)EnumCarryStatus.占用).ToString(), location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode, source_id = input.data[nameof(WmsOutstockH.source_id)].ToString(), source_code = input.data[nameof(WmsOutstockH.source_code)].ToString() },
it => new BasLocation { is_lock = 1, is_use = ((int)EnumCarryStatus.占用).ToString() });
if (instockCOdes?.Count > 0)
{
await _db.Updateable<WmsInstockD>().SetColumns(it => new WmsInstockD { line_status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => instockCOdes.Select(x => x.bill_d_id).Contains(it.id)).ExecuteCommandAsync();
await _db.Updateable<WmsInstockH>().SetColumns(it => new WmsInstockH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == input.data[nameof(WmsHandleH.require_id)].ToString()).ExecuteCommandAsync();
_ = await _db.Updateable<WmsInstockD>().SetColumns(it => new WmsInstockD { line_status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => instockCOdes.Select(x => x.bill_d_id).Contains(it.id)).ExecuteCommandAsync();
_ = await _db.Updateable<WmsInstockH>().SetColumns(it => new WmsInstockH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == input.data[nameof(WmsHandleH.require_id)].ToString()).ExecuteCommandAsync();
}
}
}
@@ -276,7 +288,10 @@ namespace Tnb.WarehouseMgr
public override async Task ModifyAsync(WareHouseUpInput input)
{
if (input == null) throw new ArgumentNullException("input");
if (input == null)
{
throw new ArgumentNullException("input");
}
//更具distaskCode的barcode 更新 instockcode 的 is_end 为 1
try
{
@@ -284,18 +299,18 @@ namespace Tnb.WarehouseMgr
if (input.distaskCodes?.Count > 0)
{
var barCodes = input.distaskCodes.Select(x => x.barcode);
await _db.Updateable<WmsInstockCode>().SetColumns(it => new WmsInstockCode { is_end = 1 }).Where(it => barCodes.Contains(it.barcode)).ExecuteCommandAsync();
IEnumerable<string> barCodes = input.distaskCodes.Select(x => x.barcode);
_ = await _db.Updateable<WmsInstockCode>().SetColumns(it => new WmsInstockCode { is_end = 1 }).Where(it => barCodes.Contains(it.barcode)).ExecuteCommandAsync();
var instockCodes = await _db.Queryable<WmsInstockCode>().Where(it => barCodes.Contains(it.barcode)).Select(it => new
{
id = it.bill_d_id,
barcode_qty = it.codeqty,
}).ToListAsync();
var dic = instockCodes.GroupBy(g => g.id).ToDictionary(x => x.Key, x => x.Select(d => d.barcode_qty).ToList());
var ids = instockCodes.Select(it => it.id).ToList();
var instockDetails = await _db.Queryable<WmsInstockD>().Where(it => ids.Contains(it.id)).ToListAsync();
Dictionary<string, List<decimal>> dic = instockCodes.GroupBy(g => g.id).ToDictionary(x => x.Key, x => x.Select(d => d.barcode_qty).ToList());
List<string> ids = instockCodes.Select(it => it.id).ToList();
List<WmsInstockD> instockDetails = await _db.Queryable<WmsInstockD>().Where(it => ids.Contains(it.id)).ToListAsync();
foreach (var item in instockDetails)
foreach (WmsInstockD item in instockDetails)
{
if (dic.ContainsKey(item.id))
{
@@ -306,11 +321,11 @@ namespace Tnb.WarehouseMgr
}
}
}
await _db.Updateable(instockDetails).ExecuteCommandAsync();
var allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => it.bill_id == input.requireId).ToListAsync();
_ = await _db.Updateable(instockDetails).ExecuteCommandAsync();
List<WmsInstockD> 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();
_ = await _db.Updateable<WmsInstockH>().SetColumns(it => new WmsInstockH { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync();
//如果是自动单据，需要回更上层系统
}
}