ruoxing.wang
/
SjMes
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

二厂冲孔装配接口加一个字段username, stockin表也添加相应字段

master
ruoxing.wang 2 weeks ago
parent
1915f68d53
commit
4bf0e84d60
34 changed files with 48 additions and 183 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      InjectionPC/obj/Debug/DesignTimeResolveAssemblyReferences.cache
  2. 1
      InjectionPC/obj/Debug/InjectionPC.csproj.CoreCompileInputs.cache
  3. 161
      InjectionPC/obj/Debug/InjectionPC.csproj.FileListAbsolute.txt
  4. BIN
      InjectionPC/obj/Debug/InjectionPC.csproj.GenerateResource.cache
  5. BIN
      InjectionPC/obj/Debug/InjectionPC.csproj.ResolveComReference.cache
  6. BIN
      InjectionPC/obj/Debug/InjectionPC.pdb
  7. BIN
      InjectionPC/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
  8. BIN
      InjectionPC/obj/Release/InjectionPC.csproj.AssemblyReference.cache
  9. BIN
      InjectionPC/obj/Release/InjectionPC.csproj.ResolveComReference.cache
  10. BIN
      InjectionPC/obj/Release/InjectionPC.csprojAssemblyReference.cache
  11. 5
      WebService/Function.cs
  12. 12
      WebService/Properties/PublishProfiles/FolderProfile.pubxml.user
  13. 27
      WebService/WMSWebService.asmx.cs
  14. 4
      WebService/Web.config
  15. 11
      WebService/WebService.csproj.user
  16. BIN
      WebService/bin/MESClassLibrary.dll
  17. 4
      WebService/bin/Web.config
  18. BIN
      WebService/bin/WebService.XmlSerializers.dll
  19. BIN
      WebService/bin/WebService.dll
  20. 4
      WebService/bin/WebService.dll.config
  21. BIN
      WebService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  22. BIN
      WebService/obj/Debug/WebService.csproj.AssemblyReference.cache
  23. 2
      WebService/obj/Debug/WebService.csproj.FileListAbsolute.txt
  24. BIN
      WebService/obj/Debug/WebService.dll
  25. BIN
      WebService/obj/Debug/WebService.pdb
  26. BIN
      WebService/obj/Release/Package/PackageTmp/bin/MESClassLibrary.dll
  27. BIN
      WebService/obj/Release/Package/PackageTmp/bin/MESClassLibrary.pdb
  28. BIN
      WebService/obj/Release/Package/PackageTmp/bin/WebService.XmlSerializers.dll
  29. BIN
      WebService/obj/Release/Package/PackageTmp/bin/WebService.dll
  30. BIN
      WebService/obj/Release/Package/PackageTmp/bin/WebService.pdb
  31. BIN
      WebService/obj/Release/WebService.XmlSerializers.dll
  32. BIN
      WebService/obj/Release/WebService.csproj.AssemblyReference.cache
  33. BIN
      WebService/obj/Release/WebService.dll
  34. BIN
      WebService/obj/Release/WebService.pdb

BIN
InjectionPC/obj/Debug/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

1
InjectionPC/obj/Debug/InjectionPC.csproj.CoreCompileInputs.cache
View File

@ -1 +0,0 @@
c33a96f6794f88b5bf97066d08bd30b292ae3111

161
InjectionPC/obj/Debug/InjectionPC.csproj.FileListAbsolute.txt
View File

@ -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

BIN
InjectionPC/obj/Debug/InjectionPC.csproj.GenerateResource.cache
View File

Binary file not shown.

BIN
InjectionPC/obj/Debug/InjectionPC.csproj.ResolveComReference.cache
View File

Binary file not shown.

BIN
InjectionPC/obj/Debug/InjectionPC.pdb
View File

Binary file not shown.

BIN
InjectionPC/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
InjectionPC/obj/Release/InjectionPC.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
InjectionPC/obj/Release/InjectionPC.csproj.ResolveComReference.cache
View File

Binary file not shown.

BIN
InjectionPC/obj/Release/InjectionPC.csprojAssemblyReference.cache
View File

Binary file not shown.

