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

bug处理，二楼空载具料架入库

Browse Source
This commit is contained in:
马健
2024-06-06 16:42:31 +08:00
parent 9e177b69f7
commit 439e000bd1
57 changed files with 457 additions and 1196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,6 +39,10 @@
/// 预任务生成EnCode
/// </summary>
public const string WMS_PRETASK_H_ENCODE = "PreTaskGen";
/// <summary>
/// 采购收料物料流水号
/// </summary>
public const string WMS_PURCHASE_MAT_ENCODE = "PurchaseMat";
/// 齐套出库生成Encode
/// </summary>
public const string WMS_KITTINGOUTSTK_ENCODE = "WmsKittingOutStk";
@@ -325,15 +329,19 @@
/// <summary>
/// 一楼供料三工位库位
/// </summary>
public const string Floor1GLSGWOutstockStation1 = "30773146852476";
public const string Floor1GLSGWOutstockStation1 = "30773146852478";
/// <summary>
/// 一楼供料三工位库位
/// </summary>
public const string Floor1GLSGWOutstockStation2 = "30773146852477";
public const string Floor1GLSGWOutstockStation2 = "30773146852479";
/// <summary>
/// 一楼供料三工位库位
/// </summary>
public const string Floor1GLSGWOutstockStation3 = "30773146852478";
public const string Floor1GLSGWOutstockStation3 = "30773146852480";
/// <summary>
/// 一楼供料三工位库位
/// </summary>
public const string Floor1GLSGWOutstockStation4 = "30773146852480";
/// <summary>
/// todo 一楼外协三工位库位
/// </summary>

46
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MaterialTransferRackInstockInput.cs Normal file
View File

@@ -0,0 +1,46 @@
namespace Tnb.WarehouseMgr.Entities.Dto
{
/// <summary>
/// 库房业务更新输入参数
/// </summary>
public class MaterialTransferRackInstockInput
{
/// <summary>
/// 组织ID
/// </summary>
public string org_id { get; set; }
/// <summary>
/// 创建用户
/// </summary>
public string create_id { get; set; }
/// <summary>
/// 料架号
/// </summary>
public string? carry_code { get; set; }
/// <summary>
/// 空料箱
/// </summary>
public List<MaterialTransferRackInstockDetail> details { get; set; }
/// <summary>
/// 起始库位
/// </summary>
public string? startlocation_id { get; set; }
/// <summary>
/// 判断料箱是否为空
/// </summary>
public bool judgeEmptyCarry { get; set; } = true;
}
public class MaterialTransferRackInstockDetail
{
/// <summary>
/// 料箱号
/// </summary>
public string? carry_code { get; set; }
}
}

1
WarehouseMgr/Tnb.WarehouseMgr.Entities/Tnb.WarehouseMgr.Entities.csproj
View File

@@ -5,6 +5,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Configurations>Debug;Release;tianyi</Configurations>
<ServerGarbageCollection>false</ServerGarbageCollection>
</PropertyGroup>
<ItemGroup>

1
WarehouseMgr/Tnb.WarehouseMgr.Interfaces/Tnb.WarehouseMgr.Interfaces.csproj
View File

@@ -5,6 +5,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Configurations>Debug;Release;tianyi</Configurations>
<ServerGarbageCollection>false</ServerGarbageCollection>
</PropertyGroup>
<ItemGroup>

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

