From b1ecd60999b19a6e70f4934dc9240aba3da2236c Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 30 八月 2024 15:17:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 BLL/bin/Release/DAL.dll                                          |    0 
 BLL/bin/Release/BLL.pdb                                          |    0 
 WebAPI/WebAPI.csproj.user                                        |    4 
 WebAPI/Controllers/WebAPIController.cs                           |   40 +++
 WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs              |    5 
 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache   |    0 
 DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache    |    0 
 SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache   |    0 
 DAL/bin/Release/DAL.pdb                                          |    0 
 DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache |    0 
 WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user     |  495 +++++++++++++++++++++++++++++++++++++++++++++++++
 BLL/bin/Release/BLL.dll                                          |    0 
 BLL/bin/Release/DAL.pdb                                          |    0 
 WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml          |   16 +
 DAL/bin/Release/DAL.dll                                          |    0 
 WebAPI/Controllers/GG_NoticeController.cs                        |    5 
 16 files changed, 554 insertions(+), 11 deletions(-)

diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index 2306d28..19e3705 100644
--- a/BLL/bin/Release/BLL.dll
+++ b/BLL/bin/Release/BLL.dll
Binary files differ
diff --git a/BLL/bin/Release/BLL.pdb b/BLL/bin/Release/BLL.pdb
index 8bd8c26..8d4a81a 100644
--- a/BLL/bin/Release/BLL.pdb
+++ b/BLL/bin/Release/BLL.pdb
Binary files differ
diff --git a/BLL/bin/Release/DAL.dll b/BLL/bin/Release/DAL.dll
index 04d91fd..96ab31f 100644
--- a/BLL/bin/Release/DAL.dll
+++ b/BLL/bin/Release/DAL.dll
Binary files differ
diff --git a/BLL/bin/Release/DAL.pdb b/BLL/bin/Release/DAL.pdb
index 245c15e..084e842 100644
--- a/BLL/bin/Release/DAL.pdb
+++ b/BLL/bin/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index 04d91fd..96ab31f 100644
--- a/DAL/bin/Release/DAL.dll
+++ b/DAL/bin/Release/DAL.dll
Binary files differ
diff --git a/DAL/bin/Release/DAL.pdb b/DAL/bin/Release/DAL.pdb
index 245c15e..084e842 100644
--- a/DAL/bin/Release/DAL.pdb
+++ b/DAL/bin/Release/DAL.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index 65345fe..c3344a0 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
index ea6d1a1..98e059f 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index 57d78b9..873cd9b 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
index 79ab06b..f6a06ef 100644
--- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 08f77ae..2c0a528 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -23,10 +23,7 @@
         SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
         DataSet ds;
 
-
-
-
-        /// <summary>
+    /// <summary>
         /// 杩斿洖閲囪喘璁㈠崟鍒楄〃
         ///鍙傛暟锛歴tring sql銆�
         ///杩斿洖鍊硷細object銆�
diff --git a/WebAPI/Controllers/GG_NoticeController.cs b/WebAPI/Controllers/GG_NoticeController.cs
index 0753af0..35c2687 100644
--- a/WebAPI/Controllers/GG_NoticeController.cs
+++ b/WebAPI/Controllers/GG_NoticeController.cs
@@ -318,8 +318,9 @@
             try
             {
                 List<object> columnNameList = new List<object>();
-                var sql = "select top(10) m.HMakeDate as 鏃ユ湡, m.HLevel as 绱ф�ョ▼搴�, m.HContext as 涓婚 " +
-                           " , m.HSendMan as 鍙戦�佷汉, s.HReceiveMan as 鎺ユ敹浜�, d.HName as 鍙戦�侀儴闂� " +
+                var sql = "select top(10) m.HMakeDate as 鏃ユ湡, m.HLevel as 鐘跺喌, m.HContext as 涓婚 " +
+                           ", m.HContext as 鍐呭" +
+                           ", m.HSendMan as 鍙戦�佷汉, s.HReceiveMan as 鎺ユ敹浜�, d.HName as 鍙戦�侀儴闂� " +
                            " from OA_InformBillMain as m" +
                            " inner join OA_InformBillSub as s on m.HInterID = s.HInterID" +
                            " left join Gy_Department d on m.HDeptID = d.HItemID" +
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 20913e0..1ad140f 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -11330,12 +11330,46 @@
                 return objjson; ;
             }
         }
-
-
-
         #endregion
 
         /// <summary>
