diff --git a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs index fa586607..35bda11a 100644 --- a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs +++ b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs @@ -204,6 +204,8 @@ namespace Tnb.ProductionMgr _wareHouseService.db_ElevatorTaskExceptionHandles.Add(db_ElevatorTaskExceptionHandle); SemaphoreSlim s_elevatortask = new(1); _wareHouseService.s_elevatortaskDic.Add(s_elevatorArea, s_elevatortask); + SemaphoreSlim s_elevatortaskWCSRequest = new(1); + _wareHouseService.s_elevatortaskWCSRequestDic.Add(s_elevatorArea, s_elevatortaskWCSRequest); } } @@ -1929,11 +1931,17 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA foreach (string area in _wareHouseService.s_elevatortaskDic.Keys) { SemaphoreSlim s_elevatortask = _wareHouseService.s_elevatortaskDic[area]; + SemaphoreSlim s_elevatortaskWCSRequest = _wareHouseService.s_elevatortaskWCSRequestDic[area]; if (s_elevatortask.CurrentCount == 0) return; + if (s_elevatortaskWCSRequest.CurrentCount == 0) + return; await s_elevatortask.WaitAsync(); + //WCS下发任务前会判断是否一托下 防止向WCS发送一托下指令和下发任务同步进行 + await s_elevatortaskWCSRequest.WaitAsync(); + var db_ElevatorTaskExceptionHandle = _wareHouseService.db_ElevatorTaskExceptionHandles[index]; taskActions[index] = Task.Run(async () => @@ -1948,7 +1956,6 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA LoggerElevatorTask.Information($"【ElevatorTaskExceptionHandle】检查到需要恢复/执行的电梯任务{elevatorTasks.Count}条 {string.Join(',', elevatorTasks.Select(x => x.bill_code))}"); - if (elevatorTasks?.Count > 0) { LoggerElevatorTask.Information($"【ElevatorTaskExceptionHandle】{JsonConvert.SerializeObject(elevatorTasks)}"); @@ -2044,6 +2051,8 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA finally { s_elevatortask.Release(); + if (s_elevatortaskWCSRequest.CurrentCount == 0) + s_elevatortaskWCSRequest.Release(); } }); index++; diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs index cadb7618..03b3152e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs @@ -474,7 +474,7 @@ /// /// ERPId(天益4厂) /// - public const string ErpUserId = "34995305856535"; + public const string ErpUserId = "14995305856535"; /// /// 盘点任务计算状态-未结算 /// diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MaterialTransferDistributeSCWToYCLInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MaterialTransferDistributeSCWToYCLInput.cs index bc4679da..6a9163ea 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MaterialTransferDistributeSCWToYCLInput.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MaterialTransferDistributeSCWToYCLInput.cs @@ -15,7 +15,7 @@ public string create_id { get; set; } /// - /// 来源单据id(转库单主表) + /// 来源单据id(转库单子表) /// public string? source_id { get; set; } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MaterialTransferDistributeSCWToZCCInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MaterialTransferDistributeSCWToZCCInput.cs new file mode 100644 index 00000000..43a8de4e --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MaterialTransferDistributeSCWToZCCInput.cs @@ -0,0 +1,33 @@ +namespace Tnb.WarehouseMgr.Entities.Dto +{ + /// + /// 库房业务更新输入参数 + /// + public class MaterialTransferDistributeSCWToZCCInput + { + /// + /// 组织ID + /// + public string org_id { get; set; } + /// + /// 创建用户 + /// + public string create_id { get; set; } + + /// + /// 来源单据id(转库单子表) + /// + public string? source_id { get; set; } + + /// + /// 载具条码 + /// + public string? carry_code { get; set; } + + /// + /// 数量 + /// + public decimal qty { get; set; } + + } +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPackInstockD.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPackInstockD.cs index d8ebf451..5249818c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPackInstockD.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPackInstockD.cs @@ -119,4 +119,19 @@ public partial class WmsPackInstockD : BaseEntity /// public DateTime? modify_time { get; set; } + /// + /// 物料名称 + /// + public string? material_name { get; set; } + + /// + /// erp_line_pk + /// + public string? erp_line_pk { get; set; } + + /// + /// 行号 + /// + public string? lineno { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPackInstockH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPackInstockH.cs index ab2d3baf..a82c4078 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPackInstockH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPackInstockH.cs @@ -89,4 +89,33 @@ public partial class WmsPackInstockH : BaseEntity /// public string? incoming_ware { get; set; } + /// + /// + /// + public string? erp_pk { get; set; } + + /// + /// + /// + public string? erp_bill_code { get; set; } + + /// + /// erp仓库类型 + /// + public string? erp_wh_type { get; set; } + + /// + /// 出库组织id + /// + public string? outstockorg_id { get; set; } + + /// + /// 出库组织编号 + /// + public string? outstockorg_code { get; set; } + + /// + /// 出库组织名称 + /// + public string? outstockorg_name { get; set; } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferinstockD.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferinstockD.cs index 0c1091a9..f4cf1ef7 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferinstockD.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferinstockD.cs @@ -133,4 +133,10 @@ public partial class WmsRawmatTransferinstockD : BaseEntity /// 已绑定数量 /// public decimal? bind_qty { get; set; } + + /// + /// 物料名称 + /// + public string? matname { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs index 4cd263bf..0b4d6ca0 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs @@ -118,5 +118,10 @@ public partial class WmsTransferInstockD : BaseEntity /// 行号 /// public string? lineno { get; set; } + + /// + /// 物料名称 + /// + public string? material_name { get; set; } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs index a8a81049..92834249 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Mvc; using SqlSugar; using Tnb.BasicData.Entities; using Tnb.WarehouseMgr.Entities; +using Tnb.WarehouseMgr.Entities.Consts; using Tnb.WarehouseMgr.Entities.Dto; using Tnb.WarehouseMgr.Entities.Dto.Inputs; using Tnb.WarehouseMgr.Entities.Dto.Queries; @@ -42,6 +43,13 @@ namespace Tnb.WarehouseMgr.Interfaces { get; } + /// + /// WCS请求 + /// + public Dictionary s_elevatortaskWCSRequestDic + { + get; + } /// /// 入库策略 @@ -130,7 +138,12 @@ namespace Tnb.WarehouseMgr.Interfaces /// /// string[] GetFloor1WXSGWOutstockLocation(); - + ///// + ///// 是否为二楼(一楼外协三存位送上来)入暂存仓起点 + ///// + ///// + ///// + //string[] GetFloor2WX2ZCCStartLocation(); /// /// 生成预任务 /// diff --git a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs index 2a6a57e9..8cf120f4 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs @@ -67,8 +67,15 @@ namespace Tnb.WarehouseMgr protected static Dictionary _s_eleUseStatusDic; - public Dictionary _s_elevatortaskDic = new(); - public List _db_ElevatorTaskExceptionHandles = new(); + /// + /// 电梯任务 + /// + public static Dictionary _s_elevatortaskDic = new(); + /// + /// WCS请求 + /// + public static Dictionary _s_elevatortaskWCSRequestDic = new(); + public static List _db_ElevatorTaskExceptionHandles = new(); public static SemaphoreSlim s_GenTaskExecute = new(1); protected IEventPublisher? EventPublisher { set; get; } @@ -109,6 +116,7 @@ namespace Tnb.WarehouseMgr static BaseWareHouseService() { + _stroageMapLazy = new Lazy>(() => { Dictionary map = new(); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs index 0e8eace1..1da5b98f 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs @@ -8,6 +8,7 @@ using JNPF.Common.Enums; using JNPF.Common.Extension; using JNPF.Common.Manager; using JNPF.Common.Net; +using JNPF.Common.Options; using JNPF.Common.Security; using JNPF.EventBus; using JNPF.EventHandler; @@ -407,7 +408,7 @@ namespace Tnb.WarehouseMgr List elevatorTasks = _db.Queryable() .Where(r => r.startlocation_code == $"DT-3-{sno}" && r.endlocation_code == $"DT-1-{sno}" && r.act_start_date != null && r.act_end_date == null && r.status != WmsWareHouseConst.TASK_BILL_STATUS_CANCEL_ID && r.status != WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID).ToList(); - if (elevatorTasks.Count >= 0) + if (elevatorTasks.Count > 0) { Logger.LogInformation($"电梯{devName}内已有货，且已判定为一托下！"); return await ToApiResult(HttpStatusCode.InternalServerError, $"电梯内{devName}已有货，且已判定为一托下！"); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs b/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs index db0bb7d7..11157aa2 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs @@ -1047,7 +1047,7 @@ namespace Tnb.WarehouseMgr WmsErpWarehouserelaH wmsErpWarehouserelaH = await db.Queryable().Where(r => r.erp_warehousecode == input.warehouse_instock).FirstAsync(); if (wmsErpWarehouserelaH == null) { - _LoggerErp2Mes.LogWarning($@"【TransferOrder】不存在erp仓库类型{input.warehouse_instock}对应wms系统的映射关系！"); + _LoggerErp2Mes.LogWarning($@"【TransferOutstock】不存在erp仓库类型{input.warehouse_instock}对应wms系统的映射关系！"); throw new AppFriendlyException($@"不存在erp仓库类型{input.warehouse_instock}对应wms系统的映射关系！", 500); } @@ -1056,7 +1056,7 @@ namespace Tnb.WarehouseMgr BasWarehouse warehouse_instock = await db.Queryable().Where(r => r.whcode == warehouse_instock_code).FirstAsync(); if (warehouse_instock == null) { - _LoggerErp2Mes.LogWarning($"【TransferOrder】无法查询到入库仓库{warehouse_instock_code}的档案记录！"); + _LoggerErp2Mes.LogWarning($"【TransferOutstock】无法查询到入库仓库{warehouse_instock_code}的档案记录！"); return await ToApiResult(HttpStatusCode.InternalServerError, $"无法查询到入库仓库{warehouse_instock_code}的档案记录！"); } @@ -1083,6 +1083,25 @@ namespace Tnb.WarehouseMgr { case WmsWareHouseConst.WAREHOUSE_YCL_ID: { + // 判断是否重复传输 + WmsRawmatTransferinstockH wmsRawmatTransferinstockHRep = await db.Queryable().Where(r => r.erp_pk == input.erp_pk).FirstAsync(); + if (wmsRawmatTransferinstockHRep != null) + { + // 判断单据是否已经下发 + List wmsRawmatTransferinstockHs = await db.Queryable().Where(r => r.bill_id == wmsRawmatTransferinstockHRep.id).ToListAsync(); + bool isxf = wmsRawmatTransferinstockHs.Where(r => r.bind_qty > 0).Any(); + if (isxf) + { + _LoggerErp2Mes.LogWarning($@"【TransferOutstock】wms已下发使用调拨出库单{input.transfer_order}！"); + throw new AppFriendlyException($@"wms已下发使用调拨出库单{input.transfer_order}！", 500); + } + else // 删除数据重新插入 + { + await db.Deleteable().Where(r => r.id == wmsRawmatTransferinstockHRep.id).ExecuteCommandAsync(); + await db.Deleteable().Where(r => r.bill_id == wmsRawmatTransferinstockHRep.id).ExecuteCommandAsync(); + } + } + WmsRawmatTransferinstockH wmsRawmatTransferinstockH = new WmsRawmatTransferinstockH(); Code = await _billRuleService.GetBillNumber("WmsRawMatTransferInstock"); @@ -1143,6 +1162,7 @@ namespace Tnb.WarehouseMgr if (material != null) { msRawmatTransferinstockD.matcode_id = material.id; + msRawmatTransferinstockD.matname = material.name; msRawmatTransferinstockD.matspecification = material.material_specification; } @@ -1155,6 +1175,25 @@ namespace Tnb.WarehouseMgr } case WmsWareHouseConst.WAREHOUSE_CP_ID: { + // 判断是否重复传输 + WmsTransferInstockH wmsTransferInstockHRep = await db.Queryable().Where(r => r.erp_pk == input.erp_pk).FirstAsync(); + if (wmsTransferInstockHRep != null) + { + // 判断单据是否已经下发 + List _wmsTransferInstockDs = await db.Queryable().Where(r => r.bill_id == wmsTransferInstockHRep.id).ToListAsync(); + bool isxf = _wmsTransferInstockDs.Where(r => r.xf_qty > 0).Any(); + if (isxf) + { + _LoggerErp2Mes.LogWarning($@"【TransferOutstock】wms已下发使用调拨出库单{input.transfer_order}！"); + throw new AppFriendlyException($@"wms已下发使用调拨出库单{input.transfer_order}！", 500); + } + else // 删除数据重新插入 + { + await db.Deleteable().Where(r => r.id == wmsTransferInstockHRep.id).ExecuteCommandAsync(); + await db.Deleteable().Where(r => r.bill_id == wmsTransferInstockHRep.id).ExecuteCommandAsync(); + } + } + WmsTransferInstockH wmsTransferInstockH = new WmsTransferInstockH(); Code = await _billRuleService.GetBillNumber("transferInstock"); @@ -1213,6 +1252,7 @@ namespace Tnb.WarehouseMgr if (material != null) { wmsTransferInstockD.material_id = material.id; + wmsTransferInstockD.material_code = material.code; wmsTransferInstockD.material_desc = material.material_specification; } @@ -1221,6 +1261,94 @@ namespace Tnb.WarehouseMgr await db.Insertable(wmsTransferInstockDs).ExecuteCommandAsync(); + break; + } + case WmsWareHouseConst.WAREHOUSE_JXK_ID: + { + // 判断是否重复传输 + WmsPackInstockH wmsPackInstockHRep = await db.Queryable().Where(r => r.erp_pk == input.erp_pk).FirstAsync(); + if (wmsPackInstockHRep != null) + { + // 判断单据是否已经下发 + List _wmsPackInstocDs = await db.Queryable().Where(r => r.bill_id == wmsPackInstockHRep.id).ToListAsync(); + bool isxf = _wmsPackInstocDs.Where(r => r.xf_qty > 0).Any(); + if (isxf) + { + _LoggerErp2Mes.LogWarning($@"【TransferOutstock】wms已下发使用调拨出库单{input.transfer_order}！"); + throw new AppFriendlyException($@"wms已下发使用调拨出库单{input.transfer_order}！", 500); + } + else // 删除数据重新插入 + { + await db.Deleteable().Where(r => r.id == wmsPackInstockHRep.id).ExecuteCommandAsync(); + await db.Deleteable().Where(r => r.bill_id == wmsPackInstockHRep.id).ExecuteCommandAsync(); + } + } + + WmsPackInstockH wmsPackInstockH = new WmsPackInstockH(); + Code = await _billRuleService.GetBillNumber("WMSPACKINSTOCK"); + + wmsPackInstockH.bill_code = Code; + wmsPackInstockH.erp_bill_code = input.transfer_order; + var org_erpExtendField = await db.Queryable().Where(a => a.pk_org == input.outstockorg_id).FirstAsync(); + if (org_erpExtendField != null) + { + wmsPackInstockH.outstockorg_id = org_erpExtendField.pk_org_v; + wmsPackInstockH.outstockorg_code = org_erpExtendField.pk_org; + } + else + { + _LoggerErp2Mes.LogWarning($@"【TransferOutstock】表头明细中组织{input.outstockorg_id}在wms系统中未找到！"); + throw new AppFriendlyException($@"表头明细中组织{input.outstockorg_id}在wms系统中未找到！", 500); + } + wmsPackInstockH.incoming_ware = warehouse_instock.id; + wmsPackInstockH.org_id = WmsWareHouseConst.AdministratorOrgId; + wmsPackInstockH.erp_pk = input.erp_pk; + wmsPackInstockH.create_id = WmsWareHouseConst.ErpUserId; + wmsPackInstockH.bill_date = DateTime.Now; + wmsPackInstockH.create_time = DateTime.Now; + wmsPackInstockH.erp_wh_type = input.warehouse_instock; + await db.Insertable(wmsPackInstockH).ExecuteCommandAsync(); + + List wmsPackInstockDs = new List(); + foreach (var detail in input.details) + { + WmsPackInstockD wmsPackInstockD = new WmsPackInstockD(); + + wmsPackInstockD.bill_id = wmsPackInstockH.id; + wmsPackInstockD.material_code = detail.material_code; + + var erpExtendField = await db.Queryable().InnerJoin((a, b) => a.table_id == b.Id).Where((a, b) => b.EnCode == detail.unit_code).Select((a, b) => b).FirstAsync(); + if (erpExtendField != null) + { + wmsPackInstockD.unit_id = erpExtendField.Id; + wmsPackInstockD.unit_code = erpExtendField.EnCode; + } + else + { + _LoggerErp2Mes.LogWarning($@"【TransferOutstock】表体明细中单位{detail.unit_code}在wms系统中未找到！"); + throw new AppFriendlyException($@"表体明细中单位{detail.unit_code}在wms系统中未找到！", 500); + } + wmsPackInstockD.pr_qty = detail.qty; + wmsPackInstockD.pi_code = detail.code_batch; + wmsPackInstockD.erp_line_pk = detail.erp_line_pk; + wmsPackInstockD.create_id = WmsWareHouseConst.ErpUserId; + wmsPackInstockD.create_time = DateTime.Now; + wmsPackInstockD.xf_qty = 0; + wmsPackInstockD.qty = 0; + wmsPackInstockD.lineno = detail.lineno; + var material = await db.Queryable().Where(p => p.code == detail.material_code).FirstAsync(); + if (material != null) + { + wmsPackInstockD.material_id = material.id; + wmsPackInstockD.material_code = material.code; + wmsPackInstockD.material_desc = material.material_specification; + } + + wmsPackInstockDs.Add(wmsPackInstockD); + } + + await db.Insertable(wmsPackInstockDs).ExecuteCommandAsync(); + break; } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 941dbafe..6f3a2b0e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -138,6 +138,14 @@ namespace Tnb.WarehouseMgr { get { return _db_ElevatorTaskExceptionHandles; } } + /// + /// WCS请求 + /// + public Dictionary s_elevatortaskWCSRequestDic + { + get { return _s_elevatortaskWCSRequestDic; } + } + public WareHouseService(ISqlSugarRepository repository, IDictionaryDataService dictionaryDataService, StackExRedisHelper redisData, @@ -429,6 +437,17 @@ namespace Tnb.WarehouseMgr , WmsWareHouseConst.Floor1WXSGWOutstockStation3 }; } + ///// + ///// 是否为二楼(一楼外协三存位送上来)入暂存仓起点 + ///// + ///// + ///// + //public string[] GetFloor2WX2ZCCStartLocation() + //{ + // return new string[3] { WmsWareHouseConst.Floor1WXSGWOutstockStation1 , WmsWareHouseConst.Floor1WXSGWOutstockStation2 + // , WmsWareHouseConst.Floor1WXSGWOutstockStation3 }; + //} + /// /// 出库策略-销售出库下发 /// @@ -1441,11 +1460,46 @@ namespace Tnb.WarehouseMgr !it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase)) .ToList(); + #region 三楼三四号梯如果与判断一托下有冲突 + if (s_elevatortaskWCSRequestDic.Count > 0) + { + for (int index_agvElevatorTasks = 0; index_agvElevatorTasks < agvElevatorTasks.Count; index_agvElevatorTasks++) + { + WmsPretaskH wmsPretaskH = agvElevatorTasks[index_agvElevatorTasks]; + string area_code = ""; + // 找到电梯任务的电梯区域 + if (wmsPretaskH.start_floor == "3" && wmsPretaskH.end_floor == "3") + { + if (wmsPretaskH.endlocation_code == "DT-3-3") + { + area_code = "ELE03"; + } + else if (wmsPretaskH.endlocation_code == "DT-3-4") { area_code = "ELE04"; } + } + // 如果不是三楼三四号梯出货 + if (string.IsNullOrEmpty(area_code)) + { + continue; + } + SemaphoreSlim s_elevatortaskWCSRequest = s_elevatortaskWCSRequestDic[area_code]; + if (s_elevatortaskWCSRequest.CurrentCount == 0) + { + Logger.Information($"【GenTaskExecute】 获取到AGV到电梯{area_code}的预任务{wmsPretaskH.bill_code}正在执行一托下判断，此时不下发任务"); + agvElevatorTasks.RemoveAt(index_agvElevatorTasks); + index_agvElevatorTasks--; + } + else + { + Logger.Information($"【GenTaskExecute】AGV到电梯{area_code}的预任务{wmsPretaskH.bill_code}没有在执行一托下判断，正常下发任务"); + } + } + } + #endregion + var elePreTasks = preTasks.Where(it => it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase)).ToList(); var normalPreTasks = preTasks.Where(it => it.area_code != "B" && !agvElevatorTasks.Concat(elePreTasks).Select(x => x.endlocation_code).Contains(it.endlocation_code)).ToList(); - //Logger.Information("【GenTaskExecute】 电梯预任务elePreTasks:" + JsonConvert.SerializeObject(elePreTasks)); //Logger.Information("【GenTaskExecute】 AGV/CTU/KIVA预任务normalPreTasks:" + JsonConvert.SerializeObject(normalPreTasks)); //Logger.Information("【GenTaskExecute】 AGV电梯预任务agvElevatorTasks:" + JsonConvert.SerializeObject(agvElevatorTasks)); @@ -2259,6 +2313,11 @@ namespace Tnb.WarehouseMgr } } catch { throw; } + finally + { + SemaphoreSlim s_elevatortaskWCSRequest = s_elevatortaskWCSRequestDic[disTask.area_code]; + s_elevatortaskWCSRequest.Release(); + } try diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs index 62eef7b1..ed71221d 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs @@ -167,6 +167,7 @@ namespace Tnb.WarehouseMgr if (wmsCarryCode.codeqty == 0) { CarryCodeUnbindCodeInput carryCodeUnbindCodeInput = new CarryCodeUnbindCodeInput(); + carryCodeUnbindCodeInput.carry_code_id = wmsCarryCode.id; await _wmsCarryUnbindService.CarryCodeUnbindCode(carryCodeUnbindCodeInput, _db); await _db.Updateable().SetColumns(r => r.carry_status == "0").Where(r => r.id == wmsCarryH.id).ExecuteCommandAsync(); } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs index 3266a1ef..5976f879 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs @@ -362,7 +362,7 @@ namespace Tnb.WarehouseMgr .OrderBy("is_lock, task_nums, location_code").ToList(); } // 中储仓三工位 - else if (wmsMaterialTransfer.warehouse_instock == WmsWareHouseConst.WAREHOUSE_ZC_ID) + else if (wmsMaterialTransfer.warehouse_instock == WmsWareHouseConst.WAREHOUSE_ZC_ID || wmsMaterialTransfer.warehouse_instock == WmsWareHouseConst.WAREHOUSE_ZZXBK_ID) { // 根据三工位任务数平均分配任务 暂定 endLocations = _db.Queryable().Where(r => _wareHouseService.GetFloor1WXSGWOutstockLocation().Contains(r.id) && r.is_lock == 0 && r.is_use == "0") @@ -386,7 +386,7 @@ namespace Tnb.WarehouseMgr endLocation = await _db.Queryable().Where(r => _wareHouseService.GetFloor1GLSGWOutstockLocation().Contains(r.id) && r.is_lock == 0 && r.is_use == "0").OrderBy("is_lock, task_nums, location_code").FirstAsync(); } // 中储仓三工位 - else if(wmsMaterialTransfer.warehouse_instock == WmsWareHouseConst.WAREHOUSE_ZC_ID) + else if(wmsMaterialTransfer.warehouse_instock == WmsWareHouseConst.WAREHOUSE_ZC_ID || wmsMaterialTransfer.warehouse_instock == WmsWareHouseConst.WAREHOUSE_ZZXBK_ID) { // 根据三工位任务数平均分配任务 暂定 endLocation = await _db.Queryable().Where(r => _wareHouseService.GetFloor1WXSGWOutstockLocation().Contains(r.id) && r.is_lock == 0 && r.is_use == "0").OrderBy("is_lock, task_nums, location_code").FirstAsync(); @@ -599,7 +599,6 @@ namespace Tnb.WarehouseMgr throw new AppFriendlyException("批号不可为空", 500); } - WmsMaterialTransferD wmsMaterialTransferD = await _db.Queryable().FirstAsync(it => it.id == input.source_id); WmsMaterialTransfer wmsMaterialTransfer = await _db.Queryable().FirstAsync(it => it.id == wmsMaterialTransferD.bill_id); @@ -1455,6 +1454,10 @@ namespace Tnb.WarehouseMgr throw new AppFriendlyException($"载具{input.carry_code}当前所在库位不是三工位！", 500); } + if (input.qty + wmsMaterialTransferD.yxfqty_rk > wmsMaterialTransferD.yzqty) + { + throw new AppFriendlyException($"本次下发数量{input.qty}已超过可下发数量{wmsMaterialTransferD.yzqty - wmsMaterialTransferD.yxfqty_rk}", 500); + } await _s_taskExecuteSemaphore_YCLInstock.WaitAsync(); await _db.Ado.BeginTranAsync(); @@ -2035,5 +2038,150 @@ namespace Tnb.WarehouseMgr } } + + /// + /// 三存位入库到暂存仓 + /// + /// + /// + /// + [HttpPost, NonUnify, AllowAnonymous] + public async Task DistributeSCWToZCC(MaterialTransferDistributeSCWToZCCInput input) + { + try + { + if (string.IsNullOrEmpty(input.source_id)) + { + throw new AppFriendlyException("来源单据id不可为空", 500); + } + + if (string.IsNullOrEmpty(input.carry_code)) + { + throw new AppFriendlyException("载具不可为空", 500); + } + + if (input.qty <= 0) + { + throw new AppFriendlyException("数量必须大于0", 500); + } + + WmsMaterialTransferD wmsMaterialTransferD = await _db.Queryable().FirstAsync(it => it.id == input.source_id); + if (wmsMaterialTransferD == null) + { + throw new AppFriendlyException($"不存在id为{input.source_id}的转库单明细！", 500); + } + + if (wmsMaterialTransferD.yxfqty_rk >= wmsMaterialTransferD.yzqty) + { + throw new AppFriendlyException("已下发数量已达到中储仓的转出数量", 500); + } + + WmsCarryH wmsCarryH = await _db.Queryable().FirstAsync(it => it.carry_code == input.carry_code); + if (wmsCarryH == null) + { + throw new AppFriendlyException($"不存在编码为{input.carry_code}的载具！", 500); + } + if (wmsCarryH.carry_status != "0") + { + throw new AppFriendlyException($"载具{input.carry_code}状态为占用！", 500); + } + if (wmsCarryH.is_lock == 1) + { + throw new AppFriendlyException($"载具{input.carry_code}已锁定！", 500); + } + if (string.IsNullOrEmpty(wmsCarryH.location_id)) + { + throw new AppFriendlyException($"载具{input.carry_code}的库位为空！", 500); + } + + if (wmsCarryH.carrystd_id != WmsWareHouseConst.CARRY_ZYXCSTD_ID && wmsCarryH.carrystd_id != WmsWareHouseConst.CARRY_ZYLJSTD_ID) + { + throw new AppFriendlyException($"载具{input.carry_code}的规格必须是载运小车或者载运料架！", 500); + } + + //if (!_wareHouseService.GetFloor1WXSGWOutstockLocation().Contains(wmsCarryH.location_id)) + //{ + // Logger.LogWarning($"载具{input.carry_code}当前所在库位不是三工位！"); + // throw new AppFriendlyException($"载具{input.carry_code}当前所在库位不是三工位！", 500); + //} + + if (input.qty + wmsMaterialTransferD.yxfqty_rk > wmsMaterialTransferD.yzqty) + { + throw new AppFriendlyException($"本次下发数量{input.qty}已超过可下发数量{wmsMaterialTransferD.yzqty - wmsMaterialTransferD.yxfqty_rk}", 500); + } + + await _s_taskExecuteSemaphore_YCLInstock.WaitAsync(); + await _db.Ado.BeginTranAsync(); + + + InStockStrategyQuery inStockStrategyInput = new() + { + warehouse_id = WmsWareHouseConst.WAREHOUSE_ZCC_ID, + Size = 1 + }; + List endlocations = await _wareHouseService.InStockStrategy(inStockStrategyInput); + + if (endlocations.Count < 1) + { + throw new AppFriendlyException($@"没有可以入库的库位", 500); + } + + BasLocation startLocation = await _db.Queryable().Where(r => r.id == wmsCarryH.location_id).FirstAsync(); + + CommonCreatePretaskInput commonCreatePretaskInput = new CommonCreatePretaskInput(); + commonCreatePretaskInput.startlocation_id = startLocation.id; + commonCreatePretaskInput.endlocation_id = endlocations[0].id; + commonCreatePretaskInput.task_type = WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID; + commonCreatePretaskInput.biz_type = WmsWareHouseConst.BIZTYPE_WMSMATERIALTRANSFER_ID; + // 转库单id + commonCreatePretaskInput.source_id = input.source_id; + commonCreatePretaskInput.carry_id = wmsCarryH.id; + commonCreatePretaskInput.carry_code = wmsCarryH.carry_code; + commonCreatePretaskInput.isExcuteMission = false; + + Entities.Dto.Outputs.Result res = await _wareHouseService.CommonCreatePretask(commonCreatePretaskInput); + + if (res.code != HttpStatusCode.OK) + { + throw new AppFriendlyException($@"生成预任务失败", 500); + } + + CarryMaterialBindInput carryMaterialBindInput = new CarryMaterialBindInput(); + carryMaterialBindInput.carrycode = wmsCarryH.carry_code; + carryMaterialBindInput.create_id = input.create_id; + + List carryMaterialDetails = new List(); + CarryMaterialDetail carryMaterialDetail = new CarryMaterialDetail(); + carryMaterialDetail.material_id = wmsMaterialTransferD.material_id; + carryMaterialDetail.material_code = wmsMaterialTransferD.material_code; + carryMaterialDetail.codeqty = input.qty; + carryMaterialDetail.code_batch = wmsMaterialTransferD.code_batch; + carryMaterialDetail.barcode = wmsCarryH.carry_code; + carryMaterialDetail.unit_id = wmsMaterialTransferD.unit_id; + carryMaterialDetails.Add(carryMaterialDetail); + carryMaterialBindInput.details = carryMaterialDetails; + await _wmsCarryBindService.CarryMaterialBind(carryMaterialBindInput, _db); + await _db.Updateable().SetColumns(r => r.carry_status == "1").Where(r => r.id == wmsCarryH.id).ExecuteCommandAsync(); + + // 更新子表已下发数量 + await _db.Updateable().SetColumns(r => r.yxfqty_rk == r.yxfqty_rk + input.qty).Where(r => r.id == input.source_id).ExecuteCommandAsync(); + + await _db.Ado.CommitTranAsync(); + } + catch (Exception ex) + { + await _db.Ado.RollbackTranAsync(); + Logger.LogWarning("【DistributeSCWToYCL】" + ex.Message); + Logger.LogWarning("【DistributeSCWToYCL】" + ex.StackTrace); + return await ToApiResult(HttpStatusCode.InternalServerError, ex.Message); + } + finally + { + _ = _s_taskExecuteSemaphore_YCLInstock.Release(); + InvokeGenPretaskExcute(); + } + + return await ToApiResult(HttpStatusCode.OK, "成功"); + } } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs index 755fbb68..36638811 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs @@ -113,6 +113,21 @@ namespace Tnb.WarehouseMgr } List WmsPrdInstockDs = new List(); + #region 生产入库对应的bip仓库 + string scwarehouse_id = ""; + if (type == DictConst.PrdMoTypeZS) + { + scwarehouse_id = "0201010402"; + } + else if (type == DictConst.PrdMoTypeJC) + { + scwarehouse_id = "0202010202"; + } + else if (type == DictConst.PrdMoTypeBZ) + { + + } + #endregion foreach (WmsPrdInstockDInput prdInstockDInput in input.prdInstockDs) { WmsPrdInstockDs.Add(new WmsPrdInstockD() @@ -124,7 +139,8 @@ namespace Tnb.WarehouseMgr create_id = input.create_id, create_time = DateTime.Now, prd_instock_id = prd_instock_code_id, - status = WmsWareHouseConst.TASK_BILL_STATUS_YXD_ID + status = WmsWareHouseConst.TASK_BILL_STATUS_YXD_ID, + scwarehouse_id = scwarehouse_id }); }