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

1

Browse Source
This commit is contained in:
FanLian
2023-06-15 11:13:57 +08:00
parent 67b7631ad1 bc35d2a190
commit ecfb74b0e7
11 changed files with 358 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
WarehouseMgr/Tnb.WarehouseMgr.Entities/Attributes/ServiceModuleAttribute.cs Normal file
View File

@@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Attributes
{
/// <summary>
/// 业务类型模块特性
/// </summary>
[AttributeUsage(AttributeTargets.Class)]
public class ServiceModuleAttribute : Attribute
{
/// <summary>
/// 业务类型ID
/// </summary>
public string BizTypeId { get; set; }
public ServiceModuleAttribute(string bizTypeId)
{
this.BizTypeId = bizTypeId;
}
}
}

120
WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs
View File

@@ -4,5 +4,125 @@ public class ModuleConsts
{
public const string Tag = "WarehouseMgr";
public const string Area = "wms";
/// <summary>
/// 任务操作-PDA异常取消
/// </summary>
public const string MODULE_WMSEXCEPTIONCANCELPDA_ID = "26631250691605";
/// <summary>
/// 任务操作-PDA异常重新执行
/// </summary>
public const string MODULE_WMSEXCPTIONREEXCUTEPDA_ID = "26631184673813";
/// <summary>
/// 任务操作-PDA异常完成
/// </summary>
public const string MODULE_WMSEXCPTIONCOMPLETEPDA_ID = "26497241038869";
/// <summary>
/// 任务操作-PDA投料操作
/// </summary>
public const string MODULE_WMSFEEDINGRECORDPDA_ID = "26496913096981";
/// <summary>
/// 任务操作-PDA绑定操作
/// </summary>
public const string MODULE_WMSBINDINGPDA_ID = "26496560237333";
/// <summary>
/// 任务操作-PDA载具解绑
/// </summary>
public const string MODULE_WMSCARRYUNBINDPDA_ID = "26479624280613";
/// <summary>
/// 任务操作-PDA载具绑定
/// </summary>
public const string MODULE_WMSCARRYBINDPDA_ID = "26479495084837";
/// <summary>
/// 任务操作-PDA载具移出
/// </summary>
public const string MODULE_WMSCARRYMOOUTSTKPDA_ID = "26479437840677";
/// <summary>
/// 任务操作-PDA载具移入
/// </summary>
public const string MODULE_WMSMOVEINSTKPDA_ID = "26476127634469";
/// <summary>
/// 任务操作-PDA载具更换
/// </summary>
public const string MODULE_WMSCARRYREPLACEPDA_ID = "26475867493157";
/// <summary>
/// 任务操作-PDA配送申请
/// </summary>
public const string MODULE_WMSDELIVERYPDA_ID = "26475604135973";
/// <summary>
/// 任务操作-PDA库内转移
/// </summary>
public const string MODULE_WMSTRANSFERPDA_ID = "26475492865317";
/// <summary>
/// 任务操作-PDA寄存捆包
/// </summary>
public const string MODULE_WMSINBALEINPDA_ID = "26475412782629";
/// <summary>
/// 任务操作-PDA寄存入库
/// </summary>
public const string MODULE_WMSINBALEINSTKPDA_ID = "26474954845989";
/// <summary>
/// 任务操作-PDA齐套入库
/// </summary>
public const string MODULE_WMSKITTINGINSTKPDA_ID = "26474190687781";
/// <summary>
/// 任务操作-PDA一般入库
/// </summary>
public const string MODULE_WMSINSTOCKPDA_ID = "26458832529445";
/// <summary>
/// 任务操作-寄存出库
/// </summary>
public const string MODULE_WMSOUTBALE_ID = "26192638001445";
/// <summary>
/// 任务操作-寄存捆包
/// </summary>
public const string MODULE_WMSINBALE_ID = "26192480520485";
/// <summary>
/// 任务操作-出库申请
/// </summary>
public const string MODULE_WMSOUTSTOCK_ID = "26191983650597";
/// <summary>
/// 任务操作-入库申请
/// </summary>
public const string MODULE_WMSINSTOCK_ID = "26191326300453";
/// <summary>
/// 任务操作-载具更换
/// </summary>
public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557";
/// <summary>
/// 任务操作-齐套分拣
/// </summary>
public const string MODULE_WMSSETSORTING_ID = "26172520979237";
/// <summary>
/// 任务操作-齐套出库
/// </summary>
public const string MODULE_WMSKITTINGOUTSTK_ID = "26169701736741";
/// <summary>
/// 任务操作-齐套入库
/// </summary>
public const string MODULE_WMSKITTINGINSTK_ID = "26166785871909";
/// <summary>
/// 任务操作-配送申请
/// </summary>
public const string MODULE_WMSDELIVERY_ID = "26126388337189";
/// <summary>
/// 任务操作-库内转移
/// </summary>
public const string MODULE_WMSTRANSFER_ID = "26125750270757";
/// <summary>
/// 任务操作-载具移出
/// </summary>
public const string MODULE_WMSCARRYMOOUTSTK_ID = "26123262586661";
/// <summary>
/// 任务操作-空载具出库
/// </summary>
public const string MODULE_WMSEPTYOUTSTK_ID = "26122798979365";
/// <summary>
/// 任务操作-载具移入
/// </summary>
public const string MODULE_CARRYMOVEINSTOCK_ID = "26122102481957";
/// <summary>
/// 任务操作-空载具入库
/// </summary>
public const string MODULE_WMSEMPTYINSTOCK_ID = "26120915344165";
}

