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-08-02 15:58:17 +08:00
parent ff966fd569 9b4e76192a
commit be1420e0ca
10 changed files with 304 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/ChainStatusReportingUpInput.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.Dto.Inputs
{
/// <summary>
/// 创建任务链输入参数
/// </summary>
public class ChainStatusReportingUpInput
{
/// <summary>
/// 任务链编号
/// </summary>
public string taskChainCode { get; set; }
/// <summary>
/// 任务链任务状态
/// </summary>
public string status { get; set; }
}
}

25
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/ConfirmInput.cs Normal file
View File

@@ -0,0 +1,25 @@
using Tnb.WarehouseMgr.Entities.Enums;
namespace Tnb.WarehouseMgr.Entities.Dto
{
public class ConfirmInput
{
/// <summary>
/// 任务链编号
/// </summary>
public string taskChainCode { get; set; }
/// <summary>
/// 子任务编号
/// </summary>
public string taskCode { get; set; }
/// <summary>
/// 起点编号
/// </summary>
public string sourceName { get; set; }
/// <summary>
/// 终点编号
/// </summary>
public string targetName { get; set; }
}
}

34
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskCallBackInput.cs Normal file
View File

@@ -0,0 +1,34 @@
using Tnb.WarehouseMgr.Entities.Enums;
namespace Tnb.WarehouseMgr.Entities.Dto
{
public class TaskCallBackInput
{
/// <summary>
/// 任务链编号
/// </summary>
public string taskChainCode { get; set; }
/// <summary>
/// 任务链编号
/// </summary>
public string taskCode { get; set; }
/// <summary>
/// 起点编号
/// </summary>
public string sourceName { get; set; }
/// <summary>
/// 终点编号
/// </summary>
public string targetName { get; set; }
/// <summary>
/// 状态
/// </summary>
public string status { get; set; }
/// <summary>
/// 取货/放货
/// </summary>
public string action { get; set; }
}
}

18
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskChainCallBackInput.cs Normal file
View File

@@ -0,0 +1,18 @@
using Tnb.WarehouseMgr.Entities.Enums;
namespace Tnb.WarehouseMgr.Entities.Dto
{
public class TaskChainCallBackInput
{
/// <summary>
/// 任务链编号
/// </summary>
public string taskChainCode { get; set; }
/// <summary>
/// 状态
/// </summary>
public string status { get; set; }
}
}

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/Result.cs
View File

@@ -17,6 +17,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Outputs
/// 响应信息
/// </summary>
public string msg { get; set; }
/// <summary>
/// 错误提示消息
/// </summary>
public string error { get; set; }
public DateTime? timestamp { get; set; }
/// <summary>
/// 响应数据

13
WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs
View File

@@ -54,5 +54,18 @@ namespace Tnb.WarehouseMgr.Interfaces
/// <param name="input"></param>
/// <returns></returns>
Task TaskComplate(TaskCompleUpInput input);
/// <summary>
/// 任务执行
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
Task TaskExecute(TaskExecuteUpInput input);
/// <summary>
/// 任务执行取操作返回(后续操作)
/// </summary>
/// /// <param name="input"></param>
/// <returns></returns>
Task TaskExecuteAfter(TaskExecuteAfterUpInput input);
}
}

171
WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
View File

