From 7fefc6426af696874fe645fb12c4f6dda01d7458 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Fri, 22 Nov 2024 13:33:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2      | Bin 277406 -> 277406 bytes
 .../Services/Public/ErpService.cs             |   4 +--
 .../OutStockTaskRepositories.cs               |  28 +++++++++---------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index 4d07dc2ffa20ad6bba8af91c72a80579ef88486b..91a0ff5cafd8dd9ec32d58309cf654c72c21cafc 100644
GIT binary patch
delta 169
zcmWN}F%^SA3;@tV5rC9Sa(5&<Q#S?#gv&)oH#Q`oqVHj$3UE*jtmO;%`_=DP|Nb<u
zX(Uxi4pyt?C=lF>=LFS=;!q$_#-JK&K~k?sCPQ+A6rC0p#z%{=Zc}q?Q`>bTQ6Nuj
t(Mn+~McgRdC4pqoA%~?VV*~~zjwrzp&4oE54H5F)#r2%q<D8%0-yh1oF?0X`

delta 169
zcmWN}u@S;B3_wu`43JSQ*_Nz66<rDjkSu!+x^x*KQ*f6Rm>?T411;(Q``d5ae&g$X
zeaus0jLh02J7lSD1hrvS0!zJ$8d47lxI~vkH3>*4p#Y}Hc#6vad0FS{zRtt_K9wp$
uX6D7?nTa@{w&L1U(JZSwvJ-WKp0KI0OH>L-+;VB{+?C~c4*T)EeZGHF4l&^X

diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index afb41c06..f6358873 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -1993,7 +1993,7 @@ namespace WMS.Web.Domain.Services.Public
                 //3.获取金蝶采购订单：拼接参数和条件
                 var query = new ErpBillQueryDto(token_result.Data);
                 var param = new ErpBillQueryParamDto(FormIdParam.STK_TransferDirect.ToString());
-                param.FieldKeys = "FBillNo,'',FStockOutOrgId,FStockOrgId,FMaterialID.FNumber,FSrcStockId.FNumber,FSrcStockLocId,FQty,FNoteEntry,FCreateDate,FBillEntry_FEntryID,FStockOutOrgId.FNumber,FDestStockId.FNumber";
+                param.FieldKeys = "FBillNo,'',FStockOutOrgId,FStockOrgId,FMaterialID.FNumber,FSrcStockId.FNumber,FSrcStockLocId,FQty,FNoteEntry,FCreateDate,FBillEntry_FEntryID,FStockOutOrgId.FNumber,FDestStockId.FName";
                 param.Limit = 10000;
                 //查询条件：备注其中的条件值以金蝶的值为准！！！
                 //1.创建时间在两天前和当天时间之间
@@ -2094,7 +2094,7 @@ namespace WMS.Web.Domain.Services.Public
                 //3.获取金蝶采购订单：拼接参数和条件
                 var query = new ErpBillQueryDto(token_result.Data);
                 var param = new ErpBillQueryParamDto(FormIdParam.STK_TRANSFEROUT.ToString());
-                param.FieldKeys = "FBillNo,'',FStockOrgID,FStockInOrgID,FMaterialID.FNumber,FSrcStockID.FNumber,FSrcStockLocId,FQty,FEntryNote,FCreateDate,FSTKTRSOUTENTRY_FEntryID,FStockOrgID.FNumber,FDestStockID.FNumber";
+                param.FieldKeys = "FBillNo,'',FStockOrgID,FStockInOrgID,FMaterialID.FNumber,FSrcStockID.FNumber,FSrcStockLocId,FQty,FEntryNote,FCreateDate,FSTKTRSOUTENTRY_FEntryID,FStockOrgID.FNumber,FDestStockID.FName";
                 param.Limit = 10000;
                 //查询条件：备注其中的条件值以金蝶的值为准！！！
                 //1.创建时间在两天前和当天时间之间
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index 909ee554..1a1c28e9 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -283,11 +283,11 @@ namespace WMS.Web.Repositories
                 customers = customer_result.Data.ToList();
 
             List<string> stocks = new List<string>();
-            if (!string.IsNullOrEmpty(dto.InStock))
-            {
-                //var r = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), dto.InStock, companyId);
-                stocks = GetStockCodes(dto.InStock, companyId);
-            }
+            //if (!string.IsNullOrEmpty(dto.InStock))
+            //{
+            //    //var r = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), dto.InStock, companyId);
+            //    stocks = GetStockCodes(dto.InStock, companyId);
+            //}
 
             List<int> taskIds = null;
             List<int> taskIds_s = new List<int>();
@@ -360,7 +360,7 @@ namespace WMS.Web.Repositories
             }
             if (!string.IsNullOrEmpty(dto.InStock))
             {
-                query = query.Where(w => w.detail.ErpDetails.Where(w => stocks.Contains(w.InStockCode)).Any());
+                query = query.Where(w => w.detail.ErpDetails.Where(w => EF.Functions.Like(w.InStockCode, "%" + dto.InStock + "%")).Any());
             }
             //组装
             int total = await query.CountAsync();
@@ -624,14 +624,14 @@ namespace WMS.Web.Repositories
         {
             var list = codes.Where(w => w != null).ToList();
             if (list.Count() == 0) return "";
-            List<string> names = new List<string>();
-            foreach (var c in list)
-            {
-                var name = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, c + orgCode);
-                names.Add(name);
-            }
-            if (names.Count() == 0) return "";
-            return string.Join(",", names);
+            //List<string> names = new List<string>();
+            //foreach (var c in list)
+            //{
+            //    var name = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, c + orgCode);
+            //    names.Add(name);
+            //}
+            //if (names.Count() == 0) return "";
+            return string.Join(",", list);
         }
 
         public List<string> GetStockCodes(string name, int companyId)