diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs index 6223716d..07a99b14 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs @@ -9,6 +9,8 @@ using JNPF.FriendlyException; using JNPF.Logging; using JNPF.Systems.Interfaces.System; using JNPF.VisualDev; +using JNPF.VisualDev.Entitys; +using JNPF.VisualDev.Interfaces; using Mapster; using Microsoft.AspNetCore.Mvc; using SqlSugar; @@ -30,11 +32,20 @@ namespace Tnb.WarehouseMgr private readonly ISqlSugarClient _db; private readonly IUserManager _userManager; private readonly IBillRullService _billRullService; - public WmsCarryService(ISqlSugarRepository repository, IUserManager userManager, IBillRullService billRullService) + private readonly IRunService _runService; + private readonly IVisualDevService _visualDevService; + public WmsCarryService( + ISqlSugarRepository repository, + IUserManager userManager, + IBillRullService billRullService, + IRunService runService, + IVisualDevService visualDevService ) { _db = repository.AsSugarClient(); _userManager = userManager; _billRullService = billRullService; + _runService = runService; + _visualDevService = visualDevService; OverideFuncs.CreateAsync = ExchangeCarry; } @@ -52,10 +63,16 @@ namespace Tnb.WarehouseMgr /// private async Task ExchangeCarry(VisualDevModelDataCrInput input) { + + var isOk = false; try { await _db.Ado.BeginTranAsync(); + + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYREPLACE_ID, true); + await _runService.Create(templateEntity, input); + 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); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs index b7ae0e01..3d1fc2b8 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs @@ -9,12 +9,13 @@ using JNPF.FriendlyException; using JNPF.Logging; using JNPF.Systems.Interfaces.System; using JNPF.VisualDev; +using JNPF.VisualDev.Entitys; +using JNPF.VisualDev.Interfaces; using Mapster; using Microsoft.AspNetCore.Mvc; using SqlSugar; using Tnb.Common.Utils; using Tnb.WarehouseMgr.Entities; -using Tnb.WarehouseMgr.Entities.Attributes; using Tnb.WarehouseMgr.Entities.Consts; using Tnb.WarehouseMgr.Entities.Dto; using Tnb.WarehouseMgr.Entities.Enums; @@ -26,17 +27,26 @@ namespace Tnb.WarehouseMgr /// 载具服务 /// [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACEPDA_ID)] - public class WmsPDACarryReplaceService : BaseWareHouseService, IWmsCarryService, IPdaStroage + public class WmsPDACarryService : BaseWareHouseService, IWmsCarryService, IPdaStroage { private readonly ISqlSugarClient _db; private readonly IUserManager _userManager; private readonly IBillRullService _billRullService; - public WmsPDACarryReplaceService(ISqlSugarRepository repository, IUserManager userManager, IBillRullService billRullService) + private readonly IRunService _runService; + private readonly IVisualDevService _visualDevService; + public WmsPDACarryService( + ISqlSugarRepository repository, + IUserManager userManager, + IBillRullService billRullService, + IRunService runService, + IVisualDevService visualDevService) { _db = repository.AsSugarClient(); _userManager = userManager; _billRullService = billRullService; - OverideFuncs.CreateAsync = PDACarryReplace; + _runService = runService; + _visualDevService = visualDevService; + OverideFuncs.CreateAsync = ExchangeCarry; } /// @@ -51,13 +61,18 @@ namespace Tnb.WarehouseMgr /// /// /// - - private async Task PDACarryReplace(VisualDevModelDataCrInput input) + private async Task ExchangeCarry(VisualDevModelDataCrInput input) { + + var isOk = false; try { await _db.Ado.BeginTranAsync(); + + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYREPLACEPDA_ID, true); + await _runService.Create(templateEntity, input); + 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); @@ -138,6 +153,7 @@ namespace Tnb.WarehouseMgr carryObj.source_id = null; carryObj.source_code = null; row = await _db.Updateable(carryObj).ExecuteCommandAsync(); + //删除对应明细表 //删除载具明细 await _db.Deleteable().Where(it => it.carry_id == carryObj.id).ExecuteCommandHasChangeAsync(); //删除载具分拣物料明细