+        /// 鑾峰彇鍩烘湰淇℃伅
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/BaseInfo")]
+        [HttpGet]
+        public object GetBaseInfo()
+        {
+            try
+            {
+                ds = oCN.RunProcReturn("select * from xt_BaseInfo", "xt_BaseInfo");
+                if (ds is null)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }catch(Exception e)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + e.Message;
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+        /// <summary>
         /// 鑾峰彇鑱屽姟鍒楄〃
         /// </summary>
         /// <returns></returns>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml
new file mode 100644
index 0000000..dc87e92
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml
@@ -0,0 +1,16 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>D:\缃戠珯鍙戝竷\API</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
new file mode 100644
index 0000000..3c9172a
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
@@ -0,0 +1,495 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <History>True|2024-08-29T06:09:50.8550254Z;True|2024-08-29T13:49:07.5650071+08:00;False|2024-08-29T13:48:47.9488618+08:00;True|2024-08-28T14:22:07.6272011+08:00;True|2024-08-28T14:17:25.6731515+08:00;False|2024-08-28T14:16:54.5301670+08:00;</History>
+    <_PublishTargetUrl>D:\缃戠珯鍙戝竷\API</_PublishTargetUrl>
+  </PropertyGroup>
+  <ItemGroup>
+    <File Include="apiapp.json">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.EndpointUtil.dll">
+      <publishTime>04/07/2020 16:33:48</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
+      <publishTime>04/25/2023 17:49:04</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.GatewaySpi.dll">
+      <publishTime>07/31/2024 20:50:30</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.OpenApiClient.dll">
+      <publishTime>08/06/2024 18:07:52</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
+      <publishTime>11/22/2022 11:24:18</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
+      <publishTime>08/08/2024 19:43:22</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.TeaUtil.dll">
+      <publishTime>07/15/2024 20:25:56</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.TeaXML.dll">
+      <publishTime>08/03/2022 21:46:08</publishTime>
+    </File>
+    <File Include="bin/Aliyun.Credentials.dll">
+      <publishTime>07/24/2024 10:36:58</publishTime>
+    </File>
+    <File Include="bin/Antlr3.Runtime.dll">
+      <publishTime>02/22/2013 16:43:40</publishTime>
+    </File>
+    <File Include="bin/Antlr3.Runtime.pdb">
+      <publishTime>02/22/2013 16:43:40</publishTime>
+    </File>
+    <File Include="bin/BLL.dll">
+      <publishTime>08/28/2024 14:17:08</publishTime>
+    </File>
+    <File Include="bin/BLL.pdb">
+      <publishTime>08/28/2024 14:17:08</publishTime>
+    </File>
+    <File Include="bin/BouncyCastle.Crypto.dll">
+      <publishTime>12/18/2020 05:32:28</publishTime>
+    </File>
+    <File Include="bin/DAL.dll">
+      <publishTime>08/28/2024 14:17:06</publishTime>
+    </File>
+    <File Include="bin/DAL.pdb">
+      <publishTime>08/28/2024 14:17:06</publishTime>
+    </File>
+    <File Include="bin/Dapper.dll">
+      <publishTime>07/22/2016 22:52:40</publishTime>
+    </File>
+    <File Include="bin/DBUtility.dll">
+      <publishTime>08/23/2024 14:37:15</publishTime>
+    </File>
+    <File Include="bin/DBUtility.pdb">
+      <publishTime>08/23/2024 14:37:15</publishTime>
+    </File>
+    <File Include="bin/Grpc.Core.Api.dll">
+      <publishTime>03/22/2022 13:17:26</publishTime>
+    </File>
+    <File Include="bin/Grpc.Core.Api.pdb">
+      <publishTime>03/19/2022 07:39:42</publishTime>
+    </File>
+    <File Include="bin/Grpc.Core.dll">
+      <publishTime>03/22/2022 13:17:20</publishTime>
+    </File>
+    <File Include="bin/Grpc.Core.pdb">
+      <publishTime>03/19/2022 07:39:48</publishTime>
+    </File>
+    <File Include="bin/grpc_csharp_ext.x64.dll">
+      <publishTime>03/22/2022 13:17:22</publishTime>
+    </File>
+    <File Include="bin/grpc_csharp_ext.x86.dll">
+      <publishTime>03/22/2022 13:17:22</publishTime>
+    </File>
+    <File Include="bin/ICSharpCode.SharpZipLib.dll">
+      <publishTime>05/09/2021 01:08:30</publishTime>
+    </File>
+    <File Include="bin/ICSharpCode.SharpZipLib.pdb">
+      <publishTime>05/09/2021 01:08:30</publishTime>
+    </File>
+    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
+      <publishTime>03/19/2022 07:38:44</publishTime>
+    </File>
+    <File Include="bin/libgrpc_csharp_ext.x64.so">
+      <publishTime>03/19/2022 07:38:42</publishTime>
+    </File>
+    <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
+      <publishTime>03/19/2015 01:02:50</publishTime>
+    </File>
+    <File Include="bin/Microsoft.CSharp.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/Microsoft.Web.Infrastructure.dll">
+      <publishTime>07/25/2012 19:48:56</publishTime>
+    </File>
+    <File Include="bin/Model.dll">
+      <publishTime>08/23/2024 14:37:16</publishTime>
+    </File>
+    <File Include="bin/Model.pdb">
+      <publishTime>08/23/2024 14:37:16</publishTime>
+    </File>
+    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="bin/Newtonsoft.Json.dll">
+      <publishTime>03/08/2023 15:09:56</publishTime>
+    </File>
+    <File Include="bin/NPOI.dll">
+      <publishTime>10/23/2021 09:07:54</publishTime>
+    </File>
+    <File Include="bin/NPOI.OOXML.dll">
+      <publishTime>10/23/2021 09:07:56</publishTime>
+    </File>
+    <File Include="bin/NPOI.OOXML.pdb">
+      <publishTime>10/23/2021 17:07:56</publishTime>
+    </File>
+    <File Include="bin/NPOI.OpenXml4Net.dll">
+      <publishTime>10/23/2021 09:07:54</publishTime>
+    </File>
+    <File Include="bin/NPOI.OpenXml4Net.pdb">
+      <publishTime>10/23/2021 17:07:54</publishTime>
+    </File>
+    <File Include="bin/NPOI.OpenXmlFormats.dll">
+      <publishTime>10/23/2021 09:07:54</publishTime>
+    </File>
+    <File Include="bin/NPOI.OpenXmlFormats.pdb">
+      <publishTime>10/23/2021 17:07:54</publishTime>
+    </File>
+    <File Include="bin/NPOI.pdb">
+      <publishTime>10/23/2021 17:07:54</publishTime>
+    </File>
+    <File Include="bin/Pub_Class.dll">
+      <publishTime>08/23/2024 14:37:13</publishTime>
+    </File>
+    <File Include="bin/Pub_Class.pdb">
+      <publishTime>08/23/2024 14:37:13</publishTime>
+    </File>
+    <File Include="bin/Pub_Control.dll">
+      <publishTime>08/23/2024 14:37:14</publishTime>
+    </File>
+    <File Include="bin/Pub_Control.pdb">
+      <publishTime>08/23/2024 14:37:14</publishTime>
+    </File>
+    <File Include="bin/RestSharp.dll">
+      <publishTime>08/31/2012 06:22:50</publishTime>
+    </File>
+    <File Include="bin/SQLHelper.dll">
+      <publishTime>08/23/2024 14:37:14</publishTime>
+    </File>
+    <File Include="bin/SQLHelper.pdb">
+      <publishTime>08/23/2024 14:37:14</publishTime>
+    </File>
+    <File Include="bin/Swashbuckle.Core.dll">
+      <publishTime>02/16/2015 01:57:08</publishTime>
+    </File>
+    <File Include="bin/System.Buffers.dll">
+      <publishTime>07/19/2017 18:01:28</publishTime>
+    </File>
+    <File Include="bin/System.ComponentModel.DataAnnotations.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Configuration.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Data.DataSetExtensions.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Data.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Drawing.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.EnterpriseServices.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
+      <publishTime>08/19/2014 18:03:34</publishTime>
+    </File>
+    <File Include="bin/System.Memory.dll">
+      <publishTime>04/18/2019 00:24:34</publishTime>
+    </File>
+    <File Include="bin/System.Net.Http.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Net.Http.Extensions.dll">
+      <publishTime>02/20/2015 04:10:46</publishTime>
+    </File>
+    <File Include="bin/System.Net.Http.Formatting.dll">
+      <publishTime>11/28/2018 21:00:36</publishTime>
+    </File>
+    <File Include="bin/System.Net.Http.Primitives.dll">
+      <publishTime>02/20/2015 04:10:46</publishTime>
+    </File>
+    <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
+      <publishTime>09/19/2018 03:38:10</publishTime>
+    </File>
+    <File Include="bin/System.Runtime.Serialization.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.ApplicationServices.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.Cors.dll">
+      <publishTime>11/28/2018 20:58:44</publishTime>
+    </File>
+    <File Include="bin/System.Web.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.DynamicData.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.Entity.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.Extensions.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.Helpers.dll">
+      <publishTime>01/28/2015 12:04:30</publishTime>
+    </File>
+    <File Include="bin/System.Web.Http.Cors.dll">
+      <publishTime>11/28/2018 21:01:26</publishTime>
+    </File>
+    <File Include="bin/System.Web.Http.dll">
+      <publishTime>11/28/2018 21:01:00</publishTime>
+    </File>
+    <File Include="bin/System.Web.Http.WebHost.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="bin/System.Web.Mvc.dll">
+      <publishTime>01/28/2015 12:02:18</publishTime>
+    </File>
+    <File Include="bin/System.Web.Optimization.dll">
+      <publishTime>02/11/2014 23:26:04</publishTime>
+    </File>
+    <File Include="bin/System.Web.Razor.dll">
+      <publishTime>01/28/2015 12:02:32</publishTime>
+    </File>
+    <File Include="bin/System.Web.Services.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.WebPages.Deployment.dll">
+      <publishTime>01/28/2015 12:04:30</publishTime>
+    </File>
+    <File Include="bin/System.Web.WebPages.dll">
+      <publishTime>01/28/2015 12:04:30</publishTime>
+    </File>
+    <File Include="bin/System.Web.WebPages.Razor.dll">
+      <publishTime>01/28/2015 12:04:30</publishTime>
+    </File>
+    <File Include="bin/System.Xml.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Xml.Linq.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/Tea.dll">
+      <publishTime>05/09/2023 10:43:40</publishTime>
+    </File>
+    <File Include="bin/TopSdk.dll">
+      <publishTime>08/23/2024 10:42:15</publishTime>
+    </File>
+    <File Include="bin/TopSdk.pdb">
+      <publishTime>08/23/2024 10:42:15</publishTime>
+    </File>
+    <File Include="bin/WebActivatorEx.dll">
+      <publishTime>11/24/2014 19:18:48</publishTime>
+    </File>
+    <File Include="bin/WebAPI.dll">
+      <publishTime>08/29/2024 13:49:02</publishTime>
+    </File>
+    <File Include="bin/WebAPI.pdb">
+      <publishTime>08/29/2024 13:49:02</publishTime>
+    </File>
+    <File Include="bin/WebAPI.XmlSerializers.dll">
+      <publishTime>08/29/2024 13:49:06</publishTime>
+    </File>
+    <File Include="bin/WebGrease.dll">
+      <publishTime>07/18/2013 01:03:52</publishTime>
+    </File>
+    <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
+      <publishTime>11/29/2018 21:26:02</publishTime>
+    </File>
+    <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
+      <publishTime>11/29/2018 21:26:30</publishTime>
+    </File>
+    <File Include="Config/kdapi.config">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Content/bootstrap.css">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Content/bootstrap.min.css">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Content/Site.css">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="DLL/BLL.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="DLL/DAL.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="DLL/DBUtility.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="DLL/Model.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="DLL/Newtonsoft.Json.Net35.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="DLL/Pub_Class.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="DLL/Pub_Control.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="DLL/SQLHelper.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="fonts/glyphicons-halflings-regular.eot">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="fonts/glyphicons-halflings-regular.svg">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="fonts/glyphicons-halflings-regular.ttf">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="fonts/glyphicons-halflings-regular.woff">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Global.asax">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="grpc_csharp_ext.x64.dll">
+      <publishTime>03/22/2022 13:17:22</publishTime>
+    </File>
+    <File Include="grpc_csharp_ext.x86.dll">
+      <publishTime>03/22/2022 13:17:22</publishTime>
+    </File>
+    <File Include="Index.html">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="libgrpc_csharp_ext.x64.dylib">
+      <publishTime>03/19/2022 07:38:44</publishTime>
+    </File>
+    <File Include="libgrpc_csharp_ext.x64.so">
+      <publishTime>03/19/2022 07:38:42</publishTime>
+    </File>
+    <File Include="libman.json">
+      <publishTime>07/12/2023 08:14:22</publishTime>
+    </File>
+    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="packages.config">
+      <publishTime>08/15/2024 16:27:01</publishTime>
+    </File>
+    <File Include="Views/Scripts/bootstrap.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/bootstrap.min.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery-1.10.2.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery-1.10.2.min.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery-1.10.2.min.map">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery.validate.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery.validate.min.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/modernizr-2.6.2.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Shared/Error.cshtml">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Shared/_Layout.cshtml">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/web.config">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/_ViewStart.cshtml">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/Reference.map">
+      <publishTime>05/06/2024 13:47:58</publishTime>
+    </File>
+    <File Include="Web.config">
+      <publishTime>08/28/2024 14:17:23</publishTime>
+    </File>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index f882051..a3787f9 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,8 +9,8 @@
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
-    <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <NameOfLastUsedPublishProfile>D:\vs\椤圭洰浠g爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

--
Gitblit v1.9.1