From f4814f9af286936fa7ea91a7982106b6420a5d75 Mon Sep 17 00:00:00 2001 From: FanLian Date: Mon, 31 Jul 2023 11:16:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8A=A5=E9=94=99=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs index 585b20b2..ac88c0a9 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs @@ -69,8 +69,8 @@ namespace Tnb.WarehouseMgr var data = new CarryQueryOutput(); try { - var carry = await _db.Queryable().SingleAsync(it => it.carry_code == input.carry_code); - if (carry.IsNull()) throw new AppFriendlyException($"编号{input.carry_code},对应载具不存在", 500); + var carry = await _db.Queryable().SingleAsync(it => it.carry_code == input.carry_code && it.status == 1); + if (carry.IsNull()) throw new AppFriendlyException($"编号{input.carry_code},对应载具不存在或被禁用", 500); List carryCodes = new(); var carryDsLst = await _db.Queryable().Where(it => it.carry_id == carry.id).ToListAsync(); if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID && carryDsLst?.Count > 0) From ca4e4c34e17d91ca9ff73e099b9bc695df8483ca Mon Sep 17 00:00:00 2001 From: FanLian Date: Mon, 31 Jul 2023 11:36:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E6=9C=89carry=5Fcode=E7=9A=84=E6=98=A0=E5=B0=84=EF=BC=8C?= =?UTF-8?q?=E5=B0=86carry=5Fid=E6=98=A0=E5=B0=84=E6=88=90carry=5Fcode?= =?UTF-8?q?=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs index 6cb7f10d..91ea0b17 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs @@ -132,6 +132,7 @@ namespace Tnb.WarehouseMgr var isSuccessFul = false; if (input.IsNull()) throw new ArgumentNullException("input"); var signInput = input.Adapt(); + if(signInput.carryId.IsNotEmptyOrNull()) signInput.carryId = ""; try { await SignForDelivery(signInput); From b79ce73d427a2ec180b97fcfb34df038679533fe Mon Sep 17 00:00:00 2001 From: FanLian Date: Mon, 31 Jul 2023 11:39:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs index 91ea0b17..1281bcf7 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs @@ -104,7 +104,7 @@ namespace Tnb.WarehouseMgr loginType = "web", bizTypeId = disTask.biz_type, requireId = disTask!.require_id!, - carryIds = new List { input.carryId }, + carryIds = new List { carry!.id }, distaskCodes = input.distaskCodes }; await DoUpdate(upInput); //回更业务 @@ -132,7 +132,7 @@ namespace Tnb.WarehouseMgr var isSuccessFul = false; if (input.IsNull()) throw new ArgumentNullException("input"); var signInput = input.Adapt(); - if(signInput.carryId.IsNotEmptyOrNull()) signInput.carryId = ""; + if (signInput.carryId.IsNotEmptyOrNull()) signInput.carryId = ""; try { await SignForDelivery(signInput);