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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
周科达
2023-07-14 14:33:02 +08:00
parent 0203cec1ca 4bada98d09
commit 280f1184f3
5 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs
View File

@@ -34,10 +34,12 @@ namespace Tnb.WarehouseMgr
var serviceTypes = App.EffectiveTypes.Where(u => u.IsClass && !u.IsInterface && !u.IsAbstract && typeof(IWHStorageService).IsAssignableFrom(u)).ToList(); var serviceTypes = App.EffectiveTypes.Where(u => u.IsClass && !u.IsInterface && !u.IsAbstract && typeof(IWHStorageService).IsAssignableFrom(u)).ToList();
foreach (var serviceType in serviceTypes) foreach (var serviceType in serviceTypes)
{ {
var callerName = serviceType.GetCustomAttribute<CallerAttribute>()?.Name; var callerName = serviceType.GetCustomAttribute<CallerAttribute>()?.Name ?? string.Empty;
if (!callerName.IsNullOrEmpty()) 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;
} }
} }
} }

19
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -251,14 +251,13 @@ namespace Tnb.WarehouseMgr
{ {
var moveNum = itGroup.First().move_num; var moveNum = itGroup.First().move_num;
var items = itGroup.Adapt<List<WmsDistaskH>>(); var items = itGroup.Adapt<List<WmsDistaskH>>();
items.ForEach(x => SnowflakeIdHelper.NextId());
items.ForEach(x => items.ForEach(x =>
{ {
x.id = SnowflakeIdHelper.NextId();
x.status = WmsWareHouseConst.TASK_BILL_STATUS_DZX_ID; x.status = WmsWareHouseConst.TASK_BILL_STATUS_DZX_ID;
x.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE).GetAwaiter().GetResult(); x.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE).GetAwaiter().GetResult();
}); });
var areaPreTasks = itGroup.ToList();
if (moveNum == 1) if (moveNum == 1)
{ {
items.ForEach(x => items.ForEach(x =>
@@ -269,6 +268,7 @@ namespace Tnb.WarehouseMgr
} }
else if (moveNum > 1) else if (moveNum > 1)
{ {
var areaPreTasks = itGroup.ToList();
//搬运数量==预任务数，可以生成任务执行，为任务链 //搬运数量==预任务数，可以生成任务执行，为任务链
if (moveNum == areaPreTasks.Count) if (moveNum == areaPreTasks.Count)
{ {
@@ -296,7 +296,7 @@ namespace Tnb.WarehouseMgr
{ {
var curPreTaskCodes = preTaskCodes.FindAll(x => x.bill_id == disTask.pretask_id); var curPreTaskCodes = preTaskCodes.FindAll(x => x.bill_id == disTask.pretask_id);
var curDisTaskCodes = curPreTaskCodes.Adapt<List<WmsDistaskCode>>(); var curDisTaskCodes = curPreTaskCodes.Adapt<List<WmsDistaskCode>>();
curPreTaskCodes.ForEach(x => curDisTaskCodes.ForEach(x =>
{ {
x.id = SnowflakeIdHelper.NextId(); x.id = SnowflakeIdHelper.NextId();
x.bill_id = disTask.id; 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(); 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(); var carryAndLocIds = await _db.Queryable<WmsDistaskH>().Where(it => input.disTaskIds.Contains(it.id)).Select(it => new { it.carry_id, it.startlocation_id }).ToListAsync();
if (carryIds?.Count > 0) 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(); 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(); 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); 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(); 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) 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(); var multis = disTasks.Select(it => (it.endlocation_id, it.carry_status)).ToList();
for (int i = 0; i < multis.Count; i++) for (int i = 0; i < multis.Count; i++)
{ {

4
WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
View File

@@ -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 }) carryMats = carryMats.OrderBy(o => o.create_time).GroupBy(g => new { g.carry_id, g.material_id, g.code_batch })
.Select(x => .Select(x =>
{ {
WmsCarryMat? carryMat = x.FirstOrDefault()!; WmsCarryMat? carryMat = x.FirstOrDefault();
carryMat.need_qty = x.Sum(d => d.need_qty); carryMat.need_qty = x.Sum(d => d.need_qty);
return carryMat; return carryMat;
}) })
@@ -505,7 +505,7 @@ namespace Tnb.WarehouseMgr
{ {
outstockDs.ForEach(x => x.line_status = WmsWareHouseConst.BILLSTATUS_ON_ID); outstockDs.ForEach(x => x.line_status = WmsWareHouseConst.BILLSTATUS_ON_ID);
await _db.Updateable(outstockDs).UpdateColumns(it => it.line_status).ExecuteCommandAsync(); 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(); GenPreTaskUpInput genPreTaskAfterUpInput = new();
genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList(); genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList();
genPreTaskAfterUpInput.LocationIds = new HashSet<string>(locIds).ToList(); genPreTaskAfterUpInput.LocationIds = new HashSet<string>(locIds).ToList();

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

@@ -99,34 +99,37 @@ namespace Tnb.WarehouseMgr
{ {
var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id); var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id);
//根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序） //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序）
if (points?.Count <= 2) throw new AppFriendlyException("该路径不存在", 500);
if (points?.Count > 0) 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 preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it =>
{ {
var sPoint = it.FirstOrDefault(); var sPoint = it.FirstOrDefault();
var ePoint = it.LastOrDefault(); var ePoint = it.LastOrDefault();
WmsPretaskH preTask = new(); WmsPretaskH preTask = new()
preTask.org_id = _userManager.User.OrganizeId; {
preTask.startlocation_id = sPoint?.location_id!; org_id = _userManager.User.OrganizeId,
preTask.startlocation_code = sPoint?.location_code!; startlocation_id = sPoint?.location_id ?? "",
preTask.endlocation_id = ePoint?.location_id!; startlocation_code = sPoint?.location_code ?? "",
preTask.endlocation_code = ePoint?.location_code!; endlocation_id = ePoint?.location_id ?? "",
preTask.start_floor = sPoint?.floor.ToString(); endlocation_code = ePoint?.location_code ?? "",
preTask.end_floor = ePoint?.floor.ToString(); start_floor = sPoint?.floor.ToString(),
preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(); end_floor = ePoint?.floor.ToString(),
preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID; bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(),
preTask.biz_type = input.data[nameof(WmsPretaskH.biz_type)]?.ToString()!; status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID,
preTask.task_type = WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID; biz_type = input.data[nameof(WmsPretaskH.biz_type)]?.ToString() ?? "",
preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!; task_type = WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID,
preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!; carry_id = input.data[nameof(preTask.carry_id)]?.ToString() ?? "",
preTask.area_id = sPoint?.area_id!; carry_code = input.data[nameof(preTask.carry_code)]?.ToString() ?? "",
preTask.area_code = it.Key; area_id = sPoint?.area_id ?? "",
preTask.require_id = input.data[nameof(WmsHandleH.require_id)].ToString(); area_code = it.Key,
preTask.require_code = input.data[nameof(WmsHandleH.require_code)]?.ToString()!; require_id = input.data[nameof(WmsHandleH.require_id)].ToString(),
preTask.create_id = _userManager.UserId; require_code = input.data[nameof(WmsHandleH.require_code)]?.ToString(),
preTask.create_time = DateTime.Now; create_id = _userManager.UserId,
create_time = DateTime.Now,
};
return preTask; return preTask;
}).ToList(); }).ToList();
//生成预任务条码信息 //生成预任务条码信息
@@ -221,7 +224,6 @@ namespace Tnb.WarehouseMgr
{ {
foreach (var jo in jArr.Children()) 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 materialCode = jo.Value<string>(nameof(WmsInstockCode.material_code));
var codeBatch = jo.Value<string>(nameof(WmsInstockCode.code_batch)); var codeBatch = jo.Value<string>(nameof(WmsInstockCode.code_batch));
var b = items.Find(x => x.material_code == materialCode && x.code_batch == codeBatch); 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); var c = DeepCopyHelper<WmsInstockCode>.DeepCopy(b);
c.id = SnowflakeIdHelper.NextId(); 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.barcode = jo.Value<string>(nameof(WmsInstockCode.barcode))!;
c.codeqty = jo.Value<int>(nameof(WmsInstockCode.codeqty)); c.codeqty = jo.Value<int>(nameof(WmsInstockCode.codeqty));
instockCOdes.Add(c); instockCOdes.Add(c);
@@ -297,7 +299,7 @@ namespace Tnb.WarehouseMgr
} }
} }
await _db.Updateable(instockDetails).ExecuteCommandAsync(); 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)) 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();

15
WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs
View File

@@ -21,6 +21,7 @@ using Tnb.WarehouseMgr.Entities.Consts;
using Tnb.WarehouseMgr.Entities.Dto; using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Enums; using Tnb.WarehouseMgr.Entities.Enums;
using Tnb.WarehouseMgr.Interfaces; using Tnb.WarehouseMgr.Interfaces;
using UAParser;
namespace Tnb.WarehouseMgr namespace Tnb.WarehouseMgr
{ {
@@ -69,11 +70,19 @@ namespace Tnb.WarehouseMgr
List<WmsCarryMat> carryMats = new(); List<WmsCarryMat> carryMats = new();
List<WmsCarryCode> carryCodes = new(); List<WmsCarryCode> carryCodes = new();
List<string> carryIds = 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) 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) 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) .Where(whereExpr.ToExpression())
.WhereIF(!string.IsNullOrEmpty(os.code_batch), (a, b) => b.code_batch == os.code_batch)
.Select<WmsCarryCode>() .Select<WmsCarryCode>()
.ToListAsync(); .ToListAsync();
if (carryCodesPart?.Count > 0) if (carryCodesPart?.Count > 0)
@@ -158,7 +167,7 @@ namespace Tnb.WarehouseMgr
pretaskCodes.AddRange(curPreTaskCodes); pretaskCodes.AddRange(curPreTaskCodes);
} }
await _wareHouseService.GenPreTask(preTasks, pretaskCodes); 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(); GenPreTaskUpInput genPreTaskAfterUpInput = new();
genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList(); genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList();
genPreTaskAfterUpInput.LocationIds = new HashSet<string>(locIds).ToList(); genPreTaskAfterUpInput.LocationIds = new HashSet<string>(locIds).ToList();