5
WebService/Function.cs
View File

@ -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<PartInfoModel> model = new JsonModel<PartInfoModel>();
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);

12
WebService/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\Output\240709</_PublishTargetUrl>
<History>True|2024-07-09T03:55:37.0673793Z;</History>
<History>True|2024-07-21T14:03:11.8361812Z;True|2024-07-09T11:55:37.0673793+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="AppWebservice.asmx">
@ -21,13 +21,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>06/20/2019 14:38:48</publishTime>
</File>
<File Include="bin/MESClassLibrary.dll">
<publishTime>07/05/2024 10:30:41</publishTime>
<publishTime>07/19/2024 15:52:41</publishTime>
</File>
<File Include="bin/MESClassLibrary.dll.config">
<publishTime>11/02/2020 10:17:00</publishTime>
</File>
<File Include="bin/MESClassLibrary.pdb">
<publishTime>07/05/2024 10:30:41</publishTime>
<publishTime>07/19/2024 15:52:41</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/13/2020 12:43:18</publishTime>
@ -45,13 +45,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>08/07/2019 13:55:14</publishTime>
</File>
<File Include="bin/WebService.dll">
<publishTime>07/09/2024 11:55:33</publishTime>
<publishTime>07/21/2024 22:03:09</publishTime>
</File>
<File Include="bin/WebService.pdb">
<publishTime>07/09/2024 11:55:33</publishTime>
<publishTime>07/21/2024 22:03:09</publishTime>
</File>
<File Include="bin/WebService.XmlSerializers.dll">
<publishTime>07/09/2024 11:55:34</publishTime>
<publishTime>07/21/2024 22:03:10</publishTime>
</File>
<File Include="bin/zh-Hans/EntityFramework.resources.dll">
<publishTime>06/20/2019 14:38:52</publishTime>

27
WebService/WMSWebService.asmx.cs
View File

