WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -4323,7 +4323,7 @@ } string sql1 = "select * from h_v_Gy_CusType where 1 = 1"; string sql = sql1 + sWhere + " order by 客户分类代码 "; string sql = sql1 + sWhere + " order by HNumber "; ds = oCN.RunProcReturn(sql, "h_v_Gy_CusType"); //添加列名 WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -281,7 +281,7 @@ } string HNumber = ds.Tables[0].Rows[0]["客户代码"].ToString(); // 使用正则表达式找到数字部分 (?<=\D)是一个零宽断言,表示前面的字符不是数字 (\d+)$表示后面跟着一连串字符串知道末尾 Match match = Regex.Match(HNumber, @"(?<=\D)(\d+)$"); Match match = Regex.Match(HNumber, @"(\d+)$"); if (match.Success) { string prefix = HNumber.Substring(0, HNumber.Length - match.Length); // 提取前缀 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -79,7 +79,7 @@ objJsonResult.data = null; return objJsonResult; } string sql1 = string.Format(@"select * from h_v_Gy_MaterialList where 组织名称='" + Organization + "'"); string sql1 = string.Format(@"select top(500) * from h_v_Gy_MaterialList where 组织名称='" + Organization + "'"); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn(sql1 + sWhere + " order by 物料代码 desc", "h_v_Gy_MaterialList"); WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
@@ -4,7 +4,7 @@ --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <History>True|2024-08-21T08:09:41.0487181Z;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History> <History>True|2024-08-29T08:18:43.7085548Z;True|2024-08-29T14:43:01.6752088+08:00;False|2024-08-29T14:42:40.1350706+08:00;True|2024-08-28T21:59:53.4221652+08:00;True|2024-08-28T21:22:29.9693901+08:00;True|2024-08-28T20:03:40.6232218+08:00;False|2024-08-28T20:03:22.6322413+08:00;True|2024-08-28T13:06:07.4432568+08:00;False|2024-08-28T13:04:04.1198464+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History> <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl> </PropertyGroup> <ItemGroup> @@ -45,28 +45,28 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>08/19/2024 08:51:07</publishTime> <publishTime>08/29/2024 14:42:53</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>08/19/2024 08:51:07</publishTime> <publishTime>08/29/2024 14:42:53</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>08/19/2024 08:50:56</publishTime> <publishTime>08/29/2024 14:42:51</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>08/19/2024 08:50:56</publishTime> <publishTime>08/29/2024 14:42:51</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>08/19/2024 08:50:48</publishTime> <publishTime>08/29/2024 14:42:47</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>08/19/2024 08:50:48</publishTime> <publishTime>08/29/2024 14:42:47</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> @@ -111,10 +111,10 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>08/19/2024 08:50:49</publishTime> <publishTime>08/29/2024 14:42:48</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>08/19/2024 08:50:49</publishTime> <publishTime>08/29/2024 14:42:48</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>04/06/2023 15:57:02</publishTime> @@ -147,25 +147,25 @@ <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>08/19/2024 08:50:45</publishTime> <publishTime>08/29/2024 14:42:46</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>08/19/2024 08:50:45</publishTime> <publishTime>08/29/2024 14:42:46</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>08/19/2024 08:50:46</publishTime> <publishTime>08/29/2024 14:42:46</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>08/19/2024 08:50:46</publishTime> <publishTime>08/29/2024 14:42:46</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>08/19/2024 08:50:47</publishTime> <publishTime>08/29/2024 14:42:46</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>08/19/2024 08:50:47</publishTime> <publishTime>08/29/2024 14:42:46</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> @@ -279,19 +279,19 @@ <publishTime>05/09/2023 10:43:40</publishTime> </File> <File Include="bin/TopSdk.dll"> <publishTime>08/21/2024 16:07:09</publishTime> <publishTime>08/29/2024 16:17:15</publishTime> </File> <File Include="bin/TopSdk.pdb"> <publishTime>08/21/2024 16:07:09</publishTime> <publishTime>08/29/2024 16:17:15</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>08/21/2024 16:09:38</publishTime> <publishTime>08/29/2024 16:18:41</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>08/21/2024 16:09:38</publishTime> <publishTime>08/29/2024 16:18:41</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> @@ -486,7 +486,7 @@ <publishTime>05/06/2024 13:47:57</publishTime> </File> <File Include="Web.config"> <publishTime>08/21/2024 14:50:10</publishTime> <publishTime>08/28/2024 13:06:06</publishTime> </File> </ItemGroup> </Project> WebAPI/Web.config
@@ -8,10 +8,10 @@ <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> </sectionGroup> </configSections> <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> </sectionGroup> </configSections> <connectionStrings> <add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" /> @@ -22,7 +22,8 @@ <!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>--> <!--<add key="FileIP" value="http://localhost:8080/" />--> <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> --> <!--<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx"/>--><!--颜台式机--> <!--<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx"/>--> <!--颜台式机--> <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 夏宝--> <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> --> <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 博日科技--> @@ -32,13 +33,20 @@ <!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS/WebService1.asmx"/> 安瑞服务器--> <!--<add key="sUrl" value="http://122.227.133.186:8090/WEBS/WebService1.asmx"/> --> <!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS-WMS/WebService1.asmx"/> 安瑞服务器--> <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--测试服务器--> <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--测试服务器--> <!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> 本地--> <!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--陈雯静本地配置--> <add key="surl" value="http://localhost/webs-web/webservice1.asmx"/> <!--翁涛涛本地配置--> <!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--陈雯静本地配置--> <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx"/> --> <!--翁涛涛本地配置--> <!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>九菱--> <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--斯莫尔--> <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--> <!--斯莫尔--> <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" />--> <!--乔一--> <add key="sUrl" value="http://10.10.1.2:8090/WEBS-WMS/WebService1.asmx" /> <add key="webpages:Version" value="3.0.0.0" /> <add key="webpages:Enabled" value="false" /> <add key="ClientValidationEnabled" value="true" /> @@ -106,15 +114,15 @@ </basicHttpBinding> </bindings> <client> <endpoint address="http://192.168.0.11/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" /> <endpoint address="http://10.10.1.2:8090/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" /> </client> </system.serviceModel> <applicationSettings> <WebAPI.Properties.Settings> <setting name="WebAPI_WebS_WebService1" serializeAs="String"> <value>http://192.168.0.11/WEBS-WMS/WebService1.asmx</value> </setting> </WebAPI.Properties.Settings> </applicationSettings> </configuration> <applicationSettings> <WebAPI.Properties.Settings> <setting name="WebAPI_WebS_WebService1" serializeAs="String"> <value>http://10.10.1.2:8090/WEBS-WMS/WebService1.asmx</value> </setting> </WebAPI.Properties.Settings> </applicationSettings> </configuration> <!--ProjectGuid: 5B60CE0C-963C-4DC2-91B3-0B471AAC5438--> sdk_dingding/TopSdk/bin/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cacheBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cacheBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,30 +1,6 @@ D:\网站发布\测试\钉钉测试\测试项目2\sdk_dingding\topSDK\bin\Debug\TopSdk.dll D:\网站发布\测试\钉钉测试\测试项目2\sdk_dingding\topSDK\bin\Debug\TopSdk.pdb D:\网站发布\测试\钉钉测试\测试项目2\sdk_dingding\topSDK\obj\Debug\TopSdk.csproj.AssemblyReference.cache D:\网站发布\测试\钉钉测试\测试项目2\sdk_dingding\topSDK\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache D:\网站发布\测试\钉钉测试\测试项目2\sdk_dingding\topSDK\obj\Debug\TopSdk.dll D:\网站发布\测试\钉钉测试\测试项目2\sdk_dingding\topSDK\obj\Debug\TopSdk.pdb D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb <<<<<<< HEAD D:\vs\项目代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll D:\vs\项目代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb D:\vs\项目代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache D:\vs\项目代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll D:\vs\项目代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb D:\vs\项目代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache ======= D:\智云LMes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll D:\智云LMes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb D:\智云LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache D:\智云LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll D:\智云LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb >>>>>>> 5c681da4317f7267921689c0015a89d07dffdc23 D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache sdk_dingding/TopSdk/obj/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cacheBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
File was deleted sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
File was deleted sdk_dingding/TopSdk/obj/Release/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.pdbBinary files differ