@@ -3,26 +3,189 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Core.Manager;
using JNPF.Common.Enums;
using JNPF.Common.Extension;
using JNPF.FriendlyException;
using JNPF.Systems.Interfaces.System;
using Microsoft.AspNetCore.Mvc;
using NPOI.OpenXmlFormats;
using Senparc.NeuChar.ApiHandlers;
using SqlSugar;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Dto.Inputs;
using Tnb.WarehouseMgr.Entities.Dto.Outputs;
using Tnb.WarehouseMgr.Entities.Entity;
using Tnb.WarehouseMgr.Interfaces;
namespace Tnb.WarehouseMgr
{
/// <summary>
/// Wms设备接口提供程序服务类
/// </summary>
public class DeviceProviderService : BaseWareHouseService
{
private readonly ISqlSugarClient _db;
private readonly IWareHouseService _wareHouseService;
public DeviceProviderService(ISqlSugarRepository<WmsInstockH> repository, IWareHouseService wareHouseService)
{
_db = repository.AsSugarClient();
_wareHouseService = wareHouseService;
}
/// <summary>
/// 创建任务链
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<Result> CreateTaskChain()
[HttpPost, NonUnify]
public async Task<Result> CreateTaskChain()
{
return await Task.FromResult<Result>(null);
}
}
/// <summary>
/// 取货确认/申请取货
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost, NonUnify]
public async Task<Result> LoadConfirm(ConfirmInput input)
{
try
{
var eles = await _db.Queryable<WmsElevatorH>().LeftJoin<WmsElevatorD>((a, b) => a.id == b.bill_id)
.LeftJoin<WmsDistaskH>((a, b, c) => b.location_id == c.startlocation_id)
.Where((a, b, c) => c.startlocation_code == input.sourceName && c.bill_code == $"{input.taskChainCode}-{input.taskCode}")
.ToListAsync();
}
catch (Exception)
{
return await ToApiResult(HttpStatusCode.InternalServerError, "请重试！");
throw;
}
return await ToApiResult(HttpStatusCode.OK, "未启用");
}
/// <summary>
/// 放货确认/申请放货
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost, NonUnify]
public async Task<Result> UnloadConfirm(ConfirmInput input)
{
try
{
var eles = await _db.Queryable<WmsElevatorH>().LeftJoin<WmsElevatorD>((a, b) => a.id == b.bill_id)
.LeftJoin<WmsDistaskH>((a, b, c) => b.location_id == c.endlocation_id)
.Where((a, b, c) => c.endlocation_code == input.targetName && c.bill_code == $"{input.taskChainCode}-{input.taskCode}")
.ToListAsync();
}
catch (Exception)
{
return await ToApiResult(HttpStatusCode.InternalServerError, "请重试！");
throw;
}
return await ToApiResult(HttpStatusCode.OK, "未启用");
}
/// <summary>
/// 任务链状态上报
/// </summary>
/// <returns></returns>
[HttpPost, NonUnify]
public async Task<Result> TaskChainCallBack(TaskChainCallBackInput input)
{
try
{
switch (input.status)
{
case "CREATED": break;
case "ALLOCATED":
var disTasks = await _db.Queryable<WmsDistaskH>().Where(it => it.bill_code.Contains(input.taskChainCode)).ToListAsync();
TaskExecuteUpInput taskExecuteUpInput = new()
{
disTaskIds = disTasks.Select(x => x.id).ToList(),
};
await _wareHouseService.TaskExecute(taskExecuteUpInput); break;
case "PROGRESSING": break;
case "CANCELLED": break;
case "SUCCEED": break;
case "FAILURE": break;
case "FINISHED": break;
default: break;
}
}
catch (Exception)
{
return await ToApiResult(HttpStatusCode.InternalServerError, "请重试！");
throw;
}
return await ToApiResult(HttpStatusCode.OK, "成功");
}
/// <summary>
/// 任务状态上报
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost, NonUnify]
public async Task<Result> TaskCallback(TaskCallBackInput input)
{
try
{
var disTasks = await _db.Queryable<WmsDistaskH>().Where(it => it.bill_code.Contains($"{input.taskChainCode}-{input.taskCode}")).ToListAsync();
if (input.action == "取货")
{
TaskExecuteAfterUpInput taskExecuteAfterUpInput = new()
{
disTaskIds = disTasks.Select(x => x.id).ToList()
};
await _wareHouseService.TaskExecuteAfter(taskExecuteAfterUpInput);
}
else if (input.action == "放货")
{
TaskCompleUpInput taskCompleUpInput = new()
{
disTaskIds = disTasks.Select(x => x.id).ToList()
};
await _wareHouseService.TaskComplate(taskCompleUpInput);
}
}
catch (Exception)
{
return await ToApiResult(HttpStatusCode.InternalServerError, "请重试！");
throw;
}
return await ToApiResult(HttpStatusCode.OK, "成功");
}
/// <summary>
/// 申请进出电梯
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost, NonUnify]
public async Task<Result> ElevatorConfirm(ConfirmInput input)
{
try
{
var eles = await _db.Queryable<WmsElevatorH>().LeftJoin<WmsElevatorD>((a, b) => a.id == b.bill_id)
.LeftJoin<WmsDistaskH>((a, b, c) => b.location_id == c.startlocation_id)
.Where((a, b, c) => c.startlocation_code == input.sourceName && c.bill_code == $"{input.taskChainCode}-{input.taskCode}")
.ToListAsync();
}
catch (Exception)
{
return await ToApiResult(HttpStatusCode.InternalServerError, "请重试！");
throw;
}
return await ToApiResult(HttpStatusCode.OK, "未启用");
}
}
}

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

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Dynamic;
using System.Linq;
using System.Linq.Expressions;
@@ -19,6 +20,7 @@ using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.Extras.CollectiveOAuth.Config;
using JNPF.FriendlyException;
using JNPF.Logging;
using JNPF.Systems.Entitys.Dto.Module;
using JNPF.Systems.Interfaces.System;
using Mapster;
@@ -164,6 +166,7 @@ namespace Tnb.WarehouseMgr
var whereExp = Expressionable.Create<BasLocation>()
.And(it => it.wh_id == input.warehouse_id)
.And(it => it.is_lock == 0)
.And(it => it.is_type == ((int)EnumLocationType.存储库位).ToString())
.And(it => it.is_use == ((int)EnumCarryStatus.空闲).ToString())
.ToExpression();
items = await _db.Queryable<BasLocation>().Where(whereExp).OrderBy(policy.policy).ToListAsync();
@@ -213,6 +216,7 @@ namespace Tnb.WarehouseMgr
[HttpPost]
public async Task GenTaskExecute()
{
Stopwatch sw = Stopwatch.StartNew();
//获取所有未下发的预任务申请
var preTasks = await _db.Queryable<WmsPretaskH>().InnerJoin<WmsCarryH>((a, b) => a.startlocation_id == b.location_id && a.carry_id == b.id)
.InnerJoin<WmsAreaH>((a, b, c) => a.area_id == c.id)
@@ -316,6 +320,19 @@ namespace Tnb.WarehouseMgr
row = await _db.Updateable<WmsPretaskH>().SetColumns(it => new WmsPretaskH { status = WmsWareHouseConst.PRETASK_BILL_STATUS_YXF_ID }).Where(it => preTaskIds.Contains(it.id)).ExecuteCommandAsync();
}
//调用AGV创建任务链接口
var taskChainCodeDic = disTasks.Where(t => !t.groups.IsNullOrWhiteSpace()).GroupBy(g => g.groups!)
.ToDictionary(x => x.Key, x => x.Select(it => new
{
taskCode = it.bill_code,
sourceName = it.startlocation_code,
targetName = it.endlocation_code
}));
dynamic reqBody = new ExpandoObject();
sw.Stop();
Log.Information($"程序运行耗时{sw.ElapsedMilliseconds}ms");
await _db.Ado.CommitTranAsync();
}
catch (Exception)

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

@@ -136,7 +136,7 @@ namespace Tnb.WarehouseMgr
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.id).ToList();
preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList()!;
preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());

2
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs
View File

@@ -132,7 +132,7 @@ namespace Tnb.WarehouseMgr
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.id).ToList();
preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList()!;
preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
WmsHandleH handleH = new();