From 44e084cd2ffd729b72ee6f6ffc8b2fe1cac4508c Mon Sep 17 00:00:00 2001 From: FanLian Date: Tue, 20 Jun 2023 19:07:02 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=BD=BD=E5=85=B7?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=92=8C=E8=BD=BD=E5=85=B7=E8=A7=A3=E7=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr/WmsCarryBindService.cs | 33 ++++++++++--------- .../Tnb.WarehouseMgr/WmsCarryUnbindService.cs | 24 ++++++++++++-- .../WmsPDACarryBindService.cs | 33 ++++++++++--------- .../WmsPDACarryUnbindService .cs | 24 ++++++++++++-- 4 files changed, 80 insertions(+), 34 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs index f853b92c..599aadc0 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs @@ -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/WmsCarryUnbindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs index 74bd890b..f50d12e8 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs @@ -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/WmsPDACarryBindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs index 983dbb47..e05ffdda 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs @@ -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_WMSCARRYBINDPDA_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/WmsPDACarryUnbindService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs index d1128ff6..8dacb645 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs @@ -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_WMSCARRYUNBINDPDA_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"; From 4335f456c081e14db636cbc6e81820513238886c Mon Sep 17 00:00:00 2001 From: FanLian Date: Tue, 20 Jun 2023 19:10:07 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9module?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs index 1b00f2bf..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); /*//入库取终点 From 5a4cbb95e78c21de4ffd3dabaf2f9c2053cfcb16 Mon Sep 17 00:00:00 2001 From: FanLian Date: Tue, 20 Jun 2023 19:16:29 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9B=B4=E6=94=B9module?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{WmsBindService.cs => WmsPDABindService.cs} | 8 ++++---- WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) rename WarehouseMgr/Tnb.WarehouseMgr/{WmsBindService.cs => WmsPDABindService.cs} (95%) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsBindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDABindService.cs similarity index 95% rename from WarehouseMgr/Tnb.WarehouseMgr/WmsBindService.cs rename to WarehouseMgr/Tnb.WarehouseMgr/WmsPDABindService.cs index abfb50a2..922c2a44 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsBindService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDABindService.cs @@ -24,14 +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 WmsBindService(ISqlSugarRepository repository, IUserManager userManager, IBillRullService billRullService) + public WmsPDABindService(ISqlSugarRepository repository, IUserManager userManager, IBillRullService billRullService) { _db = repository.AsSugarClient(); _userManager = userManager; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs index 1c57c58e..7c510ba2 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs @@ -25,10 +25,10 @@ namespace Tnb.WarehouseMgr /// /// 载具服务 /// - [OverideVisualDev(ModuleId)] + [OverideVisualDev(ModuleConsts.MODULE_WMSFEEDINGRECORDPDA_ID)] public class WmsPDAFeedingService : BaseWareHouseService, IWmsCarryService, IWmsFeedingService { - private const string ModuleId = "26496913096981"; + //private const string ModuleId = "26496913096981"; private readonly ISqlSugarClient _db; private readonly IUserManager _userManager; private readonly IBillRullService _billRullService; From 19c92e9b596698ade0bf065c17ca4e150baeeef2 Mon Sep 17 00:00:00 2001 From: hlb <894797954@qq.com> Date: Tue, 20 Jun 2023 19:56:06 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9D=97ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs | 4 ++-- WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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; From 3c781a56bfb0c84362324d56f1b465139be71aeb Mon Sep 17 00:00:00 2001 From: FanLian Date: Tue, 20 Jun 2023 20:10:34 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9PDA=E6=8A=95=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr/WmsPDAFeedingService.cs | 85 ++++++++++--------- 1 file changed, 46 insertions(+), 39 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs index 7c510ba2..8541d41e 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; @@ -34,7 +35,7 @@ namespace Tnb.WarehouseMgr private readonly IBillRullService _billRullService; private readonly WmsCarryService _wmsCarryService; private static Dictionary dicMaterial = new Dictionary(); - 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; @@ -42,60 +43,66 @@ namespace Tnb.WarehouseMgr _wmsCarryService = wmsCarryService; OverideFuncs.CreateAsync = WmsPDAFeeding; } - + private async Task WmsPDAFeeding(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) + 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); } From 9eca3d558e2d10870a12e969c99df7ef54a66755 Mon Sep 17 00:00:00 2001 From: FanLian Date: Tue, 20 Jun 2023 20:11:26 +0800 Subject: [PATCH 6/7] 1 --- WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs index 8541d41e..60f074e7 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs @@ -46,9 +46,10 @@ namespace Tnb.WarehouseMgr private async Task WmsPDAFeeding(VisualDevModelDataCrInput input) { - var isOk = false; + try { + var isOk = false; await _db.Ado.BeginTranAsync(); var carryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : ""; var feedBoxCode = input.data.ContainsKey("feedbox_code") ? input.data["feedbox_code"]?.ToString() : ""; From 99d89cc12d44d8a5bfbb56be28a12007b54013a3 Mon Sep 17 00:00:00 2001 From: taomin0419 <865692298@qq.com> Date: Tue, 20 Jun 2023 20:18:25 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=EF=BC=8CWmsInstockD=20line?= =?UTF-8?q?=5Fstatus=E6=94=B9=E4=B8=BAstring=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/WmsDistaskH.cs | 2 +- .../Entity/WmsInstockCode.cs | 2 +- .../Entity/WmsPretaskCode.cs | 4 - .../Tnb.WarehouseMgr/WmsOutBaleService.cs | 237 ++++++++++++++++++ .../Tnb.WarehouseMgr/WmsPDAInStockService.cs | 21 +- .../Tnb.WarehouseMgr/WmsPDAInbaleService.cs | 2 +- 6 files changed, 258 insertions(+), 10 deletions(-) create mode 100644 WarehouseMgr/Tnb.WarehouseMgr/WmsOutBaleService.cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDistaskH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDistaskH.cs index d70bdc54..b1e3ed17 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDistaskH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDistaskH.cs @@ -102,7 +102,7 @@ public partial class WmsDistaskH : BaseEntity /// /// 是否签收 /// - public int is_sign { get; set; } + public int is_sign { get; set; } = 1; /// /// 来源单据ID diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockCode.cs index 9db06d08..27c24a73 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockCode.cs @@ -42,7 +42,7 @@ public partial class WmsInstockCode : BaseEntity /// /// 明细状态 /// - public int line_status { get; set; } + public string line_status { get; set; } /// /// 物品ID diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskCode.cs index 14e0ad70..4fd80461 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskCode.cs @@ -94,10 +94,6 @@ public partial class WmsPretaskCode : BaseEntity /// public DateTime? modify_time { get; set; } - /// - /// 行号 - /// - public int no { get; set; } /// /// 子载具ID diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutBaleService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutBaleService.cs new file mode 100644 index 00000000..684fac52 --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutBaleService.cs @@ -0,0 +1,237 @@ +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.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 SqlSugar; +using Tnb.BasicData.Entities; +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(ModuleConsts.MODULE_WMSOUTSTOCK_ID)] + public class WmsOutBaleService : BaseWareHouseService, IWmsOutStockService + { + private readonly ISqlSugarClient _db; + private readonly IDictionaryDataService _dictionaryDataService; + private readonly IRunService _runService; + private readonly IVisualDevService _visualDevService; + private readonly IWareHouseService _wareHouseService; + private readonly IUserManager _userManager; + private readonly IBillRullService _billRullService; + + public WmsOutBaleService( + ISqlSugarRepository repository, + IDictionaryDataService dictionaryDataService, + IRunService runService, + IVisualDevService visualDevService, + IWareHouseService wareHouseService, + IUserManager userManager, + IBillRullService billRullService) + { + _db = repository.AsSugarClient(); + _dictionaryDataService = dictionaryDataService; + _runService = runService; + _visualDevService = visualDevService; + _wareHouseService = wareHouseService; + _userManager = userManager; + _billRullService = billRullService; + OverideFuncs.CreateAsync = OutStockApplyFor; + } + + + private async Task OutStockApplyFor(VisualDevModelDataCrInput input) + { + try + { + await _db.Ado.BeginTranAsync(); + + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSOUTSTOCK_ID, true); + await _runService.Create(templateEntity, input); + + //判断目标库位是否自动签收 + var loc = await _db.Queryable().SingleAsync(it => it.id == input.data[nameof(WmsPointH.location_id)].ToString()); + + var carryIds = new List(); + //tablefield120 出库物料明细 + if (input.data.ContainsKey("tablefield120") && input.data["tablefield120"].IsNotEmptyOrNull()) + { + var outStockDList = input.data["tablefield120"].ToObject>(); + if (outStockDList?.Count > 0) + { + List carryMats = new(); + List carryCodes = new(); + foreach (var os in outStockDList) + { + var carryCodesPart = await _db.Queryable().InnerJoin((a, b) => a.id == b.carry_id) + .Where((a, b) => b.material_id == os.material_id && b.code_batch == os.code_batch && a.is_lock == 0 && !string.IsNullOrEmpty(a.location_id) && a.status == (int)EnumCarryStatus.占用) + .Select() + .ToListAsync(); + if (carryCodesPart?.Count > 0) + { + carryCodes.AddRange(carryCodesPart); + var codeQty = carryCodes.Sum(x => x.codeqty); + if (codeQty < os.pr_qty) + { + throw new AppFriendlyException($"需要出库[{os.pr_qty}],实际库存{codeQty},数量不足", 500); + } + var partCarryMats = carryCodesPart.Adapt>(); + partCarryMats.ForEach(x => + { + x.need_qty = (int)os.pr_qty; + x.real_qty = codeQty; + }); + carryMats.AddRange(partCarryMats); + } + } + if (carryMats.Count > 0) + { + carryMats.ForEach(x => x.id = SnowflakeIdHelper.NextId()); + carryMats = carryMats.OrderBy(o => o.create_time).GroupBy(g => new { g.carry_id, g.material_id, g.code_batch }) + .Select(x => + { + WmsCarryMat? carryMat = x.FirstOrDefault()!; + carryMat.real_qty = x.Sum(d => d.real_qty); + return carryMat; + }) + .ToList(); + await _db.Insertable(carryMats).ExecuteCommandAsync(); + var dic = carryMats.DistinctBy(x => x.carry_id).ToDictionary(x => x.carry_id, x => x.real_qty); + var allOutIds = new List(); + var sortingOutIds = new List(); + foreach (var pair in dic) + { + var codes = carryCodes.FindAll(x => x.carry_id == pair.Key); + if (codes?.Count > 0) + { + if (pair.Value == codes.Sum(d => d.codeqty)) + { + allOutIds.Add(pair.Key); + } + else + { + sortingOutIds.Add(pair.Key); + } + } + } + carryIds = allOutIds.Concat(sortingOutIds).ToList(); + await _db.Updateable().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.全部出).ToString() }).Where(it => allOutIds.Contains(it.id)).ExecuteCommandAsync(); + await _db.Updateable().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.分拣出).ToString() }).Where(it => sortingOutIds.Contains(it.id)).ExecuteCommandAsync(); + } + var carrys = await _db.Queryable().Where(it => carryIds.Contains(it.id)).ToListAsync(); + if (carrys?.Count > 0) + { + List preTasks = new(); + List locIds = new(); + foreach (var carry in carrys) + { + WmsPointH sPoint = null; + WmsPointH ePoint = null; + if (input.data.ContainsKey(nameof(WmsPointH.location_id))) + { + sPoint = await _db.Queryable().FirstAsync(it => it.location_id == carry.location_id); + } + if (input.data.ContainsKey(nameof(WmsPointH.location_id)) && input.data[nameof(WmsPointH.location_id)].IsNotEmptyOrNull()) + { + ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); + } + if (sPoint != null && ePoint != null) + { + var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id); + locIds.AddRange(points.Select(x => x.location_id).ToList()!); + //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序） + if (points?.Count > 0) + { + if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500); + var curPreTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it => + { + var sPoint = it.FirstOrDefault(); + var ePoint = it.LastOrDefault(); + + WmsPretaskH preTask = new(); + preTask.org_id = _userManager.User.OrganizeId; + preTask.startlocation_id = sPoint?.location_id; + preTask.startlocation_code = sPoint?.location_code; + preTask.endlocation_id = ePoint?.location_id; + preTask.endlocation_code = ePoint?.location_code; + preTask.start_floor = sPoint?.floor.ToString(); + preTask.end_floor = ePoint?.floor.ToString(); + preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(); + preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID; + preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSOUTSTOCK_ID; + preTask.task_type = WmsWareHouseConst.WMS_PRETASK_OUTSTOCK_TYPE_ID; + preTask.carry_id = carry.id; + preTask.carry_code = carry.carry_code; + preTask.area_id = sPoint?.area_id!; + preTask.area_code = it.Key; + preTask.require_id = input.data["ReturnIdentity"].ToString(); + preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!; + preTask.create_id = _userManager.UserId; + preTask.create_time = DateTime.Now; + return preTask; + }).ToList(); + if (loc.is_sign == 0) + { + curPreTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值 + } + preTasks.AddRange(curPreTasks); + + } + } + } + var isOk = await _wareHouseService.GenPreTask(preTasks, null); + GenPreTaskUpInput genPreTaskAfterUpInput = new(); + genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList(); + genPreTaskAfterUpInput.LocationIds = new HashSet(locIds).ToList(); + await _wareHouseService.GenInStockTaskHandleAfter(genPreTaskAfterUpInput, it => new WmsCarryH { is_lock = 1 }, it => new BasLocation { is_lock = 1 }); + } + } + else throw new AppFriendlyException($"请输入物料明细", 500); + + + } + + await _db.Ado.CommitTranAsync(); + } + catch (Exception) + { + await _db.Ado.RollbackTranAsync(); + throw; + } + return Task.FromResult(true); + } + + /// + /// 根据出库申请单ID获取申请单明细信息 + /// + /// + /// + [HttpGet] + public async Task GetInStockDetailsListById([FromRoute] string billId) + { + var dic = await _dictionaryDataService.GetDictionaryByTypeId(WmsWareHouseConst.WMS_INSTOCK_D_BILL_STATUS_TYPEID); + var items = await _db.Queryable().Where(it => it.bill_id == billId).ToListAsync(); + _db.ThenMapper(items, + it => it.line_status = dic.ContainsKey(it.line_status) ? dic[it.line_status]?.ToString()! : ""); + return items; + } + } +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs index 29a800fc..7e8adfa2 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs @@ -78,9 +78,9 @@ namespace Tnb.WarehouseMgr var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput); WmsPointH sPoint = null; WmsPointH ePoint = null; - if (input.data.ContainsKey(nameof(WmsPointH.location_id))) + if (input.data.ContainsKey(nameof(WmsHandleH.startlocation_id))) { - sPoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); + sPoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsHandleH.startlocation_id)].ToString()); } if (endLocations?.Count > 0) { @@ -149,7 +149,7 @@ namespace Tnb.WarehouseMgr var requireCodeField = "require_code"; var preTaskUpInput = new GenPreTaskUpInput(); - preTaskUpInput.RquireId = input.data["ReturnIdentity"].ToString(); + preTaskUpInput.RquireId = input.data[nameof(WmsHandleH.require_id)].ToString(); preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!; preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; @@ -200,7 +200,22 @@ namespace Tnb.WarehouseMgr var instockDetails = await _db.Queryable() .Where(b => b.bill_id == input.data[requireIdField].ToString()) .ToListAsync(); + //var instockProps = typeof(WmsInstockD).GetProperties().Select(p => p.Name).ToList(); + //var instockCodeProps = typeof(WmsInstockCode).GetProperties().Select(p => p.Name).ToList(); + //var ssss = instockCodeProps.Intersect(instockProps).ToList(); + //var instockTypes = typeof(WmsInstockD).GetProperties().Where(p => ssss.Contains(p.Name)).Select(p => p.PropertyType.Name).ToList(); + //var instockCodeTypes = typeof(WmsInstockCode).GetProperties().Where(p => ssss.Contains(p.Name)).Select(p => p.PropertyType.Name).ToList(); + //var dddf = instockTypes.Except(instockCodeTypes).ToList(); + //var ddd = instockDetails[0].Adapt(); + + //org_id,bill_id,line_status,material_id,material_code,code_batch,unit_id,unit_code,source_id, + // source_code,source_type,source_line,source_detail_id,remark,extras,time_stamp,create_id, + // create_time,modify_id,modify_time,mo_code,mo_line,mo_bom_detail_id,id + + + var items = instockDetails.Adapt>(); + items.ForEach(it => it.org_id = _userManager.User.OrganizeId); List instockCOdes = new(); jArr = JArray.Parse(input.data["tablefield115"].ToString()!); if (jArr?.Children().Count() > 0) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs index 8837d7a4..21a86831 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs @@ -141,7 +141,7 @@ namespace Tnb.WarehouseMgr handleH.create_time = DateTime.Now; preTaskUpInput.PreTaskRecord = handleH; //根据载具移入Id，回更单据状态 - await _db.Updateable().SetColumns(it => new WmsInbale { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync(); + await _db.Updateable().SetColumns(it => new WmsInbale { status = WmsWareHouseConst.BILLSTATUS_ON_ID}).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync(); await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput, it => new WmsCarryH { is_lock = 1, location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode, carry_status= ((int)EnumCarryStatus.寄存).ToString() },