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) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs index 6cb7f10d..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,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);