diff --git a/BasicData/Tnb.BasicData.Entities/Dto/SubBomListOutput.cs b/BasicData/Tnb.BasicData.Entities/Dto/SubBomListOutput.cs index 7f382d40..27de3443 100644 --- a/BasicData/Tnb.BasicData.Entities/Dto/SubBomListOutput.cs +++ b/BasicData/Tnb.BasicData.Entities/Dto/SubBomListOutput.cs @@ -64,5 +64,10 @@ namespace Tnb.BasicData.Entities.Dto /// 工序排序序号 /// public long? ordinal { get; set; } + + /// + /// 生产bom工序id + /// + public string? mbom_process_id { get; set; } } } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs index 633cc417..b9147f91 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs @@ -248,5 +248,10 @@ public partial class BasMaterial : BaseEntity /// 是否包含入库数 /// public int? is_contain_into_num { get; set; } + + /// + /// 是否创建子工单 + /// + public string? is_create_sub_work_order { get; set; } } diff --git a/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs b/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs index c27b3596..53f530fd 100644 --- a/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs +++ b/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs @@ -4,6 +4,19 @@ namespace Tnb.BasicData.Interfaces { public interface IBasMaterialService { + /// + /// 获取本物料清单及其所有子集物料信息 + /// + /// + /// public Task GetMaterialSelectInfo(MaterialSelectQueryInput queryInput); + + + /// + /// 获取可创建子工单的物料 + /// + /// + /// + public Task GetCanCreateSubWorkOrderMaterial(MaterialSelectQueryInput queryInput); } } \ No newline at end of file diff --git a/BasicData/Tnb.BasicData/BasMaterialService.cs b/BasicData/Tnb.BasicData/BasMaterialService.cs index 16716cc5..f5ba3c65 100644 --- a/BasicData/Tnb.BasicData/BasMaterialService.cs +++ b/BasicData/Tnb.BasicData/BasMaterialService.cs @@ -128,6 +128,38 @@ namespace Tnb.BasicData } } + [HttpPost] + public async Task GetCanCreateSubWorkOrderMaterial(MaterialSelectQueryInput queryInput) + { + var db = _repository.AsSugarClient(); + if (!string.IsNullOrEmpty(queryInput.ebom_id)) + { + List ids = await GetAllChildrenMaterialId(queryInput.ebom_id,0); + var result = await db.Queryable() + .LeftJoin((a, b) => b.EnCode == DictConst.MeasurementUnit && b.DeleteMark == null) + .LeftJoin((a, b, c) => c.DictionaryTypeId == b.Id && a.unit_id == c.EnCode) + .WhereIF(!string.IsNullOrEmpty(queryInput.material_info), (a, b, c) => a.code.Contains(queryInput.material_info) || a.name.Contains(queryInput.material_info)) + .WhereIF(!string.IsNullOrEmpty(queryInput.ebom_id), (a, b, c) => ids.Contains(a.id)) + .Where((a,b,c)=>a.is_create_sub_work_order=="1") + .Select((a, b, c) => new MaterialSelectOutput() + { + id = a.id, + code = a.code, + name = a.name, + descrip = a.descrip, + unit_id = a.unit_id, + unit_name = c.FullName, + }).ToPagedListAsync(queryInput.currentPage, queryInput.pageSize); + + return PageResult.SqlSugarPageResult(result); + + } + else + { + return PageResult.SqlSugarPageResult(new SqlSugarPagedList()); + } + } + /// /// 获取物料清单下所子集物料id /// diff --git a/PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs b/PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs index d2adc2f9..bbe62db9 100644 --- a/PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs +++ b/PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs @@ -4,125 +4,4 @@ public class ModuleConsts { public const string Tag = "PerMgr"; public const string Area = "per"; - /// - /// -PDA쳣ȡ - /// - public const string MODULE_WMSEXCEPTIONCANCELPDA_ID = "26631250691605"; - /// - /// -PDA쳣ִ - /// - public const string MODULE_WMSEXCPTIONREEXCUTEPDA_ID = "26631184673813"; - /// - /// -PDA쳣 - /// - public const string MODULE_WMSEXCPTIONCOMPLETEPDA_ID = "26497241038869"; - /// - /// -PDAͶϲ - /// - public const string MODULE_WMSFEEDINGRECORDPDA_ID = "26496913096981"; - /// - /// -PDA󶨲 - /// - public const string MODULE_WMSBINDINGPDA_ID = "26496560237333"; - /// - /// -PDAؾ߽ - /// - public const string MODULE_WMSCARRYUNBINDPDA_ID = "26479624280613"; - /// - /// -PDAؾ߰ - /// - public const string MODULE_WMSCARRYBINDPDA_ID = "26479495084837"; - /// - /// -PDAؾƳ - /// - public const string MODULE_WMSCARRYMOOUTSTKPDA_ID = "26479437840677"; - /// - /// -PDAؾ - /// - public const string MODULE_WMSMOVEINSTKPDA_ID = "26476127634469"; - /// - /// -PDAؾ߸ - /// - public const string MODULE_WMSCARRYREPLACEPDA_ID = "26475867493157"; - /// - /// -PDA - /// - public const string MODULE_WMSDELIVERYPDA_ID = "26475604135973"; - /// - /// -PDAת - /// - public const string MODULE_WMSTRANSFERPDA_ID = "26475492865317"; - /// - /// -PDAĴ - /// - public const string MODULE_WMSINBALEINPDA_ID = "26475412782629"; - /// - /// -PDAĴ - /// - public const string MODULE_WMSINBALEINSTKPDA_ID = "26474954845989"; - /// - /// -PDA - /// - public const string MODULE_WMSKITTINGINSTKPDA_ID = "26474190687781"; - /// - /// -PDAһ - /// - public const string MODULE_WMSINSTOCKPDA_ID = "26458832529445"; - /// - /// -Ĵ - /// - public const string MODULE_WMSOUTBALE_ID = "26192638001445"; - /// - /// -Ĵ - /// - public const string MODULE_WMSINBALE_ID = "26192480520485"; - /// - /// - - /// - public const string MODULE_WMSOUTSTOCK_ID = "26191983650597"; - /// - /// - - /// - public const string MODULE_WMSINSTOCK_ID = "26191326300453"; - /// - /// -ؾ߸ - /// - public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557"; - /// - /// -׷ּ - /// - public const string MODULE_WMSSETSORTING_ID = "26172520979237"; - /// - /// -׳ - /// - public const string MODULE_WMSKITTINGOUTSTK_ID = "26169701736741"; - /// - /// - - /// - public const string MODULE_WMSKITTINGINSTK_ID = "26166785871909"; - /// - /// - - /// - public const string MODULE_WMSDELIVERY_ID = "26126388337189"; - /// - /// -ת - /// - public const string MODULE_WMSTRANSFER_ID = "26125750270757"; - /// - /// -ؾƳ - /// - public const string MODULE_WMSCARRYMOOUTSTK_ID = "26123262586661"; - /// - /// -ؾ߳ - /// - public const string MODULE_WMSEPTYOUTSTK_ID = "26122798979365"; - /// - /// -ؾ - /// - public const string MODULE_CARRYMOVEINSTOCK_ID = "26122102481957"; - /// - /// -ؾ - /// - public const string MODULE_WMSEMPTYINSTOCK_ID = "26120915344165"; - } \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdFeedingD.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdFeedingD.cs index 29bc4b6c..58f50b8d 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdFeedingD.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdFeedingD.cs @@ -53,5 +53,25 @@ public partial class PrdFeedingD : BaseEntity /// 物料签收单子表id /// public string? material_receipt_detail_id { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 状态 0 未消耗 1 部分消耗 2 消耗完 + /// + public string? status { get; set; } + + /// + /// 使用数量 + /// + public decimal use_num { get; set; } = 0; } \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTask.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTask.cs index 7d4dfe1e..16772015 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTask.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTask.cs @@ -177,4 +177,9 @@ public partial class PrdMoTask : BaseEntity /// 工序id /// public string process_id { get; set; } + + /// + /// 生产bom工序id + /// + public string? mbom_process_id { get; set; } } diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs index 06c5e640..047a6725 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs @@ -91,6 +91,8 @@ namespace Tnb.ProductionMgr batch = item["batch"], unit_id = item["unit_id"], carry_id = input.carry_id, + status = "0", + use_num = 0, }); if (detail != null) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index 4561e5c0..503dbbfd 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -39,6 +39,7 @@ using System.Dynamic; using Tnb.EquipMgr.Entities.Dto; using JNPF.Common.Filter; using JNPF.Systems.Entitys.System; +using Microsoft.ClearScript.Util.Web; using Newtonsoft.Json; using Tnb.BasicData.Entities.Dto; using NPOI.SS.Formula.Functions; @@ -369,7 +370,8 @@ namespace Tnb.ProductionMgr workline_code = b.EnCode, workline_name = b.FullName, mo_task_status = a.mo_task_status, - scheduled_qty = SqlFunc.Subqueryable().Where(it => it.mo_id == a.mo_id).Sum(it => it.scheduled_qty), + // scheduled_qty = SqlFunc.Subqueryable().Where(it => it.mo_id == a.mo_id).Sum(it => it.scheduled_qty), + scheduled_qty = a.scheduled_qty, plan_qty = SqlFunc.Subqueryable().Where(it => it.id == a.mo_id).Select(it => it.plan_qty), estimated_start_date = a.estimated_start_date, estimated_end_date = a.estimated_end_date, @@ -824,6 +826,7 @@ namespace Tnb.ProductionMgr material_id = SqlFunc.Subqueryable().Where(it => it.id == e.material_id).Select(it => it.id), num = e.num, ordinal = d.ordinal, + mbom_process_id = b.id, }) .Mapper(it => it.output_qty = it.num.ParseToInt()) .ToListAsync(); @@ -839,6 +842,7 @@ namespace Tnb.ProductionMgr subMoTask.parent_id = moTask.id; subMoTask.bom_id = input.bom_id; subMoTask.process_id = item.process_id; + subMoTask.mbom_process_id = item.mbom_process_id; subMoTask.mo_task_status = DictConst.ToBeScheduledEncode; subMoTask.workroute_id = item.route_id; subMoTask.workline_id = input.workline_id; @@ -1229,7 +1233,80 @@ namespace Tnb.ProductionMgr await db.Updateable(master).ExecuteCommandAsync(); } + + //扣除生产投料 按最先投入的依次扣除 + List prdFeedingDs = await db.Queryable() + .LeftJoin((a,b)=>a.id==b.feeding_id) + .Where((a,b) => a.workline_id == prdMoTask.workline_id && (b.status=="0" || b.status=="1")) + .OrderBy((a,b) => b.create_time) + .Select((a,b)=>b) + .ToListAsync(); + + if (prdFeedingDs != null && prdFeedingDs.Count>0) + { + + BasMbom basMbom = await db.Queryable().SingleAsync(x => x.id == prdMoTask.bom_id); + List basMbomInputs = await db.Queryable().Where(x => + x.mbom_id == prdMoTask.bom_id && x.mbom_process_id == prdMoTask.mbom_process_id).ToListAsync(); + + foreach (var item in basMbomInputs) + { + var details = prdFeedingDs.Where(x => x.material_id == item.material_id).OrderBy(x=>x.create_time).ToList(); + if (details?.Count>0) + { + decimal deductNum = input.reported_qty * item.num / basMbom.num; + decimal? notUseNum = details.Sum(x => x.num - x.use_num); + if (notUseNum > deductNum) + { + + foreach (var detail in details) + { + + if (deductNum - (detail.num - detail.use_num) < 0) + { + await db.Updateable().SetColumns(x => x.use_num == x.use_num+deductNum) + .SetColumns(x=>x.status=="1") + .Where(x => x.id == detail.id).ExecuteCommandAsync(); + + } + else + { + await db.Updateable().SetColumns(x => x.use_num == x.num) + .SetColumns(x=>x.status=="2") + .Where(x => x.id == detail.id).ExecuteCommandAsync(); + + } + + deductNum = deductNum - (detail.num - detail.use_num); + } + + if (deductNum > 0) + { + throw new Exception("投入物料不足"); + } + } + else if(notUseNum == deductNum) + { + foreach (var detail in details) + { + db.Updateable().SetColumns(x => x.use_num == x.num) + .SetColumns(x=>x.status=="2") + .Where(x => x.id == detail.id); + + } + } + else + { + throw new Exception("投入物料不足"); + } + + } + } + } + }); + + if (!result.IsSuccess) throw Oops.Bah(result.ErrorMessage); return result.IsSuccess; } diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs index 6f426481..8b47fbca 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs @@ -69,7 +69,8 @@ namespace Tnb.ProductionMgr plan_start_date = a.estimated_start_date, plan_end_date = a.estimated_end_date, plan_qty = c.plan_qty, - complete_qty = SqlFunc.Subqueryable().Where(it => it.mo_task_code == a.mo_task_code).Sum(it => it.reported_work_qty), + // complete_qty = SqlFunc.Subqueryable().Where(it => it.mo_task_code == a.mo_task_code).Sum(it => it.reported_work_qty), + complete_qty = a.reported_work_qty+a.scrap_qty, mo_task_status = a.mo_task_status, }) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs index f19023ae..82585ecd 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs @@ -94,9 +94,16 @@ public class ModuleConsts /// public const string MODULE_WMSINSTOCK_ID = "26191326300453"; /// + /// 模块标识-载具解绑 + public const string MODULE_WMSCARRYUNBIND_ID = "26106270092325"; + /// + /// 模块标识-载具绑定 + /// + public const string MODULE_WMSCARRYBIND_ID = "26105163614501"; + /// /// 模块标识-载具更换 /// - public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557"; + public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557";//26188532491557 /// /// 模块标识-齐套分拣 /// diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/WareHouseUpInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/WareHouseUpInput.cs index 881ad64b..fa48bda3 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/WareHouseUpInput.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/WareHouseUpInput.cs @@ -28,6 +28,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto /// 任务执行条码表 /// public List distaskCodes { get; set; } + /// + /// 载具 + /// + public List carryIds { get; set; } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index eaebd2ea..18a994cf 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -433,10 +433,10 @@ namespace Tnb.WarehouseMgr //更新载具，锁定状态为未锁定，更新载具的库位当前任务的目标库位 if (disTasks?.Count > 0) { - var multiList = disTasks.Select(it => (it.carry_id, it.endlocation_id)).ToList(); + var multiList = disTasks.Select(it => (it.carry_id, it.endlocation_id, it.endlocation_code)).ToList(); for (int i = 0; i < multiList.Count; i++) { - await _db.Updateable().SetColumns(it => new WmsCarryH { is_lock = 0, location_id = multiList[i].endlocation_id }).Where(it => it.id == multiList[i].carry_id).ExecuteCommandAsync(); + await _db.Updateable().SetColumns(it => new WmsCarryH { is_lock = 0, location_id = multiList[i].endlocation_id, location_code = multiList[i].endlocation_code }).Where(it => it.id == multiList[i].carry_id).ExecuteCommandAsync(); } } //更新库位信息，使用状态为 使用，锁定状态为未锁定 @@ -459,7 +459,7 @@ namespace Tnb.WarehouseMgr foreach (var dt in disTasks) { var disTaskCodes = await _db.Queryable().Where(it => it.bill_id == dt.id).ToListAsync(); - var upInput = new WareHouseUpInput { bizTypeId = dt.biz_type, requireId = dt.require_id, distaskCodes = disTaskCodes }; + var upInput = new WareHouseUpInput { bizTypeId = dt.biz_type, requireId = dt.require_id, distaskCodes = disTaskCodes, carryIds = disTasks.Select(x => x.carry_id).ToList() }; upInput.loginType = !_userManager.LoginType.IsNullOrEmpty() ? "app" : "web"; if (dt.is_sign == 1) //区分出入库操作 { diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs index b208f687..599aadc0 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs @@ -29,7 +29,7 @@ namespace Tnb.WarehouseMgr /// /// 载具绑定 /// - [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACE_ID)] + [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYBIND_ID)] public class WmsCarryBindService : BaseWareHouseService { private readonly ISqlSugarClient _db; @@ -59,7 +59,7 @@ namespace Tnb.WarehouseMgr { await _db.Ado.BeginTranAsync(); - VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true); + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYBIND_ID, true); await _runService.Create(templateEntity, input); if (input == null) throw new ArgumentNullException(nameof(input)); @@ -67,18 +67,21 @@ namespace Tnb.WarehouseMgr var subCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : ""; var carry = await _db.Queryable().SingleAsync(it => it.id == carryId); var subCarry = await _db.Queryable().SingleAsync(it => it.id == subCarryId); - WmsCarrybindH wmsCarrybindH = carry.Adapt(); + WmsCarryD wmsCarryD = new() + { + id = SnowflakeIdHelper.NextId(), + carry_id = carry.id, + org_id = carry?.org_id!, + membercarry_id = subCarry.id, + membercarry_code = subCarry.carry_code, + loc = input.data[nameof(WmsCarrybindH.loc)]?.ToString()!, + create_id = _userManager.UserId, + create_time = DateTime.Now + }; + //WmsCarrybindH wmsCarrybindH = carry?.Adapt()!; if (carry != null && subCarry != null) { - wmsCarrybindH.id = SnowflakeIdHelper.NextId(); - wmsCarrybindH.org_id = carry.org_id; - wmsCarrybindH.carry_id = carry.id; - wmsCarrybindH.membercarry_id = subCarry.id; - wmsCarrybindH.membercarry_code = subCarry.carry_code; - wmsCarrybindH.loc = input.data[nameof(WmsCarrybindH.loc)].ParseToInt(1); - wmsCarrybindH.create_id = _userManager.UserId; - wmsCarrybindH.create_time = DateTime.Now; - var row = await _db.Insertable(wmsCarrybindH).ExecuteCommandAsync(); + var row = await _db.Insertable(wmsCarryD).ExecuteCommandAsync(); carry.carry_status = "1"; row = await _db.Updateable(carry).ExecuteCommandAsync(); subCarry.carry_status = "1"; @@ -88,15 +91,15 @@ namespace Tnb.WarehouseMgr { WmsCarrybindCode wmsCarrybindCode = new(); wmsCarrybindCode.id = SnowflakeIdHelper.NextId(); - wmsCarrybindCode.org_id = subCarry.id; - wmsCarrybindCode.carrybind_id = wmsCarrybindH.id; + wmsCarrybindCode.org_id = subCarry?.org_id!; + wmsCarrybindCode.carrybind_id = input.data["ReturnIdentity"]?.ToString()!; wmsCarrybindCode.material_id = items[i].material_id; wmsCarrybindCode.material_code = items[i].material_code; wmsCarrybindCode.barcode = items[i].barcode; wmsCarrybindCode.code_batch = items[i].code_batch; wmsCarrybindCode.codeqty = items[i].codeqty; - wmsCarrybindCode.membercarry_id = subCarry.id; - wmsCarrybindCode.membercarry_code = subCarry.carry_code; + wmsCarrybindCode.membercarry_id = subCarry?.id; + wmsCarrybindCode.membercarry_code = subCarry?.carry_code; wmsCarrybindCode.unit_id = items[i].unit_id; wmsCarrybindCode.unit_code = items[i].unit_code; wmsCarrybindCode.create_id = _userManager.UserId; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryReplaceService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryReplaceService.cs deleted file mode 100644 index bd3368d2..00000000 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryReplaceService.cs +++ /dev/null @@ -1,175 +0,0 @@ -using JNPF.Common.Contracts; -using JNPF.Common.Core.Manager; -using JNPF.Common.Dtos.VisualDev; -using JNPF.Common.Enums; -using JNPF.Common.Security; -using JNPF.DependencyInjection; -using JNPF.DynamicApiController; -using JNPF.FriendlyException; -using JNPF.Logging; -using JNPF.Systems.Interfaces.System; -using JNPF.VisualDev; -using Mapster; -using Microsoft.AspNetCore.Mvc; -using SqlSugar; -using Tnb.Common.Utils; -using Tnb.WarehouseMgr.Entities; -using Tnb.WarehouseMgr.Entities.Consts; -using Tnb.WarehouseMgr.Entities.Dto; -using Tnb.WarehouseMgr.Entities.Enums; -using Tnb.WarehouseMgr.Interfaces; - -namespace Tnb.WarehouseMgr -{ - /// - /// 载具服务 - /// - [OverideVisualDev(ModuleId)] - public class WmsCarryReplaceService : BaseWareHouseService, IWmsCarryService - { - private const string ModuleId = "26188532491557"; - private readonly ISqlSugarClient _db; - private readonly IUserManager _userManager; - private readonly IBillRullService _billRullService; - public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); - public WmsCarryReplaceService(ISqlSugarRepository repository, IUserManager userManager, IBillRullService billRullService) - { - _db = repository.AsSugarClient(); - _userManager = userManager; - _billRullService = billRullService; - OverideFuncs.CreateAsync = CarryReplace; - } - - /// - /// 更换载具 - /// - /// - /// 输入参数: - ///
{ - ///
old_carry_id:老载具id - ///
new_carry_id：新载具ID - ///
} - /// - /// - /// - [HttpPost] - public async Task CarryReplace(VisualDevModelDataCrInput input) - { - var isOk = false; - try - { - await _db.Ado.BeginTranAsync(); - var oldCarryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : ""; - var newCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : ""; - var oldCarry = await _db.Queryable().FirstAsync(it => it.id == oldCarryId); - var newCarry = await _db.Queryable().FirstAsync(it => it.id == newCarryId); - if (oldCarry != null && newCarry != null) - { - ExChangeCarryInput carryInput = new() { old_carry_id = oldCarry.id, new_carry_id = newCarry.id }; - isOk = await _updateSubCarry(carryInput); - isOk = await _updateSubCarry(carryInput); - isOk = await _updateSubCarry(carryInput); - - newCarry.status = oldCarry.status; - newCarry.carry_status = oldCarry.carry_status; - newCarry.location_id = oldCarry.location_id; - newCarry.location_code = oldCarry.location_code; - newCarry.is_lock = oldCarry.is_lock; - newCarry.out_status = oldCarry.out_status; - newCarry.is_check = oldCarry.is_check; - newCarry.bale_num = oldCarry.bale_num; - newCarry.collocation_scheme_id = oldCarry.collocation_scheme_id; - newCarry.collocation_scheme_code = oldCarry.collocation_scheme_code; - newCarry.source_id = oldCarry.source_id; - newCarry.source_code = oldCarry.source_code; - newCarry.create_id = _userManager.UserId; - newCarry.create_time = DateTime.Now; - var row = await _db.Updateable(newCarry).ExecuteCommandAsync(); - WmsCarryReplaceH wmsCarryReplaceH = oldCarry.Adapt(); - wmsCarryReplaceH.id = SnowflakeIdHelper.NextId(); - wmsCarryReplaceH.org_id = oldCarry.org_id; - wmsCarryReplaceH.bill_code = await _billRullService.GetBillNumber(WmsCarryConst.WMS_CARRY_REPLACE_ENCODE); - wmsCarryReplaceH.carry_id = oldCarry.id; - wmsCarryReplaceH.carry_code = oldCarry.carry_code; - wmsCarryReplaceH.newcarry_id = newCarry.id; - wmsCarryReplaceH.newcarry_code = newCarry.carry_code; - row = await _db.Insertable(wmsCarryReplaceH).ExecuteCommandAsync(); - row = await UpdateNullCarry(oldCarry); - isOk = (row > 0); - if (!isOk) throw Oops.Oh(ErrorCode.COM1001); - } - else - { - if (oldCarry == null) - { - throw new AppFriendlyException("没有可用的旧载具", 500); - } - if (newCarry == null) - { - throw new AppFriendlyException("没有可用的新载具", 500); - } - - } - await _db.Ado.CommitTranAsync(); - } - catch (Exception ex) - { - Log.Error("载具更换失败", ex); - await _db.Ado.RollbackTranAsync(); - throw; - } - return isOk; - } - - public async Task UpdateNullCarry(WmsCarryH carryObj) - { - var row = -1; - try - { - carryObj.status = 0; - carryObj.carry_status = "0"; - carryObj.location_id = null; - carryObj.location_code = null; - carryObj.out_status = "0"; - carryObj.is_check = 0; - carryObj.status = 1; - carryObj.bale_num = null; - carryObj.collocation_scheme_id = null; - carryObj.collocation_scheme_code = null; - carryObj.source_id = null; - carryObj.source_code = null; - row = await _db.Updateable(carryObj).ExecuteCommandAsync(); - } - catch (Exception ex) - { - - } - return row; - } - - private async Task _updateSubCarry(ExChangeCarryInput input) where T : BaseEntity, IWmsCarryEntity, new() - { - var row = -1; - var items = await _db.Queryable().Where(it => it.carry_id == input.old_carry_id).ToListAsync(); - if (items?.Count > 0) - { - List newItems = DeepCopyHelper.DeepCopyList(items); - if (newItems?.Count > 0) - { - newItems.ForEach(x => - { - x.id = SnowflakeIdHelper.NextId(); - x.carry_id = input.new_carry_id; - - }); - row = await _db.Insertable(newItems).ExecuteCommandAsync(); - } - if (row > 0) - { - row = await _db.Deleteable(items).ExecuteCommandAsync(); - } - } - return (row > 0); - } - } -} \ No newline at end of file diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs index 7e065bb3..6223716d 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs @@ -24,14 +24,12 @@ namespace Tnb.WarehouseMgr /// /// 载具服务 /// - [OverideVisualDev(ModuleId)] + [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACE_ID)] public class WmsCarryService : BaseWareHouseService, IWmsCarryService { - private const string ModuleId = "26188532491557"; private readonly ISqlSugarClient _db; private readonly IUserManager _userManager; private readonly IBillRullService _billRullService; - public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); public WmsCarryService(ISqlSugarRepository repository, IUserManager userManager, IBillRullService billRullService) { _db = repository.AsSugarClient(); @@ -52,8 +50,7 @@ namespace Tnb.WarehouseMgr /// /// /// - [HttpPost] - public async Task ExchangeCarry(VisualDevModelDataCrInput input) + private async Task ExchangeCarry(VisualDevModelDataCrInput input) { var isOk = false; try diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs index 5ad45372..f50d12e8 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs @@ -29,7 +29,7 @@ namespace Tnb.WarehouseMgr /// /// 载具解绑 /// - [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACE_ID)] + [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYUNBIND_ID)] public class WmsCarryUnbindService : BaseWareHouseService { private readonly ISqlSugarClient _db; @@ -58,7 +58,7 @@ namespace Tnb.WarehouseMgr { await _db.Ado.BeginTranAsync(); - VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true); + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYUNBIND_ID, true); await _runService.Create(templateEntity, input); if (input == null) throw new ArgumentNullException(nameof(input)); @@ -69,7 +69,27 @@ namespace Tnb.WarehouseMgr //WmsCarryunbindH wmsCarryUnbindH = carry.Adapt(); if (carry != null && subCarry != null) { - var row = await _db.Deleteable().Where(it => it.carry_id == subCarry.id).ExecuteCommandAsync(); + var row = await _db.Deleteable().Where(it => it.carry_id == carryId && it.membercarry_id == subCarryId).ExecuteCommandAsync(); + var items = await _db.Queryable().Where(it => it.carry_id == subCarryId).ToListAsync(); + WmsCarryunbindCode wmsCarryUnbindCode = new(); + for (int i = 0; i < items.Count; i++) + { + wmsCarryUnbindCode.id = SnowflakeIdHelper.NextId(); + wmsCarryUnbindCode.org_id = subCarry?.org_id!; + wmsCarryUnbindCode.carryunbind_id = input.data["ReturnIdentity"]?.ToString()!; + wmsCarryUnbindCode.material_id = items[i].material_id; + wmsCarryUnbindCode.material_code = items[i].material_code; + wmsCarryUnbindCode.barcode = items[i].barcode; + wmsCarryUnbindCode.code_batch = items[i].code_batch; + wmsCarryUnbindCode.codeqty = items[i].codeqty; + wmsCarryUnbindCode.membercarry_id = subCarry?.id; + wmsCarryUnbindCode.membercarry_code = subCarry?.carry_code; + wmsCarryUnbindCode.unit_id = items[i].unit_id; + wmsCarryUnbindCode.unit_code = items[i].unit_code; + wmsCarryUnbindCode.create_id = _userManager.UserId; + wmsCarryUnbindCode.create_time = DateTime.Now; + row = await _db.Insertable(wmsCarryUnbindCode).ExecuteCommandAsync(); + } carry.carry_status = "0"; row = await _db.Updateable(carry).ExecuteCommandAsync(); subCarry.carry_status = "0"; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs index eab88ceb..d6beff87 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs @@ -88,12 +88,12 @@ namespace Tnb.WarehouseMgr ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); } int i = 0; - - + + //根据每个载具的起始库位做路径运算 for (i = 0; i < setQty.qty; i++) { - + if (carrys?.Count > 0) sPoint = await _db.Queryable().FirstAsync(it => it.location_id == carrys[i].location_id); var isOk = false; @@ -133,12 +133,12 @@ namespace Tnb.WarehouseMgr }).ToList(); //更新页面 //赋值签收状态 - if (loc.is_sign == 0) + if (loc.is_sign == 0) { preTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值 } isOk = await _wareHouseService.GenPreTask(preTasks, null); - + } if (isOk) { @@ -150,12 +150,12 @@ namespace Tnb.WarehouseMgr preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList(); //更新明细表 - WmsEmptyOutstockD wmsEmptyOutstockD = new (); + WmsEmptyOutstockD wmsEmptyOutstockD = new(); wmsEmptyOutstockD.id = SnowflakeIdHelper.NextId(); - wmsEmptyOutstockD.bill_id = input.data[nameof(WmsEmptyOutstockH.bill_code)]?.ToString()!; + wmsEmptyOutstockD.bill_id = preTaskUpInput.RquireId; wmsEmptyOutstockD.biz_type = WmsWareHouseConst.BIZTYPE_WMSEPTYOUTSTK_ID; wmsEmptyOutstockD.location_id = ePoint.location_id; - wmsEmptyOutstockD.status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID; + wmsEmptyOutstockD.status = WmsWareHouseConst.BILLSTATUS_ON_ID; wmsEmptyOutstockD.carry_id = carrys[i].id; wmsEmptyOutstockD.carry_code = carrys[i].carry_code; wmsEmptyOutstockD.create_id = _userManager.UserId; @@ -166,11 +166,11 @@ namespace Tnb.WarehouseMgr //根据空载具出库Id，回更单据状态 await _db.Updateable().SetColumns(it => new WmsEmptyOutstockH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync(); await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput, - it => new WmsCarryH { is_lock = 1}, + it => new WmsCarryH { is_lock = 1 }, it => new BasLocation { is_lock = 1 }); } } - + } await _db.Ado.CommitTranAsync(); @@ -186,8 +186,28 @@ namespace Tnb.WarehouseMgr public async override Task ModifyAsync(WareHouseUpInput input) { if (input == null) throw new ArgumentNullException(nameof(input)); - var isOk = await _db.Updateable().SetColumns(it => new WmsEmptyInstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); - if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + try + { + await _db.Ado.BeginTranAsync(); + + //根据载具更新明细表状态 + var isOk = await _db.Updateable().SetColumns(it => new WmsEmptyOutstockD { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.bill_id == input.requireId && input.carryIds.Contains(it.carry_id)).ExecuteCommandHasChangeAsync(); + + var emptyCarrys = await _db.Queryable().Where(it => it.bill_id == input.requireId).ToListAsync(); + // 判断所有明细是否都完成 + if (emptyCarrys?.Count > 0 && emptyCarrys.All(x => x.status == WmsWareHouseConst.BILLSTATUS_COMPLETE_ID)) + { + isOk = await _db.Updateable().SetColumns(it => new WmsEmptyOutstockH { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); + } + if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + + await _db.Ado.CommitTranAsync(); + } + catch (Exception) + { + await _db.Ado.RollbackTranAsync(); + throw; + } } } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsBindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDABindService.cs similarity index 94% rename from WarehouseMgr/Tnb.WarehouseMgr/WmsBindService.cs rename to WarehouseMgr/Tnb.WarehouseMgr/WmsPDABindService.cs index abd254eb..922c2a44 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsBindService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDABindService.cs @@ -24,15 +24,14 @@ namespace Tnb.WarehouseMgr /// /// 载具服务 /// - [OverideVisualDev(ModuleId)] - public class WmsBindService : BaseWareHouseService, IWmsCarryService + [OverideVisualDev(ModuleConsts.MODULE_WMSBINDINGPDA_ID)] + public class WmsPDABindService : BaseWareHouseService, IWmsCarryService { - private const string ModuleId = "26496560237333"; + //private const string ModuleId = "26496560237333"; private readonly ISqlSugarClient _db; private readonly IUserManager _userManager; private readonly IBillRullService _billRullService; - public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); - public WmsBindService(ISqlSugarRepository repository, IUserManager userManager, IBillRullService billRullService) + public WmsPDABindService(ISqlSugarRepository repository, IUserManager userManager, IBillRullService billRullService) { _db = repository.AsSugarClient(); _userManager = userManager; @@ -52,7 +51,7 @@ namespace Tnb.WarehouseMgr /// /// /// - public async Task WmsBind(VisualDevModelDataCrInput input) + private async Task WmsBind(VisualDevModelDataCrInput input) { var isOk = false; try diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs new file mode 100644 index 00000000..e05ffdda --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs @@ -0,0 +1,135 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using JNPF.Common.Core.Manager; +using JNPF.Common.Dtos.VisualDev; +using JNPF.Common.Enums; +using JNPF.Common.Extension; +using JNPF.Common.Security; +using JNPF.FriendlyException; +using JNPF.Systems.Interfaces.System; +using JNPF.VisualDev; +using JNPF.VisualDev.Entitys; +using JNPF.VisualDev.Interfaces; +using Mapster; +using Microsoft.AspNetCore.Mvc; +using NPOI.SS.Formula; +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; + +namespace Tnb.WarehouseMgr +{ + /// + /// 载具绑定 + /// + [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYBINDPDA_ID)] + public class WmsPDACarryBindService : BaseWareHouseService + { + private readonly ISqlSugarClient _db; + private readonly IRunService _runService; + private readonly IVisualDevService _visualDevService; + private readonly IUserManager _userManager; + private readonly IBillRullService _billRullService; + public WmsPDACarryBindService( + ISqlSugarRepository repository, + IRunService runService, + IVisualDevService visualDevService, + IUserManager userManager, + IBillRullService billRullService) + { + _db = repository.AsSugarClient(); + _runService = runService; + _visualDevService = visualDevService; + _userManager = userManager; + _billRullService = billRullService; + OverideFuncs.CreateAsync = PDACarryBind; + } + + private async Task PDACarryBind(VisualDevModelDataCrInput input) + { + var isOk = false; + try + { + await _db.Ado.BeginTranAsync(); + + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYBINDPDA_ID, true); + await _runService.Create(templateEntity, input); + + if (input == null) throw new ArgumentNullException(nameof(input)); + var carryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : ""; + var subCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : ""; + var carry = await _db.Queryable().SingleAsync(it => it.id == carryId); + var subCarry = await _db.Queryable().SingleAsync(it => it.id == subCarryId); + WmsCarryD wmsCarryD = new() + { + id = SnowflakeIdHelper.NextId(), + carry_id = carry.id, + org_id = carry?.org_id!, + membercarry_id = subCarry.id, + membercarry_code = subCarry.carry_code, + loc = input.data[nameof(WmsCarrybindH.loc)]?.ToString()!, + create_id = _userManager.UserId, + create_time = DateTime.Now + }; + //WmsCarrybindH wmsCarrybindH = carry?.Adapt()!; + if (carry != null && subCarry != null) + { + var row = await _db.Insertable(wmsCarryD).ExecuteCommandAsync(); + carry.carry_status = "1"; + row = await _db.Updateable(carry).ExecuteCommandAsync(); + subCarry.carry_status = "1"; + row = await _db.Updateable(subCarry).ExecuteCommandAsync(); + var items = await _db.Queryable().Where(it => it.carry_id == subCarryId).ToListAsync(); + for (int i = 0; i < items.Count; i++) + { + WmsCarrybindCode wmsCarrybindCode = new(); + wmsCarrybindCode.id = SnowflakeIdHelper.NextId(); + wmsCarrybindCode.org_id = subCarry?.org_id!; + wmsCarrybindCode.carrybind_id = input.data["ReturnIdentity"]?.ToString()!; + wmsCarrybindCode.material_id = items[i].material_id; + wmsCarrybindCode.material_code = items[i].material_code; + wmsCarrybindCode.barcode = items[i].barcode; + wmsCarrybindCode.code_batch = items[i].code_batch; + wmsCarrybindCode.codeqty = items[i].codeqty; + wmsCarrybindCode.membercarry_id = subCarry?.id; + wmsCarrybindCode.membercarry_code = subCarry?.carry_code; + wmsCarrybindCode.unit_id = items[i].unit_id; + wmsCarrybindCode.unit_code = items[i].unit_code; + wmsCarrybindCode.create_id = _userManager.UserId; + wmsCarrybindCode.create_time = DateTime.Now; + row = await _db.Insertable(wmsCarrybindCode).ExecuteCommandAsync(); + } + isOk = (row > 0); + if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + } + else + { + if (carry == null || subCarry == null) + { + throw new AppFriendlyException("没有可用的主载具", 500); + } + } + await _db.Ado.CommitTranAsync(); + } + catch (Exception ex) + { + await _db.Ado.RollbackTranAsync(); + throw; + } + return Task.FromResult(true); + } + /* public override async Task ModifyAsync(WareHouseUpInput input) + { + if (input == null) throw new ArgumentNullException(nameof(input)); + var isOk = await _db.Updateable().SetColumns(it => new WmsCarryReplaceH { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); + if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + }*/ + } +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs index 03d4b985..3193b41b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs @@ -26,9 +26,9 @@ using Tnb.WarehouseMgr.Interfaces; namespace Tnb.WarehouseMgr { /// - /// 载具移入 + /// 载具移出 /// - [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID)] + [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYMOOUTSTKPDA_ID)] [ServiceModule(BizTypeId)] public class WmsPDACarryMoveOutStockService : BaseWareHouseService, IPdaStroage { @@ -63,7 +63,7 @@ namespace Tnb.WarehouseMgr { await _db.Ado.BeginTranAsync(); - VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true); + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTKPDA_ID, true); await _runService.Create(templateEntity, input); //入库取终点 //var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 }; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs index 1a3c8042..b7ae0e01 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs @@ -28,11 +28,9 @@ namespace Tnb.WarehouseMgr [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACEPDA_ID)] public class WmsPDACarryReplaceService : BaseWareHouseService, IWmsCarryService, IPdaStroage { - //private const string ModuleId = "26188532491557"; private readonly ISqlSugarClient _db; private readonly IUserManager _userManager; private readonly IBillRullService _billRullService; - public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); public WmsPDACarryReplaceService(ISqlSugarRepository repository, IUserManager userManager, IBillRullService billRullService) { _db = repository.AsSugarClient(); @@ -53,8 +51,8 @@ namespace Tnb.WarehouseMgr /// /// /// - [HttpPost] - public async Task PDACarryReplace(VisualDevModelDataCrInput input) + + private async Task PDACarryReplace(VisualDevModelDataCrInput input) { var isOk = false; try diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs new file mode 100644 index 00000000..8dacb645 --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs @@ -0,0 +1,128 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using JNPF.Common.Core.Manager; +using JNPF.Common.Dtos.VisualDev; +using JNPF.Common.Enums; +using JNPF.Common.Extension; +using JNPF.Common.Security; +using JNPF.FriendlyException; +using JNPF.Systems.Interfaces.System; +using JNPF.VisualDev; +using JNPF.VisualDev.Entitys; +using JNPF.VisualDev.Interfaces; +using Mapster; +using Microsoft.AspNetCore.Mvc; +using NPOI.SS.Formula; +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; + +namespace Tnb.WarehouseMgr +{ + /// + /// 载具解绑 + /// + [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYUNBINDPDA_ID)] + public class WmsPDACarryUnbindService : BaseWareHouseService + { + private readonly ISqlSugarClient _db; + private readonly IRunService _runService; + private readonly IVisualDevService _visualDevService; + private readonly IUserManager _userManager; + private readonly IWareHouseService _wareHouseService; + public WmsPDACarryUnbindService( + ISqlSugarRepository repository, + IRunService runService, + IVisualDevService visualDevService, + IWareHouseService wareHouseService, + IUserManager userManager) + { + _db = repository.AsSugarClient(); + _runService = runService; + _visualDevService = visualDevService; + _userManager = userManager; + _wareHouseService = wareHouseService; + OverideFuncs.CreateAsync = PDACarryUnbind; + } + private async Task PDACarryUnbind(VisualDevModelDataCrInput input) + { + var isOk = false; + try + { + await _db.Ado.BeginTranAsync(); + + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYUNBINDPDA_ID, true); + await _runService.Create(templateEntity, input); + + if (input == null) throw new ArgumentNullException(nameof(input)); + var carryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : ""; + var subCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : ""; + var carry = await _db.Queryable().FirstAsync(it => it.id == carryId); + var subCarry = await _db.Queryable().FirstAsync(it => it.id == subCarryId); + //WmsCarryunbindH wmsCarryUnbindH = carry.Adapt(); + if (carry != null && subCarry != null) + { + var row = await _db.Deleteable().Where(it => it.carry_id == carryId && it.membercarry_id == subCarryId).ExecuteCommandAsync(); + var items = await _db.Queryable().Where(it => it.carry_id == subCarryId).ToListAsync(); + WmsCarryunbindCode wmsCarryUnbindCode = new(); + for (int i = 0; i < items.Count; i++) + { + wmsCarryUnbindCode.id = SnowflakeIdHelper.NextId(); + wmsCarryUnbindCode.org_id = subCarry?.org_id!; + wmsCarryUnbindCode.carryunbind_id = input.data["ReturnIdentity"]?.ToString()!; + wmsCarryUnbindCode.material_id = items[i].material_id; + wmsCarryUnbindCode.material_code = items[i].material_code; + wmsCarryUnbindCode.barcode = items[i].barcode; + wmsCarryUnbindCode.code_batch = items[i].code_batch; + wmsCarryUnbindCode.codeqty = items[i].codeqty; + wmsCarryUnbindCode.membercarry_id = subCarry?.id; + wmsCarryUnbindCode.membercarry_code = subCarry?.carry_code; + wmsCarryUnbindCode.unit_id = items[i].unit_id; + wmsCarryUnbindCode.unit_code = items[i].unit_code; + wmsCarryUnbindCode.create_id = _userManager.UserId; + wmsCarryUnbindCode.create_time = DateTime.Now; + row = await _db.Insertable(wmsCarryUnbindCode).ExecuteCommandAsync(); + } + carry.carry_status = "0"; + row = await _db.Updateable(carry).ExecuteCommandAsync(); + subCarry.carry_status = "0"; + row = await _db.Updateable(subCarry).ExecuteCommandAsync(); + isOk = (row > 0); + if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + } + else + { + if (carry == null) + { + throw new AppFriendlyException("没有可用的主载具", 500); + } + if (subCarry == null) + { + throw new AppFriendlyException("没有可用的子载具", 500); + } + } + + await _db.Ado.CommitTranAsync(); + } + catch (Exception ex) + { + await _db.Ado.RollbackTranAsync(); + throw; + } + return Task.FromResult(true); + } + /* public override async Task ModifyAsync(WareHouseUpInput input) + { + if (input == null) throw new ArgumentNullException(nameof(input)); + var isOk = await _db.Updateable().SetColumns(it => new WmsCarryReplaceH { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); + if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + }*/ + } +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs index 45198d3f..91abdd0c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs @@ -30,7 +30,7 @@ namespace Tnb.WarehouseMgr /// /// 空载具出库 /// - [OverideVisualDev(ModuleConsts.MODULE_WMSEMPTYOUTSTK_ID)] + [OverideVisualDev(ModuleConsts.MODULE_WMSEMPTYOUTSTKPDA_ID)] public class WmsPDAEmptyOutstockService : BaseWareHouseService, IPdaStroage { @@ -65,7 +65,7 @@ namespace Tnb.WarehouseMgr { await _db.Ado.BeginTranAsync(); - VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSEMPTYOUTSTK_ID, true); + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSEMPTYOUTSTKPDA_ID, true); await _runService.Create(templateEntity, input); /*//入库取终点 @@ -151,7 +151,7 @@ namespace Tnb.WarehouseMgr //更新明细表 WmsEmptyOutstockD wmsEmptyOutstockD = new(); wmsEmptyOutstockD.id = SnowflakeIdHelper.NextId(); - wmsEmptyOutstockD.bill_id = input.data[nameof(WmsEmptyOutstockH.bill_code)]?.ToString()!; + wmsEmptyOutstockD.bill_id = preTaskUpInput.RquireId; wmsEmptyOutstockD.biz_type = WmsWareHouseConst.BIZTYPE_WMSEPTYOUTSTK_ID; wmsEmptyOutstockD.location_id = ePoint.location_id; wmsEmptyOutstockD.status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID; @@ -198,9 +198,29 @@ namespace Tnb.WarehouseMgr public override async Task ModifyAsync(WareHouseUpInput input) { + if (input == null) throw new ArgumentNullException(nameof(input)); - var isOk = await _db.Updateable().SetColumns(it => new WmsEmptyInstock { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); - if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + //根据载具更新明细表状态 + try + { + await _db.Ado.BeginTranAsync(); + var isOk = await _db.Updateable().SetColumns(it => new WmsEmptyOutstockD { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.bill_id == input.requireId && input.carryIds.Contains(it.carry_id)).ExecuteCommandHasChangeAsync(); + + var emptyCarrys = await _db.Queryable().Where(it => it.bill_id == input.requireId).ToListAsync(); + // 判断所有明细是否都完成 + if (emptyCarrys?.Count > 0 && emptyCarrys.All(x => x.status == WmsWareHouseConst.BILLSTATUS_COMPLETE_ID)) + { + await _db.Updateable().SetColumns(it => new WmsEmptyOutstockH { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); + } + if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + await _db.Ado.CommitTranAsync(); + } + catch (Exception) + { + await _db.Ado.RollbackTranAsync(); + throw; + + } } } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs index eb6ecc23..60f074e7 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs @@ -11,6 +11,7 @@ using JNPF.Systems.Interfaces.System; using JNPF.VisualDev; using Mapster; using Microsoft.AspNetCore.Mvc; +using Senparc.Weixin.Work.AdvancedAPIs.OaDataOpen; using SqlSugar; using Tnb.BasicData.Entities; using Tnb.Common.Utils; @@ -25,17 +26,16 @@ namespace Tnb.WarehouseMgr /// /// 载具服务 /// - [OverideVisualDev(ModuleId)] + [OverideVisualDev(ModuleConsts.MODULE_WMSFEEDINGRECORDPDA_ID)] public class WmsPDAFeedingService : BaseWareHouseService, IWmsCarryService, IWmsFeedingService { - private const string ModuleId = "26188532491557"; + //private const string ModuleId = "26496913096981"; private readonly ISqlSugarClient _db; private readonly IUserManager _userManager; private readonly IBillRullService _billRullService; private readonly WmsCarryService _wmsCarryService; private static Dictionary dicMaterial = new Dictionary(); - public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); - public WmsPDAFeedingService(ISqlSugarRepository repository, IUserManager userManager, IBillRullService billRullService,WmsCarryService wmsCarryService) + public WmsPDAFeedingService(ISqlSugarRepository repository, IUserManager userManager, IBillRullService billRullService, WmsCarryService wmsCarryService) { _db = repository.AsSugarClient(); _userManager = userManager; @@ -43,60 +43,67 @@ namespace Tnb.WarehouseMgr _wmsCarryService = wmsCarryService; OverideFuncs.CreateAsync = WmsPDAFeeding; } - + private async Task WmsPDAFeeding(VisualDevModelDataCrInput input) { - var isOk = false; + try { + var isOk = false; await _db.Ado.BeginTranAsync(); - var oldCarryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : ""; - var newCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : ""; - var oldCarry = await _db.Queryable().FirstAsync(it => it.id == oldCarryId); - var newCarry = await _db.Queryable().FirstAsync(it => it.id == newCarryId); - if (oldCarry != null && newCarry != null) + var carryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : ""; + var feedBoxCode = input.data.ContainsKey("feedbox_code") ? input.data["feedbox_code"]?.ToString() : ""; + var carry = await _db.Queryable().FirstAsync(it => it.id == carryId); + var feedBox = await _db.Queryable().FirstAsync(it => it.feedbox_code == feedBoxCode); + var citem = await _db.Queryable().FirstAsync(it => it.carry_id == carryId); + if (carry != null && feedBox != null) { - ExChangeCarryInput carryInput = new() { old_carry_id = oldCarry.id, new_carry_id = newCarry.id }; - isOk = await _updateSubCarry(carryInput); - isOk = await _updateSubCarry(carryInput); - isOk = await _updateSubCarry(carryInput); - + feedBox.material_id = citem.material_id; + feedBox.material_code = citem.material_code; + feedBox.qty = citem.qty; + feedBox.batch = citem?.code_batch!; + var row = await _db.Updateable(feedBox).UpdateColumns(it => new + { + it.material_id, + it.material_code, + it.qty, + it.batch + }).ExecuteCommandAsync(); + /* var row = await _db.Updateable(feedBox).SetColumns(it => new + { + it.material_id == item.material_id,it.material_code + } + )*/ - newCarry.status = oldCarry.status; - newCarry.carry_status = oldCarry.carry_status; - newCarry.location_id = oldCarry.location_id; - newCarry.location_code = oldCarry.location_code; - newCarry.is_lock = oldCarry.is_lock; - newCarry.out_status = oldCarry.out_status; - newCarry.is_check = oldCarry.is_check; - newCarry.bale_num = oldCarry.bale_num; - newCarry.collocation_scheme_id = oldCarry.collocation_scheme_id; - newCarry.collocation_scheme_code = oldCarry.collocation_scheme_code; - newCarry.source_id = oldCarry.source_id; - newCarry.source_code = oldCarry.source_code; - newCarry.create_id = _userManager.UserId; - newCarry.create_time = DateTime.Now; - var row = await _db.Updateable(newCarry).ExecuteCommandAsync(); - WmsCarryReplaceH wmsCarryReplaceH = oldCarry.Adapt(); - wmsCarryReplaceH.id = SnowflakeIdHelper.NextId(); - wmsCarryReplaceH.org_id = oldCarry.org_id; - wmsCarryReplaceH.bill_code = await _billRullService.GetBillNumber(WmsCarryConst.WMS_CARRY_REPLACE_ENCODE); - wmsCarryReplaceH.carry_id = oldCarry.id; - wmsCarryReplaceH.carry_code = oldCarry.carry_code; - wmsCarryReplaceH.newcarry_id = newCarry.id; - wmsCarryReplaceH.newcarry_code = newCarry.carry_code; - row = await _db.Insertable(wmsCarryReplaceH).ExecuteCommandAsync(); - row = await UpdateNullCarry(oldCarry); + var items = await _db.Queryable().Where(it => it.carry_id == carryId).ToListAsync(); + foreach (var item in items) + { + WmsFeedingrecordCode wmsFeedingRecordCode = new(); + wmsFeedingRecordCode.id = SnowflakeIdHelper.NextId(); + wmsFeedingRecordCode.org_id = carry?.org_id!; + wmsFeedingRecordCode.record_id = input.data["ReturnIdentity"]?.ToString()!; + wmsFeedingRecordCode.material_id = item.material_id; + wmsFeedingRecordCode.material_code = item.material_code; + wmsFeedingRecordCode.barcode = item.barcode; + wmsFeedingRecordCode.code_batch = item.code_batch; + wmsFeedingRecordCode.codeqty = item.codeqty; + wmsFeedingRecordCode.unit_id = item.unit_id; + wmsFeedingRecordCode.unit_code = item.unit_code; + wmsFeedingRecordCode.create_id = _userManager.UserId; + wmsFeedingRecordCode.create_time = DateTime.Now; + row = await _db.Insertable(wmsFeedingRecordCode).ExecuteCommandAsync(); + } + row = await UpdateNullCarry(carry); isOk = (row > 0); if (!isOk) throw Oops.Oh(ErrorCode.COM1001); } else { - if (oldCarry == null) + if (carry == null) { throw new AppFriendlyException("没有可用的旧载具", 500); } - if (newCarry == null) + if (feedBox == null) { throw new AppFriendlyException("没有可用的新载具", 500); } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs index 21a86831..54c69b7b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs @@ -70,7 +70,7 @@ namespace Tnb.WarehouseMgr //await _runService.Create(templateEntity, input); //入库取终点 //出库起点 var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString(), Size = 1 }; - var inbaleItem =await _db.Queryable().SingleAsync(it => it.bill_code == input.data[nameof(WmsInbale.bill_code)].ToString()); + var inbaleItem = await _db.Queryable().SingleAsync(it => it.bill_code == input.data[nameof(WmsInbale.bill_code)].ToString()); var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput); WmsPointH sPoint = null; WmsPointH ePoint = null; @@ -143,8 +143,9 @@ namespace Tnb.WarehouseMgr //根据载具移入Id，回更单据状态 await _db.Updateable().SetColumns(it => new WmsInbale { status = WmsWareHouseConst.BILLSTATUS_ON_ID}).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync(); + var baleNum = input.data[nameof(WmsCarryH.bale_num)]?.ToString(); await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput, - it => new WmsCarryH { is_lock = 1, location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode, carry_status= ((int)EnumCarryStatus.寄存).ToString() }, + it => new WmsCarryH { is_lock = 1, location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode, carry_status = ((int)EnumCarryStatus.寄存).ToString(), bale_num = baleNum }, it => new BasLocation { is_lock = 1 }); //((int)EnumCarryStatus.寄存).ToString() } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs index a94f9f36..44c4981a 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs @@ -30,7 +30,7 @@ namespace Tnb.WarehouseMgr /// /// PDA库内转移 /// - [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFER_ID)] + [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFERPDA_ID)] [ServiceModule(BizTypeId)] public class WmsPDATransferService : BaseWareHouseService, IPdaStroage { @@ -65,7 +65,7 @@ namespace Tnb.WarehouseMgr { await _db.Ado.BeginTranAsync(); - VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFER_ID, true); + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFERPDA_ID, true); await _runService.Create(templateEntity, input); // 计算路径，插入预任务申请 WmsPointH sPoint = null; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs index 0934c673..2ce0a3c7 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs @@ -30,7 +30,7 @@ namespace Tnb.WarehouseMgr /// /// 库内转移 /// - [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFERPDA_ID)] + [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFER_ID)] [ServiceModule(BizTypeId)] public class WmsTransferService : BaseWareHouseService, IPdaStroage { @@ -65,7 +65,7 @@ namespace Tnb.WarehouseMgr { await _db.Ado.BeginTranAsync(); - VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFERPDA_ID, true); + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFER_ID, true); await _runService.Create(templateEntity, input); // 计算路径，插入预任务申请 WmsPointH sPoint = null;