@@ -28,7 +28,7 @@ namespace Tnb.WarehouseMgr
private readonly ElevatorControlConfiguration _elevatorControlConfiguration = App.Configuration.Build<ElevatorControlConfiguration>();
private readonly IServiceProvider _serviceProvider;
private readonly IHostApplicationLifetime _lifeTime;
private static List<string> s_heartbeatDevNames = new();
private List<string> s_heartbeatDevNames = new();
//private static Dictionary<string, Func<CancellationToken?, Task>> _timedFuncMap = new(StringComparer.OrdinalIgnoreCase);
public TimedTaskBackgroundService()
{

1
WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj
View File

@@ -7,6 +7,7 @@
<Nullable>enable</Nullable>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<Configurations>Debug;Release</Configurations>
<ServerGarbageCollection>false</ServerGarbageCollection>
</PropertyGroup>
<ItemGroup>

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

@@ -247,8 +247,8 @@ namespace Tnb.WarehouseMgr
/// <returns></returns>
public string[] GetFloor1GLSGWOutstockLocation()
{
return new string[3] { WmsWareHouseConst.Floor1GLSGWOutstockStation1 , WmsWareHouseConst.Floor1GLSGWOutstockStation2
, WmsWareHouseConst.Floor1GLSGWOutstockStation3 };
return new string[4] { WmsWareHouseConst.Floor1GLSGWOutstockStation1 , WmsWareHouseConst.Floor1GLSGWOutstockStation2
, WmsWareHouseConst.Floor1GLSGWOutstockStation3, WmsWareHouseConst.Floor1GLSGWOutstockStation4 };
}
/// <summary>
@@ -786,7 +786,10 @@ namespace Tnb.WarehouseMgr
third_eqp_type = c.third_eqp_type,
}, true);
Logger.Information("【GenTaskExecute】 执行SQL: " + sugarQueryable.ToSqlString());
if (sugarQueryable.Count() == 0)
return;
//Logger.Information("【GenTaskExecute】 执行SQL: " + sugarQueryable.ToSqlString());
List<WmsPretaskH> preTasks = await sugarQueryable.ToListAsync();
@@ -1105,9 +1108,13 @@ namespace Tnb.WarehouseMgr
move_num = b.move_num,
third_eqp_type = b.third_eqp_type,
}, true).ToListAsync();
if (CTUTasks.Count == 0)
return;
List<WmsPretaskCode> TaskCodes = await db.Queryable<WmsPretaskCode>().Where(it => CTUTasks.Select(p => p.id).ToList().Contains(it.bill_id)).ToListAsync();
Logger.Information($@"【CTUTaskExecute】 获取任务TaskCodes: {JsonConvert.SerializeObject(TaskCodes)}");
//Logger.Information($@"【CTUTaskExecute】 获取任务TaskCodes: {JsonConvert.SerializeObject(TaskCodes)}");
var InTasks = CTUTasks.Where(a => a.task_type == WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID).ToList();
var OutTasks = CTUTasks.Where(a => a.task_type == WmsWareHouseConst.WMS_PRETASK_OUTSTOCK_TYPE_ID || a.task_type == WmsWareHouseConst.BIZTYPE_WMSTRANSFER_ID).ToList();

5
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs
View File

@@ -11,6 +11,7 @@ using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Interfaces;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Senparc.Weixin.MP.AdvancedAPIs.Card;
using SqlSugar;
@@ -166,8 +167,10 @@ namespace Tnb.WarehouseMgr
if (WmsCarryCodes.Count > 0)
await _db.Insertable(WmsCarryCodes).ExecuteCommandAsync();
}
catch (Exception)
catch (Exception ex)
{
Logger.LogError(ex.Message);
Logger.LogError(ex.StackTrace);
throw new AppFriendlyException("绑定失败", 500);
}
}

74
WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
View File

