From 97c0e96b86890d5d9ff50baabee01091b3cdd003 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 18 Jul 2023 14:12:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9C=80=E7=BB=88=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E5=BA=93=E4=BD=8D=E6=98=AF=E5=90=A6=E5=8F=AF=E6=94=BE?= =?UTF-8?q?=E7=BD=AE=E5=BD=93=E5=89=8D=E8=BD=BD=E5=85=B7=EF=BC=8C=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E5=87=BD=E6=95=B0=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs | 6 +----- .../Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs index aa747ad7..aad43cdd 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs @@ -60,17 +60,13 @@ namespace Tnb.WarehouseMgr protected Task IsCarryAndLocationMatchByCarryStd(WmsCarryH carry, BasLocation locDest) { bool isMatch = false; - string errMessage = string.Empty; if (carry == null) throw new ArgumentNullException(nameof(carry)); if (locDest == null) throw new ArgumentNullException(nameof(locDest)); if (!carry.carrystd_id.IsNullOrEmpty() && !locDest.carrystd_id.IsNullOrEmpty()) { var jsonArr = JArray.Parse(locDest.carrystd_id); var locCarryStdArr = jsonArr.Select(x => x.ToObject()).ToArray(); - if (locCarryStdArr.Contains(carry.carrystd_id)) - { - isMatch = true; - } + isMatch = locCarryStdArr.Contains(carry.carrystd_id); } return Task.FromResult(isMatch); } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs index b2f14243..1eb351ca 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs @@ -71,8 +71,7 @@ namespace Tnb.WarehouseMgr VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTKPDA_ID, true); await _runService.Create(templateEntity, input); //出库取起点 - WmsPointH? sPoint = null; - WmsPointH? ePoint = null; + WmsPointH? sPoint = null, ePoint = null; if (input.data.ContainsKey(nameof(WmsPointH.location_id))) { ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString());