From 5a050022e38f453fe056131b91a55541880d10c0 Mon Sep 17 00:00:00 2001
From: FanLian <fanlian2@163.com>
Date: Fri, 21 Jul 2023 16:55:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=BD=E5=85=B7=E6=9F=A5=E8=AF=A2=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tnb.WarehouseMgr/WmsCarryQueryService.cs    | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
index 2fb2cf42..d5a58f81 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Dynamic;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Text;
 using System.Threading.Tasks;
 using Aop.Api.Domain;
@@ -11,6 +12,7 @@ using Mapster;
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
 using Tnb.WarehouseMgr.Entities;
+using Tnb.WarehouseMgr.Entities.Consts;
 using Tnb.WarehouseMgr.Entities.Dto;
 using Tnb.WarehouseMgr.Entities.Dto.Inputs;
 using Tnb.WarehouseMgr.Entities.Dto.Outputs;
@@ -67,9 +69,18 @@ namespace Tnb.WarehouseMgr
             try
             {
                 var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.carry_code == input.carry_code);
-                var carryDs = await _db.Queryable<WmsCarryD>().Where(it => it.carry_id == carry.id).ToListAsync();
-                var mCarryIds = carryDs.Select(x=>x.membercarry_id).ToList();
-                var carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => mCarryIds.Contains(it.carry_id)).ToListAsync();
+                List<WmsCarryCode> carryCodes = new(); 
+                if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID)
+                {
+                    var carryDs = await _db.Queryable<WmsCarryD>().Where(it => it.carry_id == carry.id).ToListAsync();
+                    var mCarryIds = carryDs.Select(x => x.membercarry_id).ToList();
+                    carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => mCarryIds.Contains(it.carry_id)).ToListAsync();
+                }
+                else
+                {
+                    carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carry.id).ToListAsync();
+                }
+               
                 data = carry.Adapt<CarryQueryOutput>();
                 data.wmsCarryCodes = carryCodes.Adapt<List<CarryCodeQueryOutput>>();