diff --git a/InjectionPC/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/InjectionPC/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 7b9bae3..0000000 Binary files a/InjectionPC/obj/Debug/DesignTimeResolveAssemblyReferences.cache and /dev/null differ diff --git a/InjectionPC/obj/Debug/InjectionPC.csproj.CoreCompileInputs.cache b/InjectionPC/obj/Debug/InjectionPC.csproj.CoreCompileInputs.cache deleted file mode 100644 index 01c8f28..0000000 --- a/InjectionPC/obj/Debug/InjectionPC.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -c33a96f6794f88b5bf97066d08bd30b292ae3111 diff --git a/InjectionPC/obj/Debug/InjectionPC.csproj.FileListAbsolute.txt b/InjectionPC/obj/Debug/InjectionPC.csproj.FileListAbsolute.txt deleted file mode 100644 index b8d6c57..0000000 --- a/InjectionPC/obj/Debug/InjectionPC.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,161 +0,0 @@ -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\InjectionPC.exe.config -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\Interop.grdesLib.dll -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\Interop.grproLib.dll -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.csproj.ResolveComReference.cache -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\InjectionPC.exe -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\InjectionPC.pdb -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\GlacialList.dll -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\MESClassLibrary.dll -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\SchTaskExtAPI.dll -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\EntityFramework.dll -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\Newtonsoft.Json.dll -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\MESClassLibrary.pdb -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\EntityFramework.xml -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\zh-Hans\EntityFramework.resources.dll -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.csprojResolveAssemblyReference.cache -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.Form1.resources -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.FrmBarCode.resources -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.FrmDown.resources -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.FrmLogin.resources -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.FrmQuality.resources -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.Properties.Resources.resources -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.csproj.GenerateResource.Cache -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.exe -D:\项目\北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.pdb -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\InjectionPC.exe.config -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\InjectionPC.exe -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\InjectionPC.pdb -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\GlacialList.dll -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\MESClassLibrary.dll -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\SchTaskExtAPI.dll -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\EntityFramework.dll -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\Newtonsoft.Json.dll -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\MESClassLibrary.pdb -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\MESClassLibrary.dll.config -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\EntityFramework.xml -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\zh-Hans\EntityFramework.resources.dll -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.csproj.AssemblyReference.cache -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\Interop.grdesLib.dll -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\Interop.grproLib.dll -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.csproj.ResolveComReference.cache -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.Form1.resources -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.FrmBarCode.resources -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.FrmDown.resources -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.FrmLogin.resources -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.FrmQuality.resources -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.Properties.Resources.resources -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.csproj.GenerateResource.cache -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.csproj.CoreCompileInputs.cache -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.csproj.CopyComplete -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.exe -D:\项目\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.pdb -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\InjectionPC.exe.config -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\InjectionPC.exe -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\InjectionPC.pdb -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\GlacialList.dll -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\MESClassLibrary.dll -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\SchTaskExtAPI.dll -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\EntityFramework.dll -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\Newtonsoft.Json.dll -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\MESClassLibrary.pdb -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\MESClassLibrary.dll.config -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\EntityFramework.xml -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\bin\Debug\zh-Hans\EntityFramework.resources.dll -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.csproj.AssemblyReference.cache -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\Interop.grdesLib.dll -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\Interop.grproLib.dll -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.csproj.ResolveComReference.cache -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.Form1.resources -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.FrmBarCode.resources -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.FrmDown.resources -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.FrmLogin.resources -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.FrmQuality.resources -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.Properties.Resources.resources -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.csproj.GenerateResource.cache -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.csproj.CoreCompileInputs.cache -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.csproj.CopyComplete -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.exe -D:\Project\1、北汽模塑二厂\SVN\Code\InjectionPC\obj\Debug\InjectionPC.pdb -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\bin\Debug\InjectionPC.exe.config -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\bin\Debug\InjectionPC.exe -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\bin\Debug\InjectionPC.pdb -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\bin\Debug\GlacialList.dll -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\bin\Debug\MESClassLibrary.dll -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\bin\Debug\SchTaskExtAPI.dll -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\bin\Debug\EntityFramework.dll -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\bin\Debug\Newtonsoft.Json.dll -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\bin\Debug\MESClassLibrary.pdb -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\bin\Debug\MESClassLibrary.dll.config -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\bin\Debug\EntityFramework.xml -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\bin\Debug\zh-Hans\EntityFramework.resources.dll -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\obj\Debug\InjectionPC.csproj.AssemblyReference.cache -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\obj\Debug\Interop.grdesLib.dll -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\obj\Debug\Interop.grproLib.dll -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\obj\Debug\InjectionPC.csproj.ResolveComReference.cache -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\obj\Debug\InjectionPC.Form1.resources -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\obj\Debug\InjectionPC.FrmBarCode.resources -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\obj\Debug\InjectionPC.FrmDown.resources -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\obj\Debug\InjectionPC.FrmLogin.resources -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\obj\Debug\InjectionPC.FrmQuality.resources -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\obj\Debug\InjectionPC.Properties.Resources.resources -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\obj\Debug\InjectionPC.csproj.GenerateResource.cache -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\obj\Debug\InjectionPC.csproj.CoreCompileInputs.cache -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\obj\Debug\InjectionPC.csproj.CopyComplete -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\obj\Debug\InjectionPC.exe -D:\Project\1、北汽模塑二厂\交给王若兴\Code\InjectionPC\obj\Debug\InjectionPC.pdb -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\bin\Debug\InjectionPC.exe.config -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\bin\Debug\InjectionPC.exe -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\bin\Debug\InjectionPC.pdb -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\bin\Debug\GlacialList.dll -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\bin\Debug\MESClassLibrary.dll -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\bin\Debug\SchTaskExtAPI.dll -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\bin\Debug\EntityFramework.dll -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\bin\Debug\Newtonsoft.Json.dll -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\bin\Debug\MESClassLibrary.pdb -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\bin\Debug\MESClassLibrary.dll.config -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\bin\Debug\EntityFramework.xml -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\bin\Debug\zh-Hans\EntityFramework.resources.dll -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\obj\Debug\InjectionPC.csprojAssemblyReference.cache -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\obj\Debug\Interop.grdesLib.dll -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\obj\Debug\Interop.grproLib.dll -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\obj\Debug\InjectionPC.csproj.ResolveComReference.cache -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\obj\Debug\InjectionPC.Form1.resources -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\obj\Debug\InjectionPC.FrmBarCode.resources -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\obj\Debug\InjectionPC.FrmDown.resources -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\obj\Debug\InjectionPC.FrmLogin.resources -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\obj\Debug\InjectionPC.FrmQuality.resources -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\obj\Debug\InjectionPC.Properties.Resources.resources -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\obj\Debug\InjectionPC.csproj.GenerateResource.cache -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\obj\Debug\InjectionPC.csproj.CopyComplete -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\obj\Debug\InjectionPC.exe -D:\Project\Bmpt清华\二厂代码240514\Code\InjectionPC\obj\Debug\InjectionPC.pdb -D:\Project\SjMes\InjectionPC\bin\Debug\InjectionPC.exe.config -D:\Project\SjMes\InjectionPC\bin\Debug\InjectionPC.exe -D:\Project\SjMes\InjectionPC\bin\Debug\InjectionPC.pdb -D:\Project\SjMes\InjectionPC\bin\Debug\GlacialList.dll -D:\Project\SjMes\InjectionPC\bin\Debug\MESClassLibrary.dll -D:\Project\SjMes\InjectionPC\bin\Debug\SchTaskExtAPI.dll -D:\Project\SjMes\InjectionPC\bin\Debug\EntityFramework.dll -D:\Project\SjMes\InjectionPC\bin\Debug\Newtonsoft.Json.dll -D:\Project\SjMes\InjectionPC\bin\Debug\MESClassLibrary.pdb -D:\Project\SjMes\InjectionPC\bin\Debug\MESClassLibrary.dll.config -D:\Project\SjMes\InjectionPC\bin\Debug\EntityFramework.xml -D:\Project\SjMes\InjectionPC\bin\Debug\zh-Hans\EntityFramework.resources.dll -D:\Project\SjMes\InjectionPC\obj\Debug\Interop.grdesLib.dll -D:\Project\SjMes\InjectionPC\obj\Debug\Interop.grproLib.dll -D:\Project\SjMes\InjectionPC\obj\Debug\InjectionPC.csproj.ResolveComReference.cache -D:\Project\SjMes\InjectionPC\obj\Debug\InjectionPC.Form1.resources -D:\Project\SjMes\InjectionPC\obj\Debug\InjectionPC.FrmBarCode.resources -D:\Project\SjMes\InjectionPC\obj\Debug\InjectionPC.FrmDown.resources -D:\Project\SjMes\InjectionPC\obj\Debug\InjectionPC.FrmLogin.resources -D:\Project\SjMes\InjectionPC\obj\Debug\InjectionPC.FrmQuality.resources -D:\Project\SjMes\InjectionPC\obj\Debug\InjectionPC.Properties.Resources.resources -D:\Project\SjMes\InjectionPC\obj\Debug\InjectionPC.csproj.GenerateResource.cache -D:\Project\SjMes\InjectionPC\obj\Debug\InjectionPC.csproj.CopyComplete -D:\Project\SjMes\InjectionPC\obj\Debug\InjectionPC.exe -D:\Project\SjMes\InjectionPC\obj\Debug\InjectionPC.pdb -D:\Project\SjMes\InjectionPC\bin\Debug\Interop.grproLib.dll -D:\Project\SjMes\InjectionPC\bin\Debug\Report\称重.xlsx -D:\Project\SjMes\InjectionPC\bin\Debug\Report\111 - 副本2.grf -D:\Project\SjMes\InjectionPC\obj\Debug\InjectionPC.csproj.AssemblyReference.cache -D:\Project\SjMes\InjectionPC\obj\Debug\InjectionPC.csproj.CoreCompileInputs.cache diff --git a/InjectionPC/obj/Debug/InjectionPC.csproj.GenerateResource.cache b/InjectionPC/obj/Debug/InjectionPC.csproj.GenerateResource.cache deleted file mode 100644 index bc1a1c0..0000000 Binary files a/InjectionPC/obj/Debug/InjectionPC.csproj.GenerateResource.cache and /dev/null differ diff --git a/InjectionPC/obj/Debug/InjectionPC.csproj.ResolveComReference.cache b/InjectionPC/obj/Debug/InjectionPC.csproj.ResolveComReference.cache deleted file mode 100644 index 9fbeedf..0000000 Binary files a/InjectionPC/obj/Debug/InjectionPC.csproj.ResolveComReference.cache and /dev/null differ diff --git a/InjectionPC/obj/Debug/InjectionPC.pdb b/InjectionPC/obj/Debug/InjectionPC.pdb deleted file mode 100644 index 2b8feab..0000000 Binary files a/InjectionPC/obj/Debug/InjectionPC.pdb and /dev/null differ diff --git a/InjectionPC/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/InjectionPC/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index dda8231..0000000 Binary files a/InjectionPC/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ diff --git a/InjectionPC/obj/Release/InjectionPC.csproj.AssemblyReference.cache b/InjectionPC/obj/Release/InjectionPC.csproj.AssemblyReference.cache deleted file mode 100644 index ebce24b..0000000 Binary files a/InjectionPC/obj/Release/InjectionPC.csproj.AssemblyReference.cache and /dev/null differ diff --git a/InjectionPC/obj/Release/InjectionPC.csproj.ResolveComReference.cache b/InjectionPC/obj/Release/InjectionPC.csproj.ResolveComReference.cache deleted file mode 100644 index c0ad28e..0000000 Binary files a/InjectionPC/obj/Release/InjectionPC.csproj.ResolveComReference.cache and /dev/null differ diff --git a/InjectionPC/obj/Release/InjectionPC.csprojAssemblyReference.cache b/InjectionPC/obj/Release/InjectionPC.csprojAssemblyReference.cache deleted file mode 100644 index 48af90d..0000000 Binary files a/InjectionPC/obj/Release/InjectionPC.csprojAssemblyReference.cache and /dev/null differ diff --git a/WebService/Function.cs b/WebService/Function.cs index 1a23b63..c58fef3 100644 --- a/WebService/Function.cs +++ b/WebService/Function.cs @@ -1034,7 +1034,7 @@ namespace Webservice } } - public static string WMSSprayingReturnNo(string barcode, int isPass, string stcokNo, string partNo, string batchNo) + public static string WMSSprayingReturnNo(string barcode, int isPass, string stcokNo, string partNo, string batchNo,string userName) { JsonModel model = new JsonModel(); model.Result = "0"; @@ -1457,13 +1457,14 @@ namespace Webservice ([ID] ,[barcode] ,[pass] - ,[createTime],paintCode) + ,[createTime],paintCode,UserName) VALUES ((select newid()) ,'" + barcode + @"' ,'" + isPass.ToString() + @"' ,'" + wmsM.CreationTime + @"' ,'" + wmsM.LU_Code + @"' + ,'" + userName + @"' ) "; SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql, null); diff --git a/WebService/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebService/Properties/PublishProfiles/FolderProfile.pubxml.user index 95407a5..7f6ed70 100644 --- a/WebService/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/WebService/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>D:\Output\240709 - True|2024-07-09T03:55:37.0673793Z; + True|2024-07-21T14:03:11.8361812Z;True|2024-07-09T11:55:37.0673793+08:00; @@ -21,13 +21,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 06/20/2019 14:38:48 - 07/05/2024 10:30:41 + 07/19/2024 15:52:41 11/02/2020 10:17:00 - 07/05/2024 10:30:41 + 07/19/2024 15:52:41 08/13/2020 12:43:18 @@ -45,13 +45,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 08/07/2019 13:55:14 - 07/09/2024 11:55:33 + 07/21/2024 22:03:09 - 07/09/2024 11:55:33 + 07/21/2024 22:03:09 - 07/09/2024 11:55:34 + 07/21/2024 22:03:10 06/20/2019 14:38:52 diff --git a/WebService/WMSWebService.asmx.cs b/WebService/WMSWebService.asmx.cs index d8c119e..469eda9 100644 --- a/WebService/WMSWebService.asmx.cs +++ b/WebService/WMSWebService.asmx.cs @@ -85,6 +85,16 @@ namespace Webservice Context.Response.Write(res); } + [WebMethod] + [ScriptMethod(UseHttpGet = true, ResponseFormat = ResponseFormat.Json)] + public string WMSSprayingForAppForTest(string barcode) + { + string errorReason = string.Empty; + WMSSprayingForApp(barcode); + if (string.IsNullOrEmpty(errorReason)) + return "true"; + return errorReason; + } [WebMethod] [ScriptMethod(UseHttpGet = true, ResponseFormat = ResponseFormat.Json)] public string WMSSprayingForCSForTest(string barcode, int isOK) @@ -95,7 +105,6 @@ namespace Webservice return "true"; return errorReason; } - /// /// 调用WMS接口03 /// lx 20190610，wff2022-04-19修改，报废由0变为2 @@ -397,10 +406,15 @@ namespace Webservice res = Function.WMSInterfaceStockIn(barcode, partNo, batchNo, isOK); return res; } - [WebMethod] [ScriptMethod(UseHttpGet = true, ResponseFormat = ResponseFormat.Json)] public void WMSSprayingForAppReturnNo(string barcode) + { + WMSSprayingForAppReturnNo(barcode,"system"); + } + [WebMethod] + [ScriptMethod(UseHttpGet = true, ResponseFormat = ResponseFormat.Json)] + public void WMSSprayingForAppReturnNo(string barcode,string userName) { string errorReason = ""; @@ -418,7 +432,12 @@ namespace Webservice Context.Response.Write(JSONTools.ScriptSerialize>(model)); return; } - + if (string.IsNullOrWhiteSpace(userName)) + { + model.ErrReason = "用户名不能为空"; + Context.Response.Write(JSONTools.ScriptSerialize>(model)); + return; + } string stcokNo = ""; string batchNo = ""; string partNo = ""; @@ -433,7 +452,7 @@ namespace Webservice #endregion LogHelper.WriteSysLogBase("WMS接口：条码：" + barcode + "，开始调入时间：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), MethodBase.GetCurrentMethod().Name); - string res = Function.WMSSprayingReturnNo(barcode, 1, stcokNo, partNo, batchNo); + string res = Function.WMSSprayingReturnNo(barcode, 1, stcokNo, partNo, batchNo,userName); LogHelper.WriteSysLogBase("WMS接口：条码：" + barcode + "，MES返回结果：" + res + "，结束调用时间：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), MethodBase.GetCurrentMethod().Name); Context.Response.Write(res); diff --git a/WebService/Web.config b/WebService/Web.config index 190afa5..42ff6be 100644 --- a/WebService/Web.config +++ b/WebService/Web.config @@ -28,8 +28,8 @@ - - + + diff --git a/WebService/WebService.csproj.user b/WebService/WebService.csproj.user index f8d15a7..84301d4 100644 --- a/WebService/WebService.csproj.user +++ b/WebService/WebService.csproj.user @@ -4,16 +4,23 @@ D:\Project\SjMes\WebService\Properties\PublishProfiles\FolderProfile.pubxml ProjectFiles Debug|Any CPU + true + + + + + + - AppWebservice.asmx + WMSWebService.asmx SpecificPage True False - False + True False diff --git a/WebService/bin/MESClassLibrary.dll b/WebService/bin/MESClassLibrary.dll index f8efc18..b3a6635 100644 Binary files a/WebService/bin/MESClassLibrary.dll and b/WebService/bin/MESClassLibrary.dll differ diff --git a/WebService/bin/Web.config b/WebService/bin/Web.config index 190afa5..42ff6be 100644 --- a/WebService/bin/Web.config +++ b/WebService/bin/Web.config @@ -28,8 +28,8 @@ - - + + diff --git a/WebService/bin/WebService.XmlSerializers.dll b/WebService/bin/WebService.XmlSerializers.dll index 5619cbd..3895fa8 100644 Binary files a/WebService/bin/WebService.XmlSerializers.dll and b/WebService/bin/WebService.XmlSerializers.dll differ diff --git a/WebService/bin/WebService.dll b/WebService/bin/WebService.dll index 381bbda..f84e4c5 100644 Binary files a/WebService/bin/WebService.dll and b/WebService/bin/WebService.dll differ diff --git a/WebService/bin/WebService.dll.config b/WebService/bin/WebService.dll.config index 190afa5..42ff6be 100644 --- a/WebService/bin/WebService.dll.config +++ b/WebService/bin/WebService.dll.config @@ -28,8 +28,8 @@ - - + + diff --git a/WebService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WebService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d965f31..73c2ada 100644 Binary files a/WebService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/WebService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/WebService/obj/Debug/WebService.csproj.AssemblyReference.cache b/WebService/obj/Debug/WebService.csproj.AssemblyReference.cache index 734a10e..6a3d1da 100644 Binary files a/WebService/obj/Debug/WebService.csproj.AssemblyReference.cache and b/WebService/obj/Debug/WebService.csproj.AssemblyReference.cache differ diff --git a/WebService/obj/Debug/WebService.csproj.FileListAbsolute.txt b/WebService/obj/Debug/WebService.csproj.FileListAbsolute.txt index 19a7b46..c28cbd4 100644 --- a/WebService/obj/Debug/WebService.csproj.FileListAbsolute.txt +++ b/WebService/obj/Debug/WebService.csproj.FileListAbsolute.txt @@ -138,8 +138,8 @@ D:\Project\SjMes\WebService\bin\MESClassLibrary.pdb D:\Project\SjMes\WebService\bin\MESClassLibrary.dll.config D:\Project\SjMes\WebService\bin\EntityFramework.xml D:\Project\SjMes\WebService\bin\zh-Hans\EntityFramework.resources.dll +D:\Project\SjMes\WebService\obj\Debug\WebService.csproj.CoreCompileInputs.cache D:\Project\SjMes\WebService\obj\Debug\WebService.csproj.CopyComplete D:\Project\SjMes\WebService\obj\Debug\WebService.dll D:\Project\SjMes\WebService\obj\Debug\WebService.pdb D:\Project\SjMes\WebService\obj\Debug\WebService.csproj.AssemblyReference.cache -D:\Project\SjMes\WebService\obj\Debug\WebService.csproj.CoreCompileInputs.cache diff --git a/WebService/obj/Debug/WebService.dll b/WebService/obj/Debug/WebService.dll index 381bbda..f84e4c5 100644 Binary files a/WebService/obj/Debug/WebService.dll and b/WebService/obj/Debug/WebService.dll differ diff --git a/WebService/obj/Debug/WebService.pdb b/WebService/obj/Debug/WebService.pdb index 52a23d7..fb52621 100644 Binary files a/WebService/obj/Debug/WebService.pdb and b/WebService/obj/Debug/WebService.pdb differ diff --git a/WebService/obj/Release/Package/PackageTmp/bin/MESClassLibrary.dll b/WebService/obj/Release/Package/PackageTmp/bin/MESClassLibrary.dll index a3bd59d..03be947 100644 Binary files a/WebService/obj/Release/Package/PackageTmp/bin/MESClassLibrary.dll and b/WebService/obj/Release/Package/PackageTmp/bin/MESClassLibrary.dll differ diff --git a/WebService/obj/Release/Package/PackageTmp/bin/MESClassLibrary.pdb b/WebService/obj/Release/Package/PackageTmp/bin/MESClassLibrary.pdb index 25eae56..c9376c8 100644 Binary files a/WebService/obj/Release/Package/PackageTmp/bin/MESClassLibrary.pdb and b/WebService/obj/Release/Package/PackageTmp/bin/MESClassLibrary.pdb differ diff --git a/WebService/obj/Release/Package/PackageTmp/bin/WebService.XmlSerializers.dll b/WebService/obj/Release/Package/PackageTmp/bin/WebService.XmlSerializers.dll index 5619cbd..3895fa8 100644 Binary files a/WebService/obj/Release/Package/PackageTmp/bin/WebService.XmlSerializers.dll and b/WebService/obj/Release/Package/PackageTmp/bin/WebService.XmlSerializers.dll differ diff --git a/WebService/obj/Release/Package/PackageTmp/bin/WebService.dll b/WebService/obj/Release/Package/PackageTmp/bin/WebService.dll index e0fa385..df9a460 100644 Binary files a/WebService/obj/Release/Package/PackageTmp/bin/WebService.dll and b/WebService/obj/Release/Package/PackageTmp/bin/WebService.dll differ diff --git a/WebService/obj/Release/Package/PackageTmp/bin/WebService.pdb b/WebService/obj/Release/Package/PackageTmp/bin/WebService.pdb index b5cd029..f70c8fa 100644 Binary files a/WebService/obj/Release/Package/PackageTmp/bin/WebService.pdb and b/WebService/obj/Release/Package/PackageTmp/bin/WebService.pdb differ diff --git a/WebService/obj/Release/WebService.XmlSerializers.dll b/WebService/obj/Release/WebService.XmlSerializers.dll index 5619cbd..3895fa8 100644 Binary files a/WebService/obj/Release/WebService.XmlSerializers.dll and b/WebService/obj/Release/WebService.XmlSerializers.dll differ diff --git a/WebService/obj/Release/WebService.csproj.AssemblyReference.cache b/WebService/obj/Release/WebService.csproj.AssemblyReference.cache index 4b24438..b6c1a29 100644 Binary files a/WebService/obj/Release/WebService.csproj.AssemblyReference.cache and b/WebService/obj/Release/WebService.csproj.AssemblyReference.cache differ diff --git a/WebService/obj/Release/WebService.dll b/WebService/obj/Release/WebService.dll index e0fa385..df9a460 100644 Binary files a/WebService/obj/Release/WebService.dll and b/WebService/obj/Release/WebService.dll differ diff --git a/WebService/obj/Release/WebService.pdb b/WebService/obj/Release/WebService.pdb index b5cd029..f70c8fa 100644 Binary files a/WebService/obj/Release/WebService.pdb and b/WebService/obj/Release/WebService.pdb differ