From 1555b03b6dc20d5c54fa138789197691105ada12 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Wed, 8 Nov 2023 11:32:04 +0800
Subject: [PATCH] =?UTF-8?q?erp-=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/Controllers/TestController.cs | 53 ++-----------------
 src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml      |  5 ++
 .../Services/Public/ErpService.cs             |  5 +-
 3 files changed, 11 insertions(+), 52 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index a46d6ea7..320edbae 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -56,41 +56,12 @@ namespace WMS.Web.Api.Controllers
 
         [HttpGet]
         [Route("tf")]
-        public async Task<bool> TestTF()
+        public async Task<string> TestTF()
         {
-            var list1 = new List<TT1>();
-            var t1 = new TT1();
-            t1.Id = 1;
-            t1.Qty = 5;
-            var t2 = new TT1();
-            t2.Id = 2;
-            t2.Qty = 9;
-            var t3 = new TT1();
-            t3.Id = 3;
-            t3.Qty = 9;
-            list1.Add(t1);
-            list1.Add(t2);
-            list1.Add(t3);
-
-            var list2 = new List<TT2>();
-            var a1 = new TT2();
-            a1.Id = 1;
-            a1.Qty = 5;
-            var a2 = new TT2();
-            a2.Id = 2;
-            a2.Qty = 9;
-            var a3 = new TT2();
-            a3.Id = 4;
-            a3.Qty = 9;
-            list2.Add(a1);
-            list2.Add(a2);
-            list2.Add(a3);
-
-
-
-            //3.比对
-            bool isRight = list2.All(x => list1.Any(t => t.Id == x.Id && t.Qty == x.Qty)) && list2.Count == list1.Count;
-            return isRight;
+            var result = await this._erpService.BillQueryForOrg();
+            if (!result.IsSuccess)
+                return "";
+            return JsonConvert.SerializeObject(result.Data);
         }
 
 
@@ -120,18 +91,4 @@ namespace WMS.Web.Api.Controllers
 
         }
     }
-
-    public class TT1 
-    {
-        public int Id { get; set; }
-
-        public decimal Qty { get; set; }
-    }
-
-    public class TT2 
-    {
-        public int Id { get; set; }
-
-        public decimal Qty { get; set; }
-    }
 }
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index ce782f00..d1952857 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -625,6 +625,11 @@
             Id
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.Org.ErpOrgDto.Number">
+            <summary>
+            编码
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.Erp.Org.ErpOrgDto.Name">
             <summary>
             名称
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index 5054522f..e9c691c0 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -275,10 +275,7 @@ namespace WMS.Web.Domain.Services.Public
                     param.FieldKeys = "FOrgID,FNumber,FName";
                     param.Limit = 10000;
                     //查询条件：备注其中的条件值以金蝶的值为准！！！
-                    //1.审核状态：已审核
-                    //2.禁用状态：A否，B是
-                    //3.使用组织：只查询“深圳市元创时代科技有限公司”这个组织；组织ID=100008--固定值查询（测试端和正式是一样的）
-                    param.FilterString = "FOrgID=100008";
+                    param.FilterString = "";
 
                     //备注：因为组织数据不是很多，就不能和获取物料一样循环获取；组织这里就获取10000条数据就行了
                     var beginTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");