@ -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;
}
/// <summary>
/// 调用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<JsonModel<PartInfoModel>>(model));
return;
}
if (string.IsNullOrWhiteSpace(userName))
{
model.ErrReason = "用户名不能为空";
Context.Response.Write(JSONTools.ScriptSerialize<JsonModel<PartInfoModel>>(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);

4
WebService/Web.config
View File

@ -28,8 +28,8 @@
</system.web>
<connectionStrings>
<!--数据库连接串-->
<!--<add name="SqlConnString" connectionString="Data Source=10.60.101.9;user id=sa;password=a1+;database=BBMPT;max pool size = 50;"/>-->
<add name="SqlConnString" connectionString="DATA SOURCE = dev.ccwin-in.com,6191;USER ID = sa;PASSWORD = Microsoft@2021;INITIAL CATALOG = BBMPT"/>
<add name="SqlConnString" connectionString="Data Source=10.60.101.9;user id=sa;password=a1+;database=BBMPT;max pool size = 50;"/>
<!--<add name="SqlConnString" connectionString="DATA SOURCE = dev.ccwin-in.com,6191;USER ID = sa;PASSWORD = Microsoft@2021;INITIAL CATALOG = BBMPT"/>-->
<add name="BBMPTEntities" connectionString="metadata=res://*/EFModel.BBMPT.csdl|res://*/EFModel.BBMPT.ssdl|res://*/EFModel.BBMPT.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.60.101.9;initial catalog=BBMPT;user id=sa;password=a1+;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
<!--<add name="SqlConnString" connectionString="Data Source=10.60.101.9;user id=sa;password=a1+;database=BBMPT;max pool size = 50;"/>-->
<!--二厂配置-->

11
WebService/WebService.csproj.user
View File

@ -4,16 +4,23 @@
<NameOfLastUsedPublishProfile>D:\Project\SjMes\WebService\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>AppWebservice.asmx</StartPageUrl>
<StartPageUrl>WMSWebService.asmx</StartPageUrl>
<StartAction>SpecificPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
<NativeDebugging>True</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>

BIN
WebService/bin/MESClassLibrary.dll
View File

Binary file not shown.

4
WebService/bin/Web.config
View File

@ -28,8 +28,8 @@
</system.web>
<connectionStrings>
<!--数据库连接串-->
<!--<add name="SqlConnString" connectionString="Data Source=10.60.101.9;user id=sa;password=a1+;database=BBMPT;max pool size = 50;"/>-->
<add name="SqlConnString" connectionString="DATA SOURCE = dev.ccwin-in.com,6191;USER ID = sa;PASSWORD = Microsoft@2021;INITIAL CATALOG = BBMPT"/>
<add name="SqlConnString" connectionString="Data Source=10.60.101.9;user id=sa;password=a1+;database=BBMPT;max pool size = 50;"/>
<!--<add name="SqlConnString" connectionString="DATA SOURCE = dev.ccwin-in.com,6191;USER ID = sa;PASSWORD = Microsoft@2021;INITIAL CATALOG = BBMPT"/>-->
<add name="BBMPTEntities" connectionString="metadata=res://*/EFModel.BBMPT.csdl|res://*/EFModel.BBMPT.ssdl|res://*/EFModel.BBMPT.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.60.101.9;initial catalog=BBMPT;user id=sa;password=a1+;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
<!--<add name="SqlConnString" connectionString="Data Source=10.60.101.9;user id=sa;password=a1+;database=BBMPT;max pool size = 50;"/>-->
<!--二厂配置-->

BIN
WebService/bin/WebService.XmlSerializers.dll
View File

Binary file not shown.

BIN
WebService/bin/WebService.dll
View File

Binary file not shown.

4
WebService/bin/WebService.dll.config
View File

@ -28,8 +28,8 @@
</system.web>
<connectionStrings>
<!--数据库连接串-->
<!--<add name="SqlConnString" connectionString="Data Source=10.60.101.9;user id=sa;password=a1+;database=BBMPT;max pool size = 50;"/>-->
<add name="SqlConnString" connectionString="DATA SOURCE = dev.ccwin-in.com,6191;USER ID = sa;PASSWORD = Microsoft@2021;INITIAL CATALOG = BBMPT"/>
<add name="SqlConnString" connectionString="Data Source=10.60.101.9;user id=sa;password=a1+;database=BBMPT;max pool size = 50;"/>
<!--<add name="SqlConnString" connectionString="DATA SOURCE = dev.ccwin-in.com,6191;USER ID = sa;PASSWORD = Microsoft@2021;INITIAL CATALOG = BBMPT"/>-->
<add name="BBMPTEntities" connectionString="metadata=res://*/EFModel.BBMPT.csdl|res://*/EFModel.BBMPT.ssdl|res://*/EFModel.BBMPT.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.60.101.9;initial catalog=BBMPT;user id=sa;password=a1+;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
<!--<add name="SqlConnString" connectionString="Data Source=10.60.101.9;user id=sa;password=a1+;database=BBMPT;max pool size = 50;"/>-->
<!--二厂配置-->

BIN
WebService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
WebService/obj/Debug/WebService.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
WebService/obj/Debug/WebService.csproj.FileListAbsolute.txt
View File

@ -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

BIN
WebService/obj/Debug/WebService.dll
View File

Binary file not shown.

BIN
WebService/obj/Debug/WebService.pdb
View File

Binary file not shown.

BIN
WebService/obj/Release/Package/PackageTmp/bin/MESClassLibrary.dll
View File

Binary file not shown.

BIN
WebService/obj/Release/Package/PackageTmp/bin/MESClassLibrary.pdb
View File

Binary file not shown.

BIN
WebService/obj/Release/Package/PackageTmp/bin/WebService.XmlSerializers.dll
View File

Binary file not shown.

BIN
WebService/obj/Release/Package/PackageTmp/bin/WebService.dll
View File

Binary file not shown.

BIN
WebService/obj/Release/Package/PackageTmp/bin/WebService.pdb
View File

Binary file not shown.

BIN
WebService/obj/Release/WebService.XmlSerializers.dll
View File

Binary file not shown.

BIN
WebService/obj/Release/WebService.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
WebService/obj/Release/WebService.dll
View File

Binary file not shown.

BIN
WebService/obj/Release/WebService.pdb
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save