15
WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
View File

@@ -60,8 +60,21 @@ namespace Tnb.WarehouseMgr.Entities.Consts
/// </summary>
public const string WMS_PRETASK_INSTOCK_TYPE_ID = "26126748597797";
/// <summary>
/// 预任务生成业务类型-空载具移入Id
/// 预任务生成业务类型-载具移入Id
/// </summary>
public const string BIZTYPE_EMPTYIN_ID = "26120915344165";
/// <summary>
/// 预任务生成业务类型-空载具出库ID
/// </summary>
public const string BIZTYPE_EMPTYOUT_ID = "26122798979365";
/// <summary>
/// 预任务生成业务类型-PDA空载具入库ID
/// </summary>
public const string BIZTYPE_EMPTYINPDA_ID = "26475795363877";
/// <summary>
/// 预任务生成业务类型-PDA空载具出库ID
/// </summary>
public const string BIZTYPE_EMPTYOUTPDA_ID = "26475845405733";
}
}

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskExecuteAfterUpInput.cs
View File

@@ -14,6 +14,6 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
/// <summary>
/// 任务执行Ids
/// </summary>
public List<string> disTaskIds { get; set; }
public List<string> disTaskIds { get; set; }
}
}

23
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/WareHouseUpInput.cs Normal file
View File

@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Dto
{
/// <summary>
/// 库房业务更新输入参数
/// </summary>
public class WareHouseUpInput
{
/// <summary>
/// 需求来源单据Id，对应业务主表Id
/// </summary>
public string requireId { get; set; }
/// <summary>
/// 单据业务类型Id
/// </summary>
public string bizTypeId { get; set; }
}
}

83
WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumWareHouseModule.cs Normal file
View File

@@ -0,0 +1,83 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Enums
{
/// <summary>
/// 库房模块
/// </summary>
public enum EnumWareHouseModule
{
/// <summary>
/// 其它
/// </summary>
other= 1,
/// <summary>
/// 空载具出库
/// </summary>
WmsEptyOutStk=2,
/// <summary>
/// 载具移出
/// </summary>
WmsMoOutstk = 3,
/// <summary>
/// 空载具入库
/// </summary>
WmsEmptyInstock = 4,
/// <summary>
/// 载具移入
/// </summary>
CarryMoveInStock = 5,
/// <summary>
/// 齐套分拣
/// </summary>
WmsTransfer = 6,
/// <summary>
/// 寄存捆包
/// </summary>
WmsInbale = 7,
/// <summary>
/// 一般入库
/// </summary>
WmsInStock = 8,
/// <summary>
/// 一般出库
/// </summary>
WmsOutStock = 9,
/// <summary>
/// 齐套入库
/// </summary>
WmsKittingInStk = 10,
/// <summary>
/// 齐套出库
/// </summary>
WmsKittingOutStk = 11,
/// <summary>
/// 寄存出库
/// </summary>
WmsOutBale = 12,
/// <summary>
/// 寄存入库
/// </summary>
WmsInbaleInStk = 13,
/// <summary>
/// 配送申请
/// </summary>
WmsDelivery = 14,
/// <summary>
/// 异常取消
/// </summary>
WmsExceptionCancel = 15,
/// <summary>
/// 异常重新执行
/// </summary>
WmsExceptionReExcute = 16,
/// <summary>
/// 异常完成
/// </summary>
WmsExceptionComplete = 17,
}
}

16
WarehouseMgr/Tnb.WarehouseMgr.Interfaces/Interface1.cs Normal file
View File

@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Interfaces
{
/// <summary>
/// 更新业务单据信息接口
/// </summary>
public interface IUpdateBizBillInfo
{
Task Modify(string requireId);
}
}

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