@@ -553,7 +553,7 @@ namespace Tnb.WarehouseMgr
}
/// <summary>
/// 从暂存仓呼叫料架到产线
/// 通过工位查找料架信息
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -621,5 +621,77 @@ namespace Tnb.WarehouseMgr
return await ToApiResult(HttpStatusCode.InternalServerError, ex.Message);
}
}
/// <summary>
/// 从产线呼叫装料架到暂存仓
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost, NonUnify, AllowAnonymous]
public async Task<Tnb.WarehouseMgr.Entities.Dto.Outputs.Result> RackInstock(MaterialTransferRackInstockInput input)
{
try
{
BasLocation startlocation = _db.Queryable<BasLocation>().Where(r => r.id == input.startlocation_id).First();
if (startlocation == null)
{
Logger.LogWarning($"【RackEmptyInstock】不存在id为{input.startlocation_id}的库位！");
throw new AppFriendlyException($"【RackEmptyInstock】不存在id为{input.startlocation_id}的库位！", 500);
}
if (string.IsNullOrEmpty(input.carry_code))
{
Logger.LogWarning($"【RackEmptyInstock】料架不能为空！{input.carry_code}");
throw new AppFriendlyException($"【RackEmptyInstock】料架不能为空！{input.carry_code}！", 500);
}
if (input.judgeEmptyCarry)
{
List<WmsCarryCode> wmsCarryCodes = _db.Queryable<WmsCarryH>()
.InnerJoin<WmsCarryCode>((a, b) => a.id == b.carry_id)
.Where((a, b) => input.details.Select(r => r.carry_code).Contains(a.carry_code)).Select((a, b) => b).ToList();
if (wmsCarryCodes.Count > 0)
{
Logger.LogWarning($"【RackEmptyInstock】存在非空料箱{string.Join(',', wmsCarryCodes.Select(r => r.carry_code).Distinct())}，不能入库！{input.carry_code}");
throw new AppFriendlyException($"【RackEmptyInstock】存在非空料箱{string.Join(',', wmsCarryCodes.Select(r => r.carry_code).Distinct())}，不能入库！{input.carry_code}！", 500);
}
}
// 找到未占用且未锁定的库位
ISugarQueryable<BasLocation> rackEndLocations =
_db.Queryable<BasLocation>()
.Where(r => r.wh_id == "33780009364245" && r.is_use == "0" && r.is_lock == 0).OrderBy(a => a.id).Take(1);
if (rackEndLocations.Count() == 0)
{
Logger.LogWarning($"【RackEmptyInstock】没有可用的终点库位");
throw new AppFriendlyException($"【RackEmptyInstock】没有可用的终点库位！", 500);
}
BasLocation endlocation = rackEndLocations.First();
CommonCreatePretaskInput commonCreatePretaskInput = new CommonCreatePretaskInput();
commonCreatePretaskInput.startlocation_id = startlocation.id;
commonCreatePretaskInput.endlocation_id = endlocation.id;
commonCreatePretaskInput.carry_code = input.carry_code;
commonCreatePretaskInput.task_type = "";
commonCreatePretaskInput.biz_type = "FloorCallMaterial";
var res = await _wareHouseService.CommonCreatePretask(commonCreatePretaskInput);
if (res.code != JNPF.Common.Enums.HttpStatusCode.OK)
{
Logger.LogInformation($"【RackEmptyInstock】生成预任务失败 载具 {input.carry_code}");
throw new AppFriendlyException($"生成预任务失败 载具 {input.carry_code}", 500);
}
}
catch (Exception ex)
{
Logger.LogError("【RackEmptyInstock】" + ex.Message);
Logger.LogError("【RackEmptyInstock】" + ex.StackTrace);
return await ToApiResult(HttpStatusCode.InternalServerError, ex.Message);
}
return await ToApiResult(HttpStatusCode.OK, "成功");
}
}
}

9
WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs
View File

@@ -41,11 +41,12 @@ namespace Tnb.WarehouseMgr
private readonly IBillRullService _billRullService;
private readonly ISqlSugarClient _db;
private readonly IUserManager _userManager;
public WmsPurchaseService(ISqlSugarRepository<WmsPurchaseH> repo, IUserManager userManager, IQcCheckPlanService qcCheckPlanService)
public WmsPurchaseService(ISqlSugarRepository<WmsPurchaseH> repo, IUserManager userManager, IQcCheckPlanService qcCheckPlanService, IBillRullService billRullService)
: base(repo, userManager, qcCheckPlanService)
{
_db = repo.AsSugarClient();
_userManager = userManager;
_billRullService = billRullService;
}
private async Task<dynamic> xxx(VisualDevModelDataCrInput input)
@@ -179,7 +180,11 @@ namespace Tnb.WarehouseMgr
for (int j = 0; j < codeNum; j++)
{
int index = j + 1;
string code = $"{WmsPurchaseD.material_code}-{WmsPurchaseD.code_batch}-{index.ToString().PadLeft(4, '0')}";
//string code = $"{WmsPurchaseD.material_code}-{WmsPurchaseD.code_batch}-{index.ToString().PadLeft(4, '0')}";
// 变更加流水号
string watercode = await _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PURCHASE_MAT_ENCODE); ;
string code = $"{WmsPurchaseD.material_code}-{WmsPurchaseD.code_batch}{watercode}";
WmsTempCode barCode = new()
{
material_id = WmsPurchaseD.material_id,