From 8ac457c3393049533f11d9b05962b3a05b5376f6 Mon Sep 17 00:00:00 2001 From: FanLian Date: Fri, 21 Jul 2023 14:54:43 +0800 Subject: [PATCH] 1 --- .../Tnb.WarehouseMgr/WmskittingOutService.cs | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs index 4f4ad195..35b71c63 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs @@ -341,11 +341,21 @@ namespace Tnb.WarehouseMgr if (input.IsNull()) throw new ArgumentNullException(nameof(input)); try { - var kittingOut = input[^1]; - var curCarry = await _db.Queryable().SingleAsync(it => it.id == kittingOut.carry_id); - var endLocation = await _db.Queryable().SingleAsync(it => it.id == kittingOut.location_id); - var isMatch = await IsCarryAndLocationMatchByCarryStd(curCarry, endLocation); - if (!isMatch) throw new AppFriendlyException("该载具无法放置到目标库位", 500); + //var kittingOut = input[^1]; + //if ((!kittingOut.carry_id.IsNullOrEmpty() || !kittingOut.carry_code.IsNullOrEmpty()) && !kittingOut.location_code.IsNullOrEmpty()) + //{ + // WmsCarryH? curCarry = null; + // if (!kittingOut.carry_id.IsNullOrEmpty()) + // curCarry = await _db.Queryable().SingleAsync(it => it.id == kittingOut.carry_id); + // else + // curCarry = await _db.Queryable().FirstAsync(it => it.carry_code == kittingOut.carry_code); + + // var endLocation = await _db.Queryable().SingleAsync(it => it.id == kittingOut.location_code); + // var isMatch = await IsCarryAndLocationMatchByCarryStd(curCarry, endLocation); + // if (!isMatch) throw new AppFriendlyException("该载具无法放置到目标库位", 500); + + //} + await _db.Ado.BeginTranAsync(); List kittingOutDs = new();