@@ -1,13 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using Aspose.Cells.Drawing;
using JNPF;
using JNPF.Common.Extension;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.VisualDev;
using Microsoft.AspNetCore.Mvc;
using Tnb.WarehouseMgr.Entities.Attributes;
using Tnb.WarehouseMgr.Entities.Dto;
namespace Tnb.WarehouseMgr
{
@@ -15,8 +20,40 @@ namespace Tnb.WarehouseMgr
[Route("api/[area]/[controller]/[action]")]
public class BaseWareHouseService : IOverideVisualDevService, IDynamicApiController, ITransient
{
private static Dictionary<string, BaseWareHouseService> _serviceMap = new Dictionary<string, BaseWareHouseService>();
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
static BaseWareHouseService()
{
var serviceTypes = App.EffectiveTypes.Where(u => u.IsClass && !u.IsInterface && !u.IsAbstract && u.IsSubclassOf(typeof(BaseWareHouseService))).ToList();
foreach (var serviceType in serviceTypes)
{
var bizTypeId = serviceType.GetCustomAttribute<ServiceModuleAttribute>()?.BizTypeId;
if (!bizTypeId.IsNullOrEmpty())
{
_serviceMap[bizTypeId!] = (BaseWareHouseService)Activator.CreateInstance(serviceType)!;
}
}
}
protected Task this[WareHouseUpInput input]
{
set
{
if (_serviceMap.ContainsKey(input.bizTypeId))
{
_serviceMap[input.bizTypeId].ModifyAsync(input);
}
}
get
{
return Task.CompletedTask;
}
}
public virtual Task ModifyAsync(WareHouseUpInput input)
{
return Task.CompletedTask;
}
}
}

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

@@ -395,14 +395,40 @@ namespace Tnb.WarehouseMgr
//更新任务执行表，单据状态为 完成
await _db.Updateable<WmsDistaskH>().SetColumns(it => new WmsDistaskH { status = WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID }).Where(it => input.disTaskIds.Contains(it.id)).ExecuteCommandAsync();
//更新预任务申请表，单据状态为 已完成
var preTaskIds = await _db.Queryable<WmsDistaskH>().Where(it => input.disTaskIds.Contains(it.id)).Select(it => it.pretask_id).ToListAsync();
if(preTaskIds?.Count > 0)
var disTasks = await _db.Queryable<WmsDistaskH>().Where(it => input.disTaskIds.Contains(it.id)).ToListAsync();
if (disTasks?.Count > 0)
{
var preTaskIds = disTasks.Select(x => x.pretask_id).ToList();
await _db.Updateable<WmsPretaskH>().SetColumns(it => new WmsPretaskH { status = WmsWareHouseConst.PRETASK_BILL_STATUS_COMPLE_ID }).Where(it => preTaskIds.Contains(it.id)).ExecuteCommandAsync();
}
//更新载具，锁定状态为未锁定，更新载具的库位当前任务的目标库位
if (disTasks?.Count > 0)
{
var multiList = disTasks.Select(it => (it.carry_id, it.endlocation_id)).ToList();
for (int i = 0; i < multiList.Count; i++)
{
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { is_lock = 0, location_id = multiList[i].endlocation_id }).Where(it => it.id == multiList[i].carry_id).ExecuteCommandAsync();
}
}
//更新库位信息，使用状态为 使用，锁定状态为未锁定
if (disTasks?.Count > 0)
{
var destLocIds = disTasks.Select(it => it.endlocation_id).ToList();
await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_use = "1", is_lock = 0 }).Where(it => destLocIds.Contains(it.id)).ExecuteCommandAsync();
}
//更新业务主表的单据状态
if (disTasks?.Count > 0)
{
foreach (var dt in disTasks)
{
if (dt.is_chain == 0)
{
var upInput = new WareHouseUpInput { bizTypeId = dt.biz_type, requireId = dt.require_id };
await base[upInput];
}
}
}
}
/// <summary>
@@ -458,7 +484,6 @@ namespace Tnb.WarehouseMgr
#region PrivateMethods
private bool isArrivedEpoint = false;
private async Task<List<WmsPointH>> LocPathCalcAlgorithms(string pStartId, string pEndId, List<WmsRoad> roads)
{
var points = await _db.Queryable<WmsPointH>().ToListAsync();

10
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs
View File

@@ -18,6 +18,7 @@ using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.BasicData.Entities;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Attributes;
using Tnb.WarehouseMgr.Entities.Consts;
using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Interfaces;
@@ -28,8 +29,10 @@ namespace Tnb.WarehouseMgr
/// 载具移入
/// </summary>
[OverideVisualDev(ModuleId)]
[ServiceModule(BizTypeId)]
public class WmsCarryMoveInStockService : BaseWareHouseService
{
private const string BizTypeId = "26121988909861";
private const string ModuleId = "26122102481957";
private readonly ISqlSugarClient _db;
private readonly IRunService _runService;
@@ -137,5 +140,12 @@ namespace Tnb.WarehouseMgr
}
return Task.FromResult(true);
}
public override async Task ModifyAsync(WareHouseUpInput input)
{
if (input == null) throw new ArgumentNullException(nameof(input));
var isOk = await _db.Updateable<WmsMoveInstock>().SetColumns(it => new WmsMoveInstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
}
}
}

1
WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs
View File

@@ -29,6 +29,7 @@ namespace Tnb.WarehouseMgr
/// 空载具入库
/// </summary>
[OverideVisualDev(ModuleId)]
public class WmsEmptyInstockService : BaseWareHouseService
{
private const string ModuleId = "26120915344165";