diff --git a/.vs/BBMPT/config/applicationhost.config b/.vs/BBMPT/config/applicationhost.config index 0262c0c..c0d239a 100644 --- a/.vs/BBMPT/config/applicationhost.config +++ b/.vs/BBMPT/config/applicationhost.config @@ -162,7 +162,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -186,7 +186,7 @@ - + diff --git a/.vs/BBMPT/v16/.suo b/.vs/BBMPT/v16/.suo index b07e545..cd3f71d 100644 Binary files a/.vs/BBMPT/v16/.suo and b/.vs/BBMPT/v16/.suo differ diff --git a/AddMaterial/Bin/foda.dll b/AddMaterial/Bin/foda.dll index bdc01b4..9c017f8 100644 Binary files a/AddMaterial/Bin/foda.dll and b/AddMaterial/Bin/foda.dll differ diff --git a/AppWebservice/bin/AppWebservice.dll b/AppWebservice/bin/AppWebservice.dll index ec04721..4798083 100644 Binary files a/AppWebservice/bin/AppWebservice.dll and b/AppWebservice/bin/AppWebservice.dll differ diff --git a/AppWebservice/bin/AppWebservice.pdb b/AppWebservice/bin/AppWebservice.pdb index 0765797..03ecf1a 100644 Binary files a/AppWebservice/bin/AppWebservice.pdb and b/AppWebservice/bin/AppWebservice.pdb differ diff --git a/AppWebservice/obj/Debug/AppWebservice.csproj.AssemblyReference.cache b/AppWebservice/obj/Debug/AppWebservice.csproj.AssemblyReference.cache index 1e8f2fb..11bef74 100644 Binary files a/AppWebservice/obj/Debug/AppWebservice.csproj.AssemblyReference.cache and b/AppWebservice/obj/Debug/AppWebservice.csproj.AssemblyReference.cache differ diff --git a/AppWebservice/obj/Debug/AppWebservice.csproj.CoreCompileInputs.cache b/AppWebservice/obj/Debug/AppWebservice.csproj.CoreCompileInputs.cache index c2ea648..1f7a969 100644 --- a/AppWebservice/obj/Debug/AppWebservice.csproj.CoreCompileInputs.cache +++ b/AppWebservice/obj/Debug/AppWebservice.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -9393ef4693d5fa3b792c945cd106dce4a9950057f23da99de7615a0e51f6334b +baf4367d397379a596d588b370a0ae433fa57a26 diff --git a/AppWebservice/obj/Debug/AppWebservice.csproj.FileListAbsolute.txt b/AppWebservice/obj/Debug/AppWebservice.csproj.FileListAbsolute.txt index 85f0a9d..c8af564 100644 --- a/AppWebservice/obj/Debug/AppWebservice.csproj.FileListAbsolute.txt +++ b/AppWebservice/obj/Debug/AppWebservice.csproj.FileListAbsolute.txt @@ -36,3 +36,16 @@ D:\Project\2、北汽模塑一厂\SVN\新建文件夹\AppWebservice\obj\Debug\Ap D:\Project\2、北汽模塑一厂\SVN\新建文件夹\AppWebservice\obj\Debug\AppWebservice.csproj.CopyComplete D:\Project\2、北汽模塑一厂\SVN\新建文件夹\AppWebservice\obj\Debug\AppWebservice.dll D:\Project\2、北汽模塑一厂\SVN\新建文件夹\AppWebservice\obj\Debug\AppWebservice.pdb +D:\Project\BBMPT1\AppWebservice\bin\AppWebservice.dll.config +D:\Project\BBMPT1\AppWebservice\bin\AppWebservice.dll +D:\Project\BBMPT1\AppWebservice\bin\AppWebservice.pdb +D:\Project\BBMPT1\AppWebservice\bin\EntityFramework.dll +D:\Project\BBMPT1\AppWebservice\bin\Tools.dll +D:\Project\BBMPT1\AppWebservice\bin\Microsoft.Web.Infrastructure.xml +D:\Project\BBMPT1\AppWebservice\bin\EntityFramework.xml +D:\Project\BBMPT1\AppWebservice\bin\zh-Hans\EntityFramework.resources.dll +D:\Project\BBMPT1\AppWebservice\obj\Debug\AppWebservice.csproj.AssemblyReference.cache +D:\Project\BBMPT1\AppWebservice\obj\Debug\AppWebservice.csproj.CoreCompileInputs.cache +D:\Project\BBMPT1\AppWebservice\obj\Debug\AppWebservice.csproj.CopyComplete +D:\Project\BBMPT1\AppWebservice\obj\Debug\AppWebservice.dll +D:\Project\BBMPT1\AppWebservice\obj\Debug\AppWebservice.pdb diff --git a/AppWebservice/obj/Debug/AppWebservice.dll b/AppWebservice/obj/Debug/AppWebservice.dll index ec04721..4798083 100644 Binary files a/AppWebservice/obj/Debug/AppWebservice.dll and b/AppWebservice/obj/Debug/AppWebservice.dll differ diff --git a/AppWebservice/obj/Debug/AppWebservice.pdb b/AppWebservice/obj/Debug/AppWebservice.pdb index 0765797..03ecf1a 100644 Binary files a/AppWebservice/obj/Debug/AppWebservice.pdb and b/AppWebservice/obj/Debug/AppWebservice.pdb differ diff --git a/AppWebservice/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/AppWebservice/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 1004a82..8972d90 100644 Binary files a/AppWebservice/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/AppWebservice/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/AppWebservice/obj/Release/AppWebservice.csproj.AssemblyReference.cache b/AppWebservice/obj/Release/AppWebservice.csproj.AssemblyReference.cache index 37c5182..37b11d5 100644 Binary files a/AppWebservice/obj/Release/AppWebservice.csproj.AssemblyReference.cache and b/AppWebservice/obj/Release/AppWebservice.csproj.AssemblyReference.cache differ diff --git a/FacOneZPStation/bin/Debug/FacOneZPStation.exe b/FacOneZPStation/bin/Debug/FacOneZPStation.exe index cb7ff49..d8e67e3 100644 Binary files a/FacOneZPStation/bin/Debug/FacOneZPStation.exe and b/FacOneZPStation/bin/Debug/FacOneZPStation.exe differ diff --git a/FacOneZPStation/bin/Debug/FacOneZPStation.pdb b/FacOneZPStation/bin/Debug/FacOneZPStation.pdb index 77a7c1b..023f82e 100644 Binary files a/FacOneZPStation/bin/Debug/FacOneZPStation.pdb and b/FacOneZPStation/bin/Debug/FacOneZPStation.pdb differ diff --git a/FacOneZPStation/bin/Debug/MESClassLibrary.dll b/FacOneZPStation/bin/Debug/MESClassLibrary.dll index 4dbd39a..41641ee 100644 Binary files a/FacOneZPStation/bin/Debug/MESClassLibrary.dll and b/FacOneZPStation/bin/Debug/MESClassLibrary.dll differ diff --git a/FacOneZPStation/bin/Debug/MESClassLibrary.dll.config b/FacOneZPStation/bin/Debug/MESClassLibrary.dll.config index fc1dd55..7dc4db2 100644 --- a/FacOneZPStation/bin/Debug/MESClassLibrary.dll.config +++ b/FacOneZPStation/bin/Debug/MESClassLibrary.dll.config @@ -15,13 +15,13 @@ - + - + diff --git a/FacOneZPStation/bin/Debug/MESClassLibrary.pdb b/FacOneZPStation/bin/Debug/MESClassLibrary.pdb index 8380b50..0b0d642 100644 Binary files a/FacOneZPStation/bin/Debug/MESClassLibrary.pdb and b/FacOneZPStation/bin/Debug/MESClassLibrary.pdb differ diff --git a/FacOneZPStation/bin/Debug/foda.dll b/FacOneZPStation/bin/Debug/foda.dll index bdc01b4..9c017f8 100644 Binary files a/FacOneZPStation/bin/Debug/foda.dll and b/FacOneZPStation/bin/Debug/foda.dll differ diff --git a/FacOneZPStation/bin/Debug/foda.pdb b/FacOneZPStation/bin/Debug/foda.pdb index 7741a3c..bf1b230 100644 Binary files a/FacOneZPStation/bin/Debug/foda.pdb and b/FacOneZPStation/bin/Debug/foda.pdb differ diff --git a/FacOneZPStation/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/FacOneZPStation/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 5b256e2..f5e894a 100644 Binary files a/FacOneZPStation/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/FacOneZPStation/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/FacOneZPStation/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/FacOneZPStation/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 882155c..53a91bc 100644 Binary files a/FacOneZPStation/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/FacOneZPStation/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/FacOneZPStation/obj/Debug/FacOneZPStation.csproj.AssemblyReference.cache b/FacOneZPStation/obj/Debug/FacOneZPStation.csproj.AssemblyReference.cache index 968f45b..d338539 100644 Binary files a/FacOneZPStation/obj/Debug/FacOneZPStation.csproj.AssemblyReference.cache and b/FacOneZPStation/obj/Debug/FacOneZPStation.csproj.AssemblyReference.cache differ diff --git a/FacOneZPStation/obj/Debug/FacOneZPStation.csproj.CoreCompileInputs.cache b/FacOneZPStation/obj/Debug/FacOneZPStation.csproj.CoreCompileInputs.cache index 64e3a9a..f814207 100644 --- a/FacOneZPStation/obj/Debug/FacOneZPStation.csproj.CoreCompileInputs.cache +++ b/FacOneZPStation/obj/Debug/FacOneZPStation.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -e9cc9f00ce5036bac0dde3f8b758083de1587239da16af76f58bee45fd650ec2 +57648d851e8895617f6493e00cf9a8bbeba7742b diff --git a/FacOneZPStation/obj/Debug/FacOneZPStation.csproj.FileListAbsolute.txt b/FacOneZPStation/obj/Debug/FacOneZPStation.csproj.FileListAbsolute.txt index 3b29514..4940d31 100644 --- a/FacOneZPStation/obj/Debug/FacOneZPStation.csproj.FileListAbsolute.txt +++ b/FacOneZPStation/obj/Debug/FacOneZPStation.csproj.FileListAbsolute.txt @@ -100,3 +100,34 @@ D:\Project\2、北汽模塑一厂\SVN\新建文件夹\FacOneZPStation\obj\Debug\ D:\Project\2、北汽模塑一厂\SVN\新建文件夹\FacOneZPStation\obj\Debug\FacOneZPStation.csproj.CopyComplete D:\Project\2、北汽模塑一厂\SVN\新建文件夹\FacOneZPStation\obj\Debug\FacOneZPStation.exe D:\Project\2、北汽模塑一厂\SVN\新建文件夹\FacOneZPStation\obj\Debug\FacOneZPStation.pdb +D:\Project\BBMPT1\FacOneZPStation\bin\Debug\FacOneZPStation.exe.config +D:\Project\BBMPT1\FacOneZPStation\bin\Debug\FacOneZPStation.exe +D:\Project\BBMPT1\FacOneZPStation\bin\Debug\FacOneZPStation.pdb +D:\Project\BBMPT1\FacOneZPStation\bin\Debug\foda.dll +D:\Project\BBMPT1\FacOneZPStation\bin\Debug\MESClassLibrary.dll +D:\Project\BBMPT1\FacOneZPStation\bin\Debug\SchTaskExtAPI.dll +D:\Project\BBMPT1\FacOneZPStation\bin\Debug\Tools.dll +D:\Project\BBMPT1\FacOneZPStation\bin\Debug\EntityFramework.dll +D:\Project\BBMPT1\FacOneZPStation\bin\Debug\Newtonsoft.Json.dll +D:\Project\BBMPT1\FacOneZPStation\bin\Debug\foda.pdb +D:\Project\BBMPT1\FacOneZPStation\bin\Debug\foda.dll.config +D:\Project\BBMPT1\FacOneZPStation\bin\Debug\MESClassLibrary.pdb +D:\Project\BBMPT1\FacOneZPStation\bin\Debug\MESClassLibrary.dll.config +D:\Project\BBMPT1\FacOneZPStation\bin\Debug\EntityFramework.xml +D:\Project\BBMPT1\FacOneZPStation\bin\Debug\zh-Hans\EntityFramework.resources.dll +D:\Project\BBMPT1\FacOneZPStation\obj\Debug\FacOneZPStation.csproj.AssemblyReference.cache +D:\Project\BBMPT1\FacOneZPStation\obj\Debug\Interop.grdesLib.dll +D:\Project\BBMPT1\FacOneZPStation\obj\Debug\Interop.grproLib.dll +D:\Project\BBMPT1\FacOneZPStation\obj\Debug\FacOneZPStation.csproj.ResolveComReference.cache +D:\Project\BBMPT1\FacOneZPStation\obj\Debug\InjectionPC.FrmBuDa.resources +D:\Project\BBMPT1\FacOneZPStation\obj\Debug\FacOneZPStation.FrmChooseDamnPosition.resources +D:\Project\BBMPT1\FacOneZPStation\obj\Debug\FacOneZPStation.FrmMain.resources +D:\Project\BBMPT1\FacOneZPStation\obj\Debug\FacOneZPStation.FrmMould.resources +D:\Project\BBMPT1\FacOneZPStation\obj\Debug\FacOneZPStation.FrmPass.resources +D:\Project\BBMPT1\FacOneZPStation\obj\Debug\FacOneZPStation.FrmZP.resources +D:\Project\BBMPT1\FacOneZPStation\obj\Debug\FacOneZPStation.Properties.Resources.resources +D:\Project\BBMPT1\FacOneZPStation\obj\Debug\FacOneZPStation.csproj.GenerateResource.cache +D:\Project\BBMPT1\FacOneZPStation\obj\Debug\FacOneZPStation.csproj.CoreCompileInputs.cache +D:\Project\BBMPT1\FacOneZPStation\obj\Debug\FacOneZPStation.csproj.CopyComplete +D:\Project\BBMPT1\FacOneZPStation\obj\Debug\FacOneZPStation.exe +D:\Project\BBMPT1\FacOneZPStation\obj\Debug\FacOneZPStation.pdb diff --git a/FacOneZPStation/obj/Debug/FacOneZPStation.csproj.GenerateResource.cache b/FacOneZPStation/obj/Debug/FacOneZPStation.csproj.GenerateResource.cache index cba421c..e60bb3d 100644 Binary files a/FacOneZPStation/obj/Debug/FacOneZPStation.csproj.GenerateResource.cache and b/FacOneZPStation/obj/Debug/FacOneZPStation.csproj.GenerateResource.cache differ diff --git a/FacOneZPStation/obj/Debug/FacOneZPStation.exe b/FacOneZPStation/obj/Debug/FacOneZPStation.exe index cb7ff49..d8e67e3 100644 Binary files a/FacOneZPStation/obj/Debug/FacOneZPStation.exe and b/FacOneZPStation/obj/Debug/FacOneZPStation.exe differ diff --git a/FacOneZPStation/obj/Debug/FacOneZPStation.pdb b/FacOneZPStation/obj/Debug/FacOneZPStation.pdb index 77a7c1b..023f82e 100644 Binary files a/FacOneZPStation/obj/Debug/FacOneZPStation.pdb and b/FacOneZPStation/obj/Debug/FacOneZPStation.pdb differ diff --git a/FacOneZPStation/obj/Release/FacOneZPStation.csproj.AssemblyReference.cache b/FacOneZPStation/obj/Release/FacOneZPStation.csproj.AssemblyReference.cache index 37daeec..de93edd 100644 Binary files a/FacOneZPStation/obj/Release/FacOneZPStation.csproj.AssemblyReference.cache and b/FacOneZPStation/obj/Release/FacOneZPStation.csproj.AssemblyReference.cache differ diff --git a/FacOneZPStation/obj/Release/FacOneZPStation.csproj.ResolveComReference.cache b/FacOneZPStation/obj/Release/FacOneZPStation.csproj.ResolveComReference.cache index 3b4fb2d..d91e993 100644 Binary files a/FacOneZPStation/obj/Release/FacOneZPStation.csproj.ResolveComReference.cache and b/FacOneZPStation/obj/Release/FacOneZPStation.csproj.ResolveComReference.cache differ diff --git a/FacOneZPStation/obj/Release/Interop.grdesLib.dll b/FacOneZPStation/obj/Release/Interop.grdesLib.dll index 2e9ef5a..01bf4d2 100644 Binary files a/FacOneZPStation/obj/Release/Interop.grdesLib.dll and b/FacOneZPStation/obj/Release/Interop.grdesLib.dll differ diff --git a/FacOneZPStation/obj/Release/Interop.grproLib.dll b/FacOneZPStation/obj/Release/Interop.grproLib.dll index c528742..d0ba752 100644 Binary files a/FacOneZPStation/obj/Release/Interop.grproLib.dll and b/FacOneZPStation/obj/Release/Interop.grproLib.dll differ diff --git a/InjectionPC/App.config b/InjectionPC/App.config index ae213f4..4ca17ec 100644 --- a/InjectionPC/App.config +++ b/InjectionPC/App.config @@ -2,16 +2,20 @@ - + + + + + - + - + + + + + - + - + diff --git a/InjectionPC/bin/Debug/MESClassLibrary.pdb b/InjectionPC/bin/Debug/MESClassLibrary.pdb index 379a5a0..0b0d642 100644 Binary files a/InjectionPC/bin/Debug/MESClassLibrary.pdb and b/InjectionPC/bin/Debug/MESClassLibrary.pdb differ diff --git a/InjectionPC/bin/Debug/Sill.grf b/InjectionPC/bin/Debug/Sill.grf index b140677..ec590e7 100644 --- a/InjectionPC/bin/Debug/Sill.grf +++ b/InjectionPC/bin/Debug/Sill.grf @@ -31,6 +31,9 @@ }, { "Name":"BarCode" + }, + { + "Name":"Station" } ], "ReportHeader":[ @@ -53,26 +56,11 @@ }, "Text":"[#PrintTime#]" }, - { - "Type":"StaticBox", - "Name":"StaticBox1", - "Left":0.714375, - "Top":0.635, - "Width":1.21708, - "Height":0.211667, - "Font":{ - "Name":"宋体", - "Size":52500, - "Bold":true, - "Charset":134 - }, - "Text":"IM02" - }, { "Type":"MemoBox", "Name":"MemoBox2", "Left":0.58, - "Top":0.873125, + "Top":1.00542, "Width":1.59, "Height":0.4, "Font":{ @@ -87,7 +75,7 @@ "Type":"MemoBox", "Name":"MemoBox3", "Left":0.582083, - "Top":1.27, + "Top":1.40229, "Width":2.2225, "Height":0.396875, "Font":{ @@ -125,6 +113,21 @@ "BarcodeType":"QRCode", "CaptionPosition":"None", "Text":"[#{OneBarCode}#]" + }, + { + "Type":"MemoBox", + "Name":"MemoBox4", + "Left":0.608542, + "Top":0.608542, + "Width":1.5875, + "Height":0.396875, + "Font":{ + "Name":"宋体", + "Size":52500, + "Bold":true, + "Charset":134 + }, + "Text":"[#{Station}#]" } ] } diff --git a/InjectionPC/bin/Debug/单个条码.grf b/InjectionPC/bin/Debug/单个条码.grf index 7325ac2..34be796 100644 Binary files a/InjectionPC/bin/Debug/单个条码.grf and b/InjectionPC/bin/Debug/单个条码.grf differ diff --git a/InjectionPC/bin/Debug/装箱单.grf b/InjectionPC/bin/Debug/装箱单.grf index 63d24a5..a74c33c 100644 Binary files a/InjectionPC/bin/Debug/装箱单.grf and b/InjectionPC/bin/Debug/装箱单.grf differ diff --git a/InjectionPC/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/InjectionPC/obj/Debug/DesignTimeResolveAssemblyReferences.cache index b6ed555..820c2cd 100644 Binary files a/InjectionPC/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/InjectionPC/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/InjectionPC/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/InjectionPC/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 66bf5da..e5c589a 100644 Binary files a/InjectionPC/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/InjectionPC/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/InjectionPC/obj/Debug/InjectionPC.csproj.AssemblyReference.cache b/InjectionPC/obj/Debug/InjectionPC.csproj.AssemblyReference.cache index 1305c11..79bf299 100644 Binary files a/InjectionPC/obj/Debug/InjectionPC.csproj.AssemblyReference.cache and b/InjectionPC/obj/Debug/InjectionPC.csproj.AssemblyReference.cache differ diff --git a/InjectionPC/obj/Debug/InjectionPC.csproj.CoreCompileInputs.cache b/InjectionPC/obj/Debug/InjectionPC.csproj.CoreCompileInputs.cache index 26b4b84..25d723a 100644 --- a/InjectionPC/obj/Debug/InjectionPC.csproj.CoreCompileInputs.cache +++ b/InjectionPC/obj/Debug/InjectionPC.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -fb4ff9c001d9597a2c41af8cf986b1c63e7ad05a +28074d8b4b6a91f28ad069873581a8d87fdea579 diff --git a/InjectionPC/obj/Debug/InjectionPC.csproj.FileListAbsolute.txt b/InjectionPC/obj/Debug/InjectionPC.csproj.FileListAbsolute.txt index d0d221f..81fbcfc 100644 --- a/InjectionPC/obj/Debug/InjectionPC.csproj.FileListAbsolute.txt +++ b/InjectionPC/obj/Debug/InjectionPC.csproj.FileListAbsolute.txt @@ -157,3 +157,40 @@ D:\Project\BBMPT1\注塑冲孔喷涂下线\InjectionPC\obj\Debug\InjectionPC.csp D:\Project\BBMPT1\注塑冲孔喷涂下线\InjectionPC\obj\Debug\InjectionPC.exe D:\Project\BBMPT1\注塑冲孔喷涂下线\InjectionPC\obj\Debug\InjectionPC.pdb D:\Project\BBMPT1\注塑冲孔喷涂下线\InjectionPC\obj\Debug\InjectionPC.FrmMain2408.resources +D:\Project\BBMPT1\InjectionPC\bin\Debug\InjectionPC.exe.config +D:\Project\BBMPT1\InjectionPC\bin\Debug\InjectionPC.exe +D:\Project\BBMPT1\InjectionPC\bin\Debug\InjectionPC.pdb +D:\Project\BBMPT1\InjectionPC\bin\Debug\GlacialList.dll +D:\Project\BBMPT1\InjectionPC\bin\Debug\MESClassLibrary.dll +D:\Project\BBMPT1\InjectionPC\bin\Debug\SchTaskExtAPI.dll +D:\Project\BBMPT1\InjectionPC\bin\Debug\EntityFramework.dll +D:\Project\BBMPT1\InjectionPC\bin\Debug\Newtonsoft.Json.dll +D:\Project\BBMPT1\InjectionPC\bin\Debug\MESClassLibrary.pdb +D:\Project\BBMPT1\InjectionPC\bin\Debug\MESClassLibrary.dll.config +D:\Project\BBMPT1\InjectionPC\bin\Debug\EntityFramework.xml +D:\Project\BBMPT1\InjectionPC\bin\Debug\zh-Hans\EntityFramework.resources.dll +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.csproj.AssemblyReference.cache +D:\Project\BBMPT1\InjectionPC\obj\Debug\Interop.grdes6Lib.dll +D:\Project\BBMPT1\InjectionPC\obj\Debug\Interop.gregn6Lib.dll +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.csproj.ResolveComReference.cache +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.Form1.resources +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.FrmBarCode.resources +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.FrmDown.resources +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.FrmLogin.resources +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.FrmMain2408.resources +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.FrmMainNew.resources +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.FrmMain.resources +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.FrmMain_Injection.resources +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.FrmQuality_new.resources +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.FrmQuality.resources +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.FrmTighten.resources +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.FrmZc.resources +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.Properties.Resources.resources +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.csproj.GenerateResource.cache +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.csproj.CoreCompileInputs.cache +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.csproj.CopyComplete +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.exe +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.pdb +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.FrmPackageDetail.resources +D:\Project\BBMPT1\InjectionPC\bin\Debug\Stone.Common.dll +D:\Project\BBMPT1\InjectionPC\obj\Debug\InjectionPC.FrmMain2411.resources diff --git a/InjectionPC/obj/Debug/InjectionPC.csproj.GenerateResource.cache b/InjectionPC/obj/Debug/InjectionPC.csproj.GenerateResource.cache index 1256357..e696f85 100644 Binary files a/InjectionPC/obj/Debug/InjectionPC.csproj.GenerateResource.cache and b/InjectionPC/obj/Debug/InjectionPC.csproj.GenerateResource.cache differ diff --git a/InjectionPC/obj/Debug/InjectionPC.exe b/InjectionPC/obj/Debug/InjectionPC.exe index 49cb24c..e41eb13 100644 Binary files a/InjectionPC/obj/Debug/InjectionPC.exe and b/InjectionPC/obj/Debug/InjectionPC.exe differ diff --git a/InjectionPC/obj/Debug/InjectionPC.pdb b/InjectionPC/obj/Debug/InjectionPC.pdb index a485a34..8240868 100644 Binary files a/InjectionPC/obj/Debug/InjectionPC.pdb and b/InjectionPC/obj/Debug/InjectionPC.pdb differ diff --git a/InjectionPC/obj/Release/InjectionPC.csproj.AssemblyReference.cache b/InjectionPC/obj/Release/InjectionPC.csproj.AssemblyReference.cache index 7b92c26..bbf7960 100644 Binary files a/InjectionPC/obj/Release/InjectionPC.csproj.AssemblyReference.cache and b/InjectionPC/obj/Release/InjectionPC.csproj.AssemblyReference.cache differ diff --git a/InjectionPC/obj/Release/InjectionPC.csproj.ResolveComReference.cache b/InjectionPC/obj/Release/InjectionPC.csproj.ResolveComReference.cache index 979c7c7..4ccd9c6 100644 Binary files a/InjectionPC/obj/Release/InjectionPC.csproj.ResolveComReference.cache and b/InjectionPC/obj/Release/InjectionPC.csproj.ResolveComReference.cache differ diff --git a/InjectionPC/obj/Release/Interop.grdes6Lib.dll b/InjectionPC/obj/Release/Interop.grdes6Lib.dll index 43860c4..6a567a0 100644 Binary files a/InjectionPC/obj/Release/Interop.grdes6Lib.dll and b/InjectionPC/obj/Release/Interop.grdes6Lib.dll differ diff --git a/InjectionPC/obj/Release/Interop.gregn6Lib.dll b/InjectionPC/obj/Release/Interop.gregn6Lib.dll index a276b2a..29ecaa3 100644 Binary files a/InjectionPC/obj/Release/Interop.gregn6Lib.dll and b/InjectionPC/obj/Release/Interop.gregn6Lib.dll differ diff --git a/InjectionPC/单个条码.grf b/InjectionPC/单个条码.grf index 7325ac2..34be796 100644 Binary files a/InjectionPC/单个条码.grf and b/InjectionPC/单个条码.grf differ diff --git a/InjectionSearch/App.config b/InjectionSearch/App.config index 1a95aa2..bc5d08a 100644 --- a/InjectionSearch/App.config +++ b/InjectionSearch/App.config @@ -3,14 +3,19 @@ - + + + + - + + diff --git a/InjectionSearch/bin/Debug/InjectionSearch.exe b/InjectionSearch/bin/Debug/InjectionSearch.exe index 3998381..6cf93e9 100644 Binary files a/InjectionSearch/bin/Debug/InjectionSearch.exe and b/InjectionSearch/bin/Debug/InjectionSearch.exe differ diff --git a/InjectionSearch/bin/Debug/InjectionSearch.exe.config b/InjectionSearch/bin/Debug/InjectionSearch.exe.config index 1a95aa2..bc5d08a 100644 --- a/InjectionSearch/bin/Debug/InjectionSearch.exe.config +++ b/InjectionSearch/bin/Debug/InjectionSearch.exe.config @@ -3,14 +3,19 @@ - + + + + - + + diff --git a/InjectionSearch/bin/Debug/InjectionSearch.pdb b/InjectionSearch/bin/Debug/InjectionSearch.pdb index 835062d..62c98c7 100644 Binary files a/InjectionSearch/bin/Debug/InjectionSearch.pdb and b/InjectionSearch/bin/Debug/InjectionSearch.pdb differ diff --git a/InjectionSearch/bin/Debug/MESClassLibrary.dll b/InjectionSearch/bin/Debug/MESClassLibrary.dll index 4c8c50f..41641ee 100644 Binary files a/InjectionSearch/bin/Debug/MESClassLibrary.dll and b/InjectionSearch/bin/Debug/MESClassLibrary.dll differ diff --git a/InjectionSearch/bin/Debug/MESClassLibrary.dll.config b/InjectionSearch/bin/Debug/MESClassLibrary.dll.config index fc1dd55..7dc4db2 100644 --- a/InjectionSearch/bin/Debug/MESClassLibrary.dll.config +++ b/InjectionSearch/bin/Debug/MESClassLibrary.dll.config @@ -15,13 +15,13 @@ - + - + diff --git a/InjectionSearch/bin/Debug/MESClassLibrary.pdb b/InjectionSearch/bin/Debug/MESClassLibrary.pdb index 379a5a0..0b0d642 100644 Binary files a/InjectionSearch/bin/Debug/MESClassLibrary.pdb and b/InjectionSearch/bin/Debug/MESClassLibrary.pdb differ diff --git a/InjectionSearch/bin/Debug/单个条码.grf b/InjectionSearch/bin/Debug/单个条码.grf index 770eb89..34be796 100644 Binary files a/InjectionSearch/bin/Debug/单个条码.grf and b/InjectionSearch/bin/Debug/单个条码.grf differ diff --git a/InjectionSearch/bin/Debug/装箱单.grf b/InjectionSearch/bin/Debug/装箱单.grf index 63d24a5..a74c33c 100644 Binary files a/InjectionSearch/bin/Debug/装箱单.grf and b/InjectionSearch/bin/Debug/装箱单.grf differ diff --git a/InjectionSearch/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/InjectionSearch/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 1906dcc..e8cff7c 100644 Binary files a/InjectionSearch/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/InjectionSearch/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/InjectionSearch/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/InjectionSearch/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index ae21fdc..5790ab1 100644 Binary files a/InjectionSearch/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/InjectionSearch/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/InjectionSearch/obj/Debug/InjectionSearch.csproj.AssemblyReference.cache b/InjectionSearch/obj/Debug/InjectionSearch.csproj.AssemblyReference.cache index c3558e3..efd1dea 100644 Binary files a/InjectionSearch/obj/Debug/InjectionSearch.csproj.AssemblyReference.cache and b/InjectionSearch/obj/Debug/InjectionSearch.csproj.AssemblyReference.cache differ diff --git a/InjectionSearch/obj/Debug/InjectionSearch.csproj.CoreCompileInputs.cache b/InjectionSearch/obj/Debug/InjectionSearch.csproj.CoreCompileInputs.cache index 6d86bd9..0e034b5 100644 --- a/InjectionSearch/obj/Debug/InjectionSearch.csproj.CoreCompileInputs.cache +++ b/InjectionSearch/obj/Debug/InjectionSearch.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8c73502703c885abaa1c022cd6cb62e14f4c2915 +4cee9621f832af99ac088402c239d8bd059854ea diff --git a/InjectionSearch/obj/Debug/InjectionSearch.csproj.FileListAbsolute.txt b/InjectionSearch/obj/Debug/InjectionSearch.csproj.FileListAbsolute.txt index caef0f9..0896bf8 100644 --- a/InjectionSearch/obj/Debug/InjectionSearch.csproj.FileListAbsolute.txt +++ b/InjectionSearch/obj/Debug/InjectionSearch.csproj.FileListAbsolute.txt @@ -104,3 +104,35 @@ D:\Project\BBMPT1\注塑冲孔喷涂下线\InjectionSearch\obj\Debug\InjectionSe D:\Project\BBMPT1\注塑冲孔喷涂下线\InjectionSearch\obj\Debug\InjectionSearch.csproj.CopyComplete D:\Project\BBMPT1\注塑冲孔喷涂下线\InjectionSearch\obj\Debug\InjectionSearch.exe D:\Project\BBMPT1\注塑冲孔喷涂下线\InjectionSearch\obj\Debug\InjectionSearch.pdb +D:\Project\BBMPT1\InjectionSearch\bin\Debug\InjectionSearch.exe.config +D:\Project\BBMPT1\InjectionSearch\bin\Debug\InjectionSearch.exe +D:\Project\BBMPT1\InjectionSearch\bin\Debug\InjectionSearch.pdb +D:\Project\BBMPT1\InjectionSearch\bin\Debug\GlacialList.dll +D:\Project\BBMPT1\InjectionSearch\bin\Debug\ICSharpCode.SharpZipLib.dll +D:\Project\BBMPT1\InjectionSearch\bin\Debug\MESClassLibrary.dll +D:\Project\BBMPT1\InjectionSearch\bin\Debug\NPOI.dll +D:\Project\BBMPT1\InjectionSearch\bin\Debug\NPOI.OOXML.dll +D:\Project\BBMPT1\InjectionSearch\bin\Debug\NPOI.OpenXml4Net.dll +D:\Project\BBMPT1\InjectionSearch\bin\Debug\NPOI.OpenXmlFormats.dll +D:\Project\BBMPT1\InjectionSearch\bin\Debug\EntityFramework.dll +D:\Project\BBMPT1\InjectionSearch\bin\Debug\Newtonsoft.Json.dll +D:\Project\BBMPT1\InjectionSearch\bin\Debug\MESClassLibrary.pdb +D:\Project\BBMPT1\InjectionSearch\bin\Debug\MESClassLibrary.dll.config +D:\Project\BBMPT1\InjectionSearch\bin\Debug\ICSharpCode.SharpZipLib.xml +D:\Project\BBMPT1\InjectionSearch\bin\Debug\EntityFramework.xml +D:\Project\BBMPT1\InjectionSearch\bin\Debug\zh-Hans\EntityFramework.resources.dll +D:\Project\BBMPT1\InjectionSearch\obj\Debug\InjectionSearch.csproj.AssemblyReference.cache +D:\Project\BBMPT1\InjectionSearch\obj\Debug\Interop.grproLib.dll +D:\Project\BBMPT1\InjectionSearch\obj\Debug\InjectionSearch.csproj.ResolveComReference.cache +D:\Project\BBMPT1\InjectionSearch\obj\Debug\InjectionSearch.FrmLogin.resources +D:\Project\BBMPT1\InjectionSearch\obj\Debug\InjectionSearch.FrmBarCodeSearch.resources +D:\Project\BBMPT1\InjectionSearch\obj\Debug\InjectionSearch.Properties.Resources.resources +D:\Project\BBMPT1\InjectionSearch\obj\Debug\InjectionSearch.csproj.GenerateResource.cache +D:\Project\BBMPT1\InjectionSearch\obj\Debug\InjectionSearch.csproj.CoreCompileInputs.cache +D:\Project\BBMPT1\InjectionSearch\obj\Debug\InjectionSearch.csproj.CopyComplete +D:\Project\BBMPT1\InjectionSearch\obj\Debug\InjectionSearch.exe +D:\Project\BBMPT1\InjectionSearch\obj\Debug\InjectionSearch.pdb +D:\Project\BBMPT1\InjectionSearch\obj\Debug\InjectionSearch.FrmBarCodeSearch2408.resources +D:\Project\BBMPT1\InjectionSearch\obj\Debug\InjectionSearch.FrmPackageDetail.resources +D:\Project\BBMPT1\InjectionSearch\obj\Debug\InjectionSearch.FrmBarCodeReplace.resources +D:\Project\BBMPT1\InjectionSearch\bin\Debug\Stone.Common.dll diff --git a/InjectionSearch/obj/Debug/InjectionSearch.csproj.GenerateResource.cache b/InjectionSearch/obj/Debug/InjectionSearch.csproj.GenerateResource.cache index fdc182a..99f8a74 100644 Binary files a/InjectionSearch/obj/Debug/InjectionSearch.csproj.GenerateResource.cache and b/InjectionSearch/obj/Debug/InjectionSearch.csproj.GenerateResource.cache differ diff --git a/InjectionSearch/obj/Debug/InjectionSearch.exe b/InjectionSearch/obj/Debug/InjectionSearch.exe index 3998381..6cf93e9 100644 Binary files a/InjectionSearch/obj/Debug/InjectionSearch.exe and b/InjectionSearch/obj/Debug/InjectionSearch.exe differ diff --git a/InjectionSearch/obj/Debug/InjectionSearch.pdb b/InjectionSearch/obj/Debug/InjectionSearch.pdb index 835062d..62c98c7 100644 Binary files a/InjectionSearch/obj/Debug/InjectionSearch.pdb and b/InjectionSearch/obj/Debug/InjectionSearch.pdb differ diff --git a/InjectionSearch/obj/Release/InjectionSearch.csproj.AssemblyReference.cache b/InjectionSearch/obj/Release/InjectionSearch.csproj.AssemblyReference.cache index 0487c27..6b4dcd2 100644 Binary files a/InjectionSearch/obj/Release/InjectionSearch.csproj.AssemblyReference.cache and b/InjectionSearch/obj/Release/InjectionSearch.csproj.AssemblyReference.cache differ diff --git a/InjectionSearch/obj/Release/InjectionSearch.csproj.ResolveComReference.cache b/InjectionSearch/obj/Release/InjectionSearch.csproj.ResolveComReference.cache index 9a3bdef..528b252 100644 Binary files a/InjectionSearch/obj/Release/InjectionSearch.csproj.ResolveComReference.cache and b/InjectionSearch/obj/Release/InjectionSearch.csproj.ResolveComReference.cache differ diff --git a/InjectionSearch/obj/Release/Interop.grproLib.dll b/InjectionSearch/obj/Release/Interop.grproLib.dll index a25e6d7..aa37634 100644 Binary files a/InjectionSearch/obj/Release/Interop.grproLib.dll and b/InjectionSearch/obj/Release/Interop.grproLib.dll differ diff --git a/MESClassLibrary/App.config b/MESClassLibrary/App.config index fc1dd55..7dc4db2 100644 --- a/MESClassLibrary/App.config +++ b/MESClassLibrary/App.config @@ -15,13 +15,13 @@ - + - + diff --git a/MESClassLibrary/EFModel/BBMPT.edmx.diagram b/MESClassLibrary/EFModel/BBMPT.edmx.diagram index ba4f097..d069cca 100644 --- a/MESClassLibrary/EFModel/BBMPT.edmx.diagram +++ b/MESClassLibrary/EFModel/BBMPT.edmx.diagram @@ -4,7 +4,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -151,7 +151,7 @@ - + @@ -166,11 +166,11 @@ - + - + diff --git a/MESClassLibrary/bin/Debug/MESClassLibrary.dll b/MESClassLibrary/bin/Debug/MESClassLibrary.dll index 4c8c50f..41641ee 100644 Binary files a/MESClassLibrary/bin/Debug/MESClassLibrary.dll and b/MESClassLibrary/bin/Debug/MESClassLibrary.dll differ diff --git a/MESClassLibrary/bin/Debug/MESClassLibrary.dll.config b/MESClassLibrary/bin/Debug/MESClassLibrary.dll.config index fc1dd55..7dc4db2 100644 --- a/MESClassLibrary/bin/Debug/MESClassLibrary.dll.config +++ b/MESClassLibrary/bin/Debug/MESClassLibrary.dll.config @@ -15,13 +15,13 @@ - + - + diff --git a/MESClassLibrary/bin/Debug/MESClassLibrary.pdb b/MESClassLibrary/bin/Debug/MESClassLibrary.pdb index 379a5a0..0b0d642 100644 Binary files a/MESClassLibrary/bin/Debug/MESClassLibrary.pdb and b/MESClassLibrary/bin/Debug/MESClassLibrary.pdb differ diff --git a/MESClassLibrary/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/MESClassLibrary/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index e475471..16f7f8b 100644 Binary files a/MESClassLibrary/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/MESClassLibrary/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/MESClassLibrary/obj/Debug/MESClassLibrary.csproj.CoreCompileInputs.cache b/MESClassLibrary/obj/Debug/MESClassLibrary.csproj.CoreCompileInputs.cache index 4b6e086..20c41e9 100644 --- a/MESClassLibrary/obj/Debug/MESClassLibrary.csproj.CoreCompileInputs.cache +++ b/MESClassLibrary/obj/Debug/MESClassLibrary.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d41a1656ff4f55d4e1f07603d3c37812376f4a40 +32681e529b7ee735a677250f1946d5e34853fd69 diff --git a/MESClassLibrary/obj/Debug/MESClassLibrary.csproj.FileListAbsolute.txt b/MESClassLibrary/obj/Debug/MESClassLibrary.csproj.FileListAbsolute.txt index 50c29a0..0ecfaf4 100644 --- a/MESClassLibrary/obj/Debug/MESClassLibrary.csproj.FileListAbsolute.txt +++ b/MESClassLibrary/obj/Debug/MESClassLibrary.csproj.FileListAbsolute.txt @@ -66,3 +66,15 @@ D:\Project\BBMPT1\注塑冲孔喷涂下线\MESClassLibrary\obj\Debug\MESClassLib D:\Project\BBMPT1\注塑冲孔喷涂下线\MESClassLibrary\obj\Debug\MESClassLibrary.csproj.CopyComplete D:\Project\BBMPT1\注塑冲孔喷涂下线\MESClassLibrary\obj\Debug\MESClassLibrary.dll D:\Project\BBMPT1\注塑冲孔喷涂下线\MESClassLibrary\obj\Debug\MESClassLibrary.pdb +D:\Project\BBMPT1\MESClassLibrary\bin\Debug\MESClassLibrary.dll.config +D:\Project\BBMPT1\MESClassLibrary\bin\Debug\MESClassLibrary.dll +D:\Project\BBMPT1\MESClassLibrary\bin\Debug\MESClassLibrary.pdb +D:\Project\BBMPT1\MESClassLibrary\bin\Debug\EntityFramework.dll +D:\Project\BBMPT1\MESClassLibrary\bin\Debug\Newtonsoft.Json.dll +D:\Project\BBMPT1\MESClassLibrary\bin\Debug\EntityFramework.xml +D:\Project\BBMPT1\MESClassLibrary\bin\Debug\zh-Hans\EntityFramework.resources.dll +D:\Project\BBMPT1\MESClassLibrary\obj\Debug\MESClassLibrary.csproj.CoreCompileInputs.cache +D:\Project\BBMPT1\MESClassLibrary\obj\Debug\MESClassLibrary.csproj.CopyComplete +D:\Project\BBMPT1\MESClassLibrary\obj\Debug\MESClassLibrary.dll +D:\Project\BBMPT1\MESClassLibrary\obj\Debug\MESClassLibrary.pdb +D:\Project\BBMPT1\MESClassLibrary\obj\Debug\MESClassLibrary.csproj.AssemblyReference.cache diff --git a/MESClassLibrary/obj/Debug/MESClassLibrary.dll b/MESClassLibrary/obj/Debug/MESClassLibrary.dll index 4c8c50f..41641ee 100644 Binary files a/MESClassLibrary/obj/Debug/MESClassLibrary.dll and b/MESClassLibrary/obj/Debug/MESClassLibrary.dll differ diff --git a/MESClassLibrary/obj/Debug/MESClassLibrary.pdb b/MESClassLibrary/obj/Debug/MESClassLibrary.pdb index 379a5a0..0b0d642 100644 Binary files a/MESClassLibrary/obj/Debug/MESClassLibrary.pdb and b/MESClassLibrary/obj/Debug/MESClassLibrary.pdb differ diff --git a/MESClassLibrary/obj/Debug/TempPE/EFModel.BBMPT.Designer.cs.dll b/MESClassLibrary/obj/Debug/TempPE/EFModel.BBMPT.Designer.cs.dll index 8796908..b7f0843 100644 Binary files a/MESClassLibrary/obj/Debug/TempPE/EFModel.BBMPT.Designer.cs.dll and b/MESClassLibrary/obj/Debug/TempPE/EFModel.BBMPT.Designer.cs.dll differ diff --git a/MESClassLibrary/obj/Debug/TempPE/EFModel.BBMPT.cs.dll b/MESClassLibrary/obj/Debug/TempPE/EFModel.BBMPT.cs.dll index d330882..0a5441f 100644 Binary files a/MESClassLibrary/obj/Debug/TempPE/EFModel.BBMPT.cs.dll and b/MESClassLibrary/obj/Debug/TempPE/EFModel.BBMPT.cs.dll differ diff --git a/MESClassLibrary/obj/Debug/edmxResourcesToEmbed/EFModel/BBMPT.csdl b/MESClassLibrary/obj/Debug/edmxResourcesToEmbed/EFModel/BBMPT.csdl index 87de42e..85f332a 100644 --- a/MESClassLibrary/obj/Debug/edmxResourcesToEmbed/EFModel/BBMPT.csdl +++ b/MESClassLibrary/obj/Debug/edmxResourcesToEmbed/EFModel/BBMPT.csdl @@ -696,6 +696,12 @@ + + + + + + @@ -1221,7 +1227,7 @@ - + @@ -1243,6 +1249,7 @@ + @@ -1944,7 +1951,7 @@ - + diff --git a/MESClassLibrary/obj/Debug/edmxResourcesToEmbed/EFModel/BBMPT.ssdl b/MESClassLibrary/obj/Debug/edmxResourcesToEmbed/EFModel/BBMPT.ssdl index 93a0fb0..02428b5 100644 --- a/MESClassLibrary/obj/Debug/edmxResourcesToEmbed/EFModel/BBMPT.ssdl +++ b/MESClassLibrary/obj/Debug/edmxResourcesToEmbed/EFModel/BBMPT.ssdl @@ -18,28 +18,6 @@ - - @@ -490,7 +468,7 @@ - + @@ -862,31 +840,6 @@ - @@ -916,6 +869,12 @@ + + + + + + @@ -1430,21 +1389,6 @@ - - @@ -1569,6 +1513,7 @@ + @@ -2295,77 +2240,6 @@ - @@ -2420,49 +2294,6 @@ - - - @@ -2475,29 +2306,6 @@ - - - diff --git a/MESClassLibrary/obj/Release/MESClassLibrary.csproj.AssemblyReference.cache b/MESClassLibrary/obj/Release/MESClassLibrary.csproj.AssemblyReference.cache index 944a7d9..aff970d 100644 Binary files a/MESClassLibrary/obj/Release/MESClassLibrary.csproj.AssemblyReference.cache and b/MESClassLibrary/obj/Release/MESClassLibrary.csproj.AssemblyReference.cache differ diff --git a/MESClassLibrary/obj/Release/TempPE/EFModel.BBMPT.Designer.cs.dll b/MESClassLibrary/obj/Release/TempPE/EFModel.BBMPT.Designer.cs.dll index e24f966..09431d5 100644 Binary files a/MESClassLibrary/obj/Release/TempPE/EFModel.BBMPT.Designer.cs.dll and b/MESClassLibrary/obj/Release/TempPE/EFModel.BBMPT.Designer.cs.dll differ diff --git a/MESClassLibrary/obj/Release/TempPE/EFModel.BBMPT.cs.dll b/MESClassLibrary/obj/Release/TempPE/EFModel.BBMPT.cs.dll index 3a2dc0a..f6d0aa4 100644 Binary files a/MESClassLibrary/obj/Release/TempPE/EFModel.BBMPT.cs.dll and b/MESClassLibrary/obj/Release/TempPE/EFModel.BBMPT.cs.dll differ diff --git a/MESWebSite/bin/MESClassLibrary.dll b/MESWebSite/bin/MESClassLibrary.dll index 4c8c50f..41641ee 100644 Binary files a/MESWebSite/bin/MESClassLibrary.dll and b/MESWebSite/bin/MESClassLibrary.dll differ diff --git a/MESWebSite/bin/MESClassLibrary.dll.config b/MESWebSite/bin/MESClassLibrary.dll.config index fc1dd55..7dc4db2 100644 --- a/MESWebSite/bin/MESClassLibrary.dll.config +++ b/MESWebSite/bin/MESClassLibrary.dll.config @@ -15,13 +15,13 @@ - + - + diff --git a/MESWebSite/bin/MESClassLibrary.pdb b/MESWebSite/bin/MESClassLibrary.pdb index 379a5a0..0b0d642 100644 Binary files a/MESWebSite/bin/MESClassLibrary.pdb and b/MESWebSite/bin/MESClassLibrary.pdb differ diff --git a/MESWebSite/bin/MESWebSite.dll b/MESWebSite/bin/MESWebSite.dll index 07cce7c..1f10142 100644 Binary files a/MESWebSite/bin/MESWebSite.dll and b/MESWebSite/bin/MESWebSite.dll differ diff --git a/MESWebSite/bin/MESWebSite.pdb b/MESWebSite/bin/MESWebSite.pdb index 24f9c28..3048d16 100644 Binary files a/MESWebSite/bin/MESWebSite.pdb and b/MESWebSite/bin/MESWebSite.pdb differ diff --git a/MESWebSite/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/MESWebSite/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 8b162a1..389cce4 100644 Binary files a/MESWebSite/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/MESWebSite/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/MESWebSite/obj/Debug/MESWebSite.csproj.AssemblyReference.cache b/MESWebSite/obj/Debug/MESWebSite.csproj.AssemblyReference.cache index 841b7fb..5cb6ebf 100644 Binary files a/MESWebSite/obj/Debug/MESWebSite.csproj.AssemblyReference.cache and b/MESWebSite/obj/Debug/MESWebSite.csproj.AssemblyReference.cache differ diff --git a/MESWebSite/obj/Debug/MESWebSite.csproj.CoreCompileInputs.cache b/MESWebSite/obj/Debug/MESWebSite.csproj.CoreCompileInputs.cache index 08d89ee..2321ffd 100644 --- a/MESWebSite/obj/Debug/MESWebSite.csproj.CoreCompileInputs.cache +++ b/MESWebSite/obj/Debug/MESWebSite.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -c8ac8d1ea88ae71951903173bd2d923a5dd8a43f +b6a1736faca57bc21f90f14cec89f756855b8976 diff --git a/MESWebSite/obj/Debug/MESWebSite.csproj.FileListAbsolute.txt b/MESWebSite/obj/Debug/MESWebSite.csproj.FileListAbsolute.txt index f53ad65..9283df1 100644 --- a/MESWebSite/obj/Debug/MESWebSite.csproj.FileListAbsolute.txt +++ b/MESWebSite/obj/Debug/MESWebSite.csproj.FileListAbsolute.txt @@ -265,3 +265,58 @@ D:\Project\BBMPT1\注塑冲孔喷涂下线\MESWebSite\obj\Debug\MESWebSite.cspro D:\Project\BBMPT1\注塑冲孔喷涂下线\MESWebSite\obj\Debug\MESWebSite.csproj.CopyComplete D:\Project\BBMPT1\注塑冲孔喷涂下线\MESWebSite\obj\Debug\MESWebSite.dll D:\Project\BBMPT1\注塑冲孔喷涂下线\MESWebSite\obj\Debug\MESWebSite.pdb +D:\Project\BBMPT1\MESWebSite\bin\MESWebSite.dll.config +D:\Project\BBMPT1\MESWebSite\bin\MESWebSite.dll +D:\Project\BBMPT1\MESWebSite\bin\MESWebSite.pdb +D:\Project\BBMPT1\MESWebSite\bin\roslyn\csc.exe +D:\Project\BBMPT1\MESWebSite\bin\roslyn\csc.exe.config +D:\Project\BBMPT1\MESWebSite\bin\roslyn\csc.rsp +D:\Project\BBMPT1\MESWebSite\bin\roslyn\csi.exe +D:\Project\BBMPT1\MESWebSite\bin\roslyn\csi.rsp +D:\Project\BBMPT1\MESWebSite\bin\roslyn\Microsoft.Build.Tasks.CodeAnalysis.dll +D:\Project\BBMPT1\MESWebSite\bin\roslyn\Microsoft.CodeAnalysis.CSharp.dll +D:\Project\BBMPT1\MESWebSite\bin\roslyn\Microsoft.CodeAnalysis.CSharp.Scripting.dll +D:\Project\BBMPT1\MESWebSite\bin\roslyn\Microsoft.CodeAnalysis.dll +D:\Project\BBMPT1\MESWebSite\bin\roslyn\Microsoft.CodeAnalysis.Scripting.dll +D:\Project\BBMPT1\MESWebSite\bin\roslyn\Microsoft.CodeAnalysis.VisualBasic.dll +D:\Project\BBMPT1\MESWebSite\bin\roslyn\Microsoft.CSharp.Core.targets +D:\Project\BBMPT1\MESWebSite\bin\roslyn\Microsoft.DiaSymReader.Native.amd64.dll +D:\Project\BBMPT1\MESWebSite\bin\roslyn\Microsoft.DiaSymReader.Native.x86.dll +D:\Project\BBMPT1\MESWebSite\bin\roslyn\Microsoft.VisualBasic.Core.targets +D:\Project\BBMPT1\MESWebSite\bin\roslyn\System.AppContext.dll +D:\Project\BBMPT1\MESWebSite\bin\roslyn\System.Collections.Immutable.dll +D:\Project\BBMPT1\MESWebSite\bin\roslyn\System.Diagnostics.StackTrace.dll +D:\Project\BBMPT1\MESWebSite\bin\roslyn\System.IO.FileSystem.dll +D:\Project\BBMPT1\MESWebSite\bin\roslyn\System.IO.FileSystem.Primitives.dll +D:\Project\BBMPT1\MESWebSite\bin\roslyn\System.Reflection.Metadata.dll +D:\Project\BBMPT1\MESWebSite\bin\roslyn\vbc.exe +D:\Project\BBMPT1\MESWebSite\bin\roslyn\vbc.exe.config +D:\Project\BBMPT1\MESWebSite\bin\roslyn\vbc.rsp +D:\Project\BBMPT1\MESWebSite\bin\roslyn\VBCSCompiler.exe +D:\Project\BBMPT1\MESWebSite\bin\roslyn\VBCSCompiler.exe.config +D:\Project\BBMPT1\MESWebSite\bin\ICSharpCode.SharpZipLib.dll +D:\Project\BBMPT1\MESWebSite\bin\MESClassLibrary.dll +D:\Project\BBMPT1\MESWebSite\bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll +D:\Project\BBMPT1\MESWebSite\bin\Newtonsoft.Json.dll +D:\Project\BBMPT1\MESWebSite\bin\NPOI.dll +D:\Project\BBMPT1\MESWebSite\bin\NPOI.OOXML.dll +D:\Project\BBMPT1\MESWebSite\bin\NPOI.OpenXml4Net.dll +D:\Project\BBMPT1\MESWebSite\bin\NPOI.OpenXmlFormats.dll +D:\Project\BBMPT1\MESWebSite\bin\org.in2bits.MyXls.dll +D:\Project\BBMPT1\MESWebSite\bin\System.Web.Http.dll +D:\Project\BBMPT1\MESWebSite\bin\System.Web.Http.WebHost.dll +D:\Project\BBMPT1\MESWebSite\bin\EntityFramework.dll +D:\Project\BBMPT1\MESWebSite\bin\MESClassLibrary.pdb +D:\Project\BBMPT1\MESWebSite\bin\MESClassLibrary.dll.config +D:\Project\BBMPT1\MESWebSite\bin\ICSharpCode.SharpZipLib.xml +D:\Project\BBMPT1\MESWebSite\bin\System.Web.Http.xml +D:\Project\BBMPT1\MESWebSite\bin\System.Web.Http.WebHost.xml +D:\Project\BBMPT1\MESWebSite\bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.xml +D:\Project\BBMPT1\MESWebSite\bin\EntityFramework.xml +D:\Project\BBMPT1\MESWebSite\bin\zh-Hans\System.Web.Http.WebHost.resources.dll +D:\Project\BBMPT1\MESWebSite\bin\zh-Hans\EntityFramework.resources.dll +D:\Project\BBMPT1\MESWebSite\obj\Debug\MESWebSite.csproj.AssemblyReference.cache +D:\Project\BBMPT1\MESWebSite\obj\Debug\MESWebSite.csproj.CoreCompileInputs.cache +D:\Project\BBMPT1\MESWebSite\obj\Debug\MESWebSite.csproj.CopyComplete +D:\Project\BBMPT1\MESWebSite\obj\Debug\MESWebSite.dll +D:\Project\BBMPT1\MESWebSite\obj\Debug\MESWebSite.pdb diff --git a/MESWebSite/obj/Debug/MESWebSite.dll b/MESWebSite/obj/Debug/MESWebSite.dll index 07cce7c..1f10142 100644 Binary files a/MESWebSite/obj/Debug/MESWebSite.dll and b/MESWebSite/obj/Debug/MESWebSite.dll differ diff --git a/MESWebSite/obj/Debug/MESWebSite.pdb b/MESWebSite/obj/Debug/MESWebSite.pdb index 24f9c28..3048d16 100644 Binary files a/MESWebSite/obj/Debug/MESWebSite.pdb and b/MESWebSite/obj/Debug/MESWebSite.pdb differ diff --git a/MESWebSite/obj/Release/MESWebSite.csproj.AssemblyReference.cache b/MESWebSite/obj/Release/MESWebSite.csproj.AssemblyReference.cache index 6039779..49b6561 100644 Binary files a/MESWebSite/obj/Release/MESWebSite.csproj.AssemblyReference.cache and b/MESWebSite/obj/Release/MESWebSite.csproj.AssemblyReference.cache differ diff --git a/PaintingPC/App.config b/PaintingPC/App.config index 3b611b0..09dda2f 100644 --- a/PaintingPC/App.config +++ b/PaintingPC/App.config @@ -9,9 +9,11 @@ - - - + + + + + @@ -25,9 +27,13 @@ - - - + + + + + + + diff --git a/PaintingPC/FrmQuality.cs b/PaintingPC/FrmQuality.cs index 2eaaac3..cf21b23 100644 --- a/PaintingPC/FrmQuality.cs +++ b/PaintingPC/FrmQuality.cs @@ -340,7 +340,7 @@ namespace PaintingPC Clear(); return; } - SaveRst("其它", colorName, partName,8); + SaveRst("其它", colorName, partName,4); } /// @@ -461,7 +461,7 @@ namespace PaintingPC ClearControlColor(SetControlGroup()); btnAbt.BackColor = Color.Red; - SaveRst("报废", colorName, partName,0, userName); + SaveRst("报废", colorName, partName,2, userName); } }); diff --git a/PaintingPC/bin/Debug/PaintingPC.application b/PaintingPC/bin/Debug/PaintingPC.application index ff04ac5..5af67c7 100644 --- a/PaintingPC/bin/Debug/PaintingPC.application +++ b/PaintingPC/bin/Debug/PaintingPC.application @@ -14,7 +14,7 @@ - UotEMwEJZLKm7HvlGHFmHnd0YmWWE1gqlOzC9H3fb1I= + iUOYdaaVr09M4uYTx7xIpawj92Gql+tdHvsOH6T5xy0= diff --git a/PaintingPC/bin/Debug/PaintingPC.exe b/PaintingPC/bin/Debug/PaintingPC.exe index 1753e50..1fa304b 100644 Binary files a/PaintingPC/bin/Debug/PaintingPC.exe and b/PaintingPC/bin/Debug/PaintingPC.exe differ diff --git a/PaintingPC/bin/Debug/PaintingPC.exe.config b/PaintingPC/bin/Debug/PaintingPC.exe.config index 3b611b0..09dda2f 100644 --- a/PaintingPC/bin/Debug/PaintingPC.exe.config +++ b/PaintingPC/bin/Debug/PaintingPC.exe.config @@ -9,9 +9,11 @@ - - - + + + + + @@ -25,9 +27,13 @@ - - - + + + + + + + diff --git a/PaintingPC/bin/Debug/PaintingPC.exe.manifest b/PaintingPC/bin/Debug/PaintingPC.exe.manifest index fb4256d..12bb30f 100644 --- a/PaintingPC/bin/Debug/PaintingPC.exe.manifest +++ b/PaintingPC/bin/Debug/PaintingPC.exe.manifest @@ -4,7 +4,7 @@ - + @@ -43,14 +43,14 @@ - - + + - Fg25UaBBNneCjFMtPub0R8zrG3RQlnAly4pKa0whGRk= + IcB77b+fDi/5xQuEsSR1MtLMdpvgJsPLfSJ6TQFMThg= @@ -123,13 +123,13 @@ /uQ6NOiKipARWAMIHIywv4IPSBJlibxngNm707QBiGA= - + - OAcku6kL0eiZyBN4F8K6MT6PcRTfNLrlFXDL3zmawJU= + WKccJKkbQb/rdHfYAvKB1QrZIxaK4xqVbQJbHyspVlk= \ No newline at end of file diff --git a/PaintingPC/bin/Debug/PaintingPC.pdb b/PaintingPC/bin/Debug/PaintingPC.pdb index 37869f1..0bc5363 100644 Binary files a/PaintingPC/bin/Debug/PaintingPC.pdb and b/PaintingPC/bin/Debug/PaintingPC.pdb differ diff --git a/PaintingPC/bin/Debug/app.publish/PaintingPC.exe b/PaintingPC/bin/Debug/app.publish/PaintingPC.exe index 1753e50..1fa304b 100644 Binary files a/PaintingPC/bin/Debug/app.publish/PaintingPC.exe and b/PaintingPC/bin/Debug/app.publish/PaintingPC.exe differ diff --git a/PaintingPC/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/PaintingPC/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index ba3400c..d9fd8ed 100644 Binary files a/PaintingPC/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/PaintingPC/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/PaintingPC/obj/Debug/Interop.grproLib.dll b/PaintingPC/obj/Debug/Interop.grproLib.dll index c6c8c98..ef12130 100644 Binary files a/PaintingPC/obj/Debug/Interop.grproLib.dll and b/PaintingPC/obj/Debug/Interop.grproLib.dll differ diff --git a/PaintingPC/obj/Debug/PaintingPC.application b/PaintingPC/obj/Debug/PaintingPC.application index ff04ac5..5af67c7 100644 --- a/PaintingPC/obj/Debug/PaintingPC.application +++ b/PaintingPC/obj/Debug/PaintingPC.application @@ -14,7 +14,7 @@ - UotEMwEJZLKm7HvlGHFmHnd0YmWWE1gqlOzC9H3fb1I= + iUOYdaaVr09M4uYTx7xIpawj92Gql+tdHvsOH6T5xy0= diff --git a/PaintingPC/obj/Debug/PaintingPC.csproj.AssemblyReference.cache b/PaintingPC/obj/Debug/PaintingPC.csproj.AssemblyReference.cache index 1469aba..4fc7eb3 100644 Binary files a/PaintingPC/obj/Debug/PaintingPC.csproj.AssemblyReference.cache and b/PaintingPC/obj/Debug/PaintingPC.csproj.AssemblyReference.cache differ diff --git a/PaintingPC/obj/Debug/PaintingPC.csproj.CoreCompileInputs.cache b/PaintingPC/obj/Debug/PaintingPC.csproj.CoreCompileInputs.cache index b591970..02ade08 100644 --- a/PaintingPC/obj/Debug/PaintingPC.csproj.CoreCompileInputs.cache +++ b/PaintingPC/obj/Debug/PaintingPC.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -0f5902252714f4cdb689fd7529cf142adbc08b2f0f8ac93fdcc9bfa766233ae4 +76d19b436f0f41a99378bdf9b59cf9ab82185cc3 diff --git a/PaintingPC/obj/Debug/PaintingPC.csproj.FileListAbsolute.txt b/PaintingPC/obj/Debug/PaintingPC.csproj.FileListAbsolute.txt index 1f7d03b..3330823 100644 --- a/PaintingPC/obj/Debug/PaintingPC.csproj.FileListAbsolute.txt +++ b/PaintingPC/obj/Debug/PaintingPC.csproj.FileListAbsolute.txt @@ -107,3 +107,34 @@ D:\Project\2、北汽模塑一厂\SVN\新建文件夹\PaintingPC\obj\Debug\Paint D:\Project\2、北汽模塑一厂\SVN\新建文件夹\PaintingPC\obj\Debug\PaintingPC.csproj.CopyComplete D:\Project\2、北汽模塑一厂\SVN\新建文件夹\PaintingPC\obj\Debug\PaintingPC.exe D:\Project\2、北汽模塑一厂\SVN\新建文件夹\PaintingPC\obj\Debug\PaintingPC.pdb +D:\Project\BBMPT1\PaintingPC\bin\Debug\PaintingPC.exe.config +D:\Project\BBMPT1\PaintingPC\bin\Debug\PaintingPC.exe.manifest +D:\Project\BBMPT1\PaintingPC\bin\Debug\PaintingPC.application +D:\Project\BBMPT1\PaintingPC\bin\Debug\PaintingPC.exe +D:\Project\BBMPT1\PaintingPC\bin\Debug\PaintingPC.pdb +D:\Project\BBMPT1\PaintingPC\bin\Debug\SchTaskExtAPI.dll +D:\Project\BBMPT1\PaintingPC\bin\Debug\Tools.dll +D:\Project\BBMPT1\PaintingPC\obj\Debug\Interop.grproLib.dll +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.csproj.ResolveComReference.cache +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.FrmChainDownNew.resources +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.FrmChainDown.resources +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.FrmChainUp.resources +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.FrmChainUp1.resources +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.FrmChangeColor.resources +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.FrmChooseDamnPosition.resources +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.FrmDelChaimUp.resources +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.FrmMessage.resources +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.FrmPack.resources +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.FrmQuality.resources +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.FrmRePrint.resources +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.FrmTemp1.resources +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.Properties.Resources.resources +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.UC.resources +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.csproj.GenerateResource.cache +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.csproj.CoreCompileInputs.cache +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.exe.manifest +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.application +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.csproj.CopyComplete +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.exe +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.pdb +D:\Project\BBMPT1\PaintingPC\obj\Debug\PaintingPC.csproj.AssemblyReference.cache diff --git a/PaintingPC/obj/Debug/PaintingPC.csproj.GenerateResource.cache b/PaintingPC/obj/Debug/PaintingPC.csproj.GenerateResource.cache index 84f8d93..c38d95b 100644 Binary files a/PaintingPC/obj/Debug/PaintingPC.csproj.GenerateResource.cache and b/PaintingPC/obj/Debug/PaintingPC.csproj.GenerateResource.cache differ diff --git a/PaintingPC/obj/Debug/PaintingPC.exe b/PaintingPC/obj/Debug/PaintingPC.exe index 1753e50..1fa304b 100644 Binary files a/PaintingPC/obj/Debug/PaintingPC.exe and b/PaintingPC/obj/Debug/PaintingPC.exe differ diff --git a/PaintingPC/obj/Debug/PaintingPC.exe.manifest b/PaintingPC/obj/Debug/PaintingPC.exe.manifest index fb4256d..12bb30f 100644 --- a/PaintingPC/obj/Debug/PaintingPC.exe.manifest +++ b/PaintingPC/obj/Debug/PaintingPC.exe.manifest @@ -4,7 +4,7 @@ - + @@ -43,14 +43,14 @@ - - + + - Fg25UaBBNneCjFMtPub0R8zrG3RQlnAly4pKa0whGRk= + IcB77b+fDi/5xQuEsSR1MtLMdpvgJsPLfSJ6TQFMThg= @@ -123,13 +123,13 @@ /uQ6NOiKipARWAMIHIywv4IPSBJlibxngNm707QBiGA= - + - OAcku6kL0eiZyBN4F8K6MT6PcRTfNLrlFXDL3zmawJU= + WKccJKkbQb/rdHfYAvKB1QrZIxaK4xqVbQJbHyspVlk= \ No newline at end of file diff --git a/PaintingPC/obj/Debug/PaintingPC.pdb b/PaintingPC/obj/Debug/PaintingPC.pdb index 37869f1..0bc5363 100644 Binary files a/PaintingPC/obj/Debug/PaintingPC.pdb and b/PaintingPC/obj/Debug/PaintingPC.pdb differ diff --git a/PaintingPC/obj/Debug/TempPE/Web References.WebReference.Reference.cs.dll b/PaintingPC/obj/Debug/TempPE/Web References.WebReference.Reference.cs.dll index 875520a..8959e96 100644 Binary files a/PaintingPC/obj/Debug/TempPE/Web References.WebReference.Reference.cs.dll and b/PaintingPC/obj/Debug/TempPE/Web References.WebReference.Reference.cs.dll differ diff --git a/PaintingPC/obj/Release/Interop.grproLib.dll b/PaintingPC/obj/Release/Interop.grproLib.dll index 5e83ab2..d921c03 100644 Binary files a/PaintingPC/obj/Release/Interop.grproLib.dll and b/PaintingPC/obj/Release/Interop.grproLib.dll differ diff --git a/PaintingPC/obj/Release/PaintingPC.csproj.AssemblyReference.cache b/PaintingPC/obj/Release/PaintingPC.csproj.AssemblyReference.cache index 7bd4a8b..21c9501 100644 Binary files a/PaintingPC/obj/Release/PaintingPC.csproj.AssemblyReference.cache and b/PaintingPC/obj/Release/PaintingPC.csproj.AssemblyReference.cache differ diff --git a/PaintingPC/obj/Release/PaintingPC.csproj.ResolveComReference.cache b/PaintingPC/obj/Release/PaintingPC.csproj.ResolveComReference.cache index 9a3bdef..528b252 100644 Binary files a/PaintingPC/obj/Release/PaintingPC.csproj.ResolveComReference.cache and b/PaintingPC/obj/Release/PaintingPC.csproj.ResolveComReference.cache differ diff --git a/PaintingPC/obj/Release/TempPE/Web References.WebReference.Reference.cs.dll b/PaintingPC/obj/Release/TempPE/Web References.WebReference.Reference.cs.dll index e0e3512..c166d15 100644 Binary files a/PaintingPC/obj/Release/TempPE/Web References.WebReference.Reference.cs.dll and b/PaintingPC/obj/Release/TempPE/Web References.WebReference.Reference.cs.dll differ diff --git a/PaintingScreen/bin/MESClassLibrary.dll b/PaintingScreen/bin/MESClassLibrary.dll index 4c8c50f..41641ee 100644 Binary files a/PaintingScreen/bin/MESClassLibrary.dll and b/PaintingScreen/bin/MESClassLibrary.dll differ diff --git a/PaintingScreen/bin/MESClassLibrary.dll.config b/PaintingScreen/bin/MESClassLibrary.dll.config index fc1dd55..7dc4db2 100644 --- a/PaintingScreen/bin/MESClassLibrary.dll.config +++ b/PaintingScreen/bin/MESClassLibrary.dll.config @@ -15,13 +15,13 @@ - + - + diff --git a/PaintingScreen/bin/MESClassLibrary.pdb b/PaintingScreen/bin/MESClassLibrary.pdb index 1c2e21c..0b0d642 100644 Binary files a/PaintingScreen/bin/MESClassLibrary.pdb and b/PaintingScreen/bin/MESClassLibrary.pdb differ diff --git a/PaintingScreen/bin/PaintingScreen.dll b/PaintingScreen/bin/PaintingScreen.dll index 254dd01..74b77c0 100644 Binary files a/PaintingScreen/bin/PaintingScreen.dll and b/PaintingScreen/bin/PaintingScreen.dll differ diff --git a/PaintingScreen/bin/PaintingScreen.pdb b/PaintingScreen/bin/PaintingScreen.pdb index 7b9cdfd..d8c006e 100644 Binary files a/PaintingScreen/bin/PaintingScreen.pdb and b/PaintingScreen/bin/PaintingScreen.pdb differ diff --git a/PaintingScreen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/PaintingScreen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index f4c6493..bd28458 100644 Binary files a/PaintingScreen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/PaintingScreen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/PaintingScreen/obj/Debug/PaintingScreen.csproj.AssemblyReference.cache b/PaintingScreen/obj/Debug/PaintingScreen.csproj.AssemblyReference.cache index 2aaf361..18ebfed 100644 Binary files a/PaintingScreen/obj/Debug/PaintingScreen.csproj.AssemblyReference.cache and b/PaintingScreen/obj/Debug/PaintingScreen.csproj.AssemblyReference.cache differ diff --git a/PaintingScreen/obj/Debug/PaintingScreen.csproj.CoreCompileInputs.cache b/PaintingScreen/obj/Debug/PaintingScreen.csproj.CoreCompileInputs.cache index e97ebfd..a35673b 100644 --- a/PaintingScreen/obj/Debug/PaintingScreen.csproj.CoreCompileInputs.cache +++ b/PaintingScreen/obj/Debug/PaintingScreen.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d6e340e2d23fc428848dcc462b77e6163dd9d4a42378cf9d478438aba37d5e60 +896d073d07806d8199a0705251ff6cdd90621709 diff --git a/PaintingScreen/obj/Debug/PaintingScreen.csproj.FileListAbsolute.txt b/PaintingScreen/obj/Debug/PaintingScreen.csproj.FileListAbsolute.txt index 14c5460..0a292cb 100644 --- a/PaintingScreen/obj/Debug/PaintingScreen.csproj.FileListAbsolute.txt +++ b/PaintingScreen/obj/Debug/PaintingScreen.csproj.FileListAbsolute.txt @@ -49,3 +49,22 @@ D:\Project\2、北汽模塑一厂\SVN\新建文件夹\PaintingScreen\obj\Debug\P D:\Project\2、北汽模塑一厂\SVN\新建文件夹\PaintingScreen\obj\Debug\PaintingScreen.csproj.CopyComplete D:\Project\2、北汽模塑一厂\SVN\新建文件夹\PaintingScreen\obj\Debug\PaintingScreen.dll D:\Project\2、北汽模塑一厂\SVN\新建文件夹\PaintingScreen\obj\Debug\PaintingScreen.pdb +D:\Project\BBMPT1\PaintingScreen\bin\CSS\StyleSheetCommon.css +D:\Project\BBMPT1\PaintingScreen\bin\CSS\StyleSheetSpecial1.css +D:\Project\BBMPT1\PaintingScreen\bin\Handler\Handler.ashx +D:\Project\BBMPT1\PaintingScreen\bin\PaintingScreen.dll.config +D:\Project\BBMPT1\PaintingScreen\bin\PaintingScreen.dll +D:\Project\BBMPT1\PaintingScreen\bin\PaintingScreen.pdb +D:\Project\BBMPT1\PaintingScreen\bin\MESClassLibrary.dll +D:\Project\BBMPT1\PaintingScreen\bin\Tools.dll +D:\Project\BBMPT1\PaintingScreen\bin\EntityFramework.dll +D:\Project\BBMPT1\PaintingScreen\bin\Newtonsoft.Json.dll +D:\Project\BBMPT1\PaintingScreen\bin\MESClassLibrary.pdb +D:\Project\BBMPT1\PaintingScreen\bin\MESClassLibrary.dll.config +D:\Project\BBMPT1\PaintingScreen\bin\EntityFramework.xml +D:\Project\BBMPT1\PaintingScreen\bin\zh-Hans\EntityFramework.resources.dll +D:\Project\BBMPT1\PaintingScreen\obj\Debug\PaintingScreen.csproj.AssemblyReference.cache +D:\Project\BBMPT1\PaintingScreen\obj\Debug\PaintingScreen.csproj.CoreCompileInputs.cache +D:\Project\BBMPT1\PaintingScreen\obj\Debug\PaintingScreen.csproj.CopyComplete +D:\Project\BBMPT1\PaintingScreen\obj\Debug\PaintingScreen.dll +D:\Project\BBMPT1\PaintingScreen\obj\Debug\PaintingScreen.pdb diff --git a/PaintingScreen/obj/Debug/PaintingScreen.dll b/PaintingScreen/obj/Debug/PaintingScreen.dll index 254dd01..74b77c0 100644 Binary files a/PaintingScreen/obj/Debug/PaintingScreen.dll and b/PaintingScreen/obj/Debug/PaintingScreen.dll differ diff --git a/PaintingScreen/obj/Debug/PaintingScreen.pdb b/PaintingScreen/obj/Debug/PaintingScreen.pdb index 7b9cdfd..d8c006e 100644 Binary files a/PaintingScreen/obj/Debug/PaintingScreen.pdb and b/PaintingScreen/obj/Debug/PaintingScreen.pdb differ diff --git a/PaintingScreen/obj/Release/PaintingScreen.csproj.AssemblyReference.cache b/PaintingScreen/obj/Release/PaintingScreen.csproj.AssemblyReference.cache index 10b5559..faf2a50 100644 Binary files a/PaintingScreen/obj/Release/PaintingScreen.csproj.AssemblyReference.cache and b/PaintingScreen/obj/Release/PaintingScreen.csproj.AssemblyReference.cache differ diff --git a/PaintingView/bin/Debug/MESClassLibrary.dll b/PaintingView/bin/Debug/MESClassLibrary.dll index 4dbd39a..41641ee 100644 Binary files a/PaintingView/bin/Debug/MESClassLibrary.dll and b/PaintingView/bin/Debug/MESClassLibrary.dll differ diff --git a/PaintingView/bin/Debug/MESClassLibrary.dll.config b/PaintingView/bin/Debug/MESClassLibrary.dll.config index fc1dd55..7dc4db2 100644 --- a/PaintingView/bin/Debug/MESClassLibrary.dll.config +++ b/PaintingView/bin/Debug/MESClassLibrary.dll.config @@ -15,13 +15,13 @@ - + - + diff --git a/PaintingView/bin/Debug/MESClassLibrary.pdb b/PaintingView/bin/Debug/MESClassLibrary.pdb index 8380b50..0b0d642 100644 Binary files a/PaintingView/bin/Debug/MESClassLibrary.pdb and b/PaintingView/bin/Debug/MESClassLibrary.pdb differ diff --git a/PaintingView/bin/Debug/PaintingView.exe b/PaintingView/bin/Debug/PaintingView.exe index 7586b73..22a949f 100644 Binary files a/PaintingView/bin/Debug/PaintingView.exe and b/PaintingView/bin/Debug/PaintingView.exe differ diff --git a/PaintingView/bin/Debug/PaintingView.pdb b/PaintingView/bin/Debug/PaintingView.pdb index 000218d..63d011e 100644 Binary files a/PaintingView/bin/Debug/PaintingView.pdb and b/PaintingView/bin/Debug/PaintingView.pdb differ diff --git a/PaintingView/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/PaintingView/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 1078187..f5e894a 100644 Binary files a/PaintingView/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/PaintingView/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/PaintingView/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/PaintingView/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 6dc0e30..380ad75 100644 Binary files a/PaintingView/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/PaintingView/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/PaintingView/obj/Debug/PaintingView.csproj.AssemblyReference.cache b/PaintingView/obj/Debug/PaintingView.csproj.AssemblyReference.cache index 80ab3cc..a61567d 100644 Binary files a/PaintingView/obj/Debug/PaintingView.csproj.AssemblyReference.cache and b/PaintingView/obj/Debug/PaintingView.csproj.AssemblyReference.cache differ diff --git a/PaintingView/obj/Debug/PaintingView.csproj.CoreCompileInputs.cache b/PaintingView/obj/Debug/PaintingView.csproj.CoreCompileInputs.cache index 8e54677..2ec3c5d 100644 --- a/PaintingView/obj/Debug/PaintingView.csproj.CoreCompileInputs.cache +++ b/PaintingView/obj/Debug/PaintingView.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -9f36185936139f50078323c8222770127fc58aad52e0073f1a43b41ba335bcf5 +85bc63fbe0513f555f4091cc2a6dc30f864787ef diff --git a/PaintingView/obj/Debug/PaintingView.csproj.FileListAbsolute.txt b/PaintingView/obj/Debug/PaintingView.csproj.FileListAbsolute.txt index 6a0d409..8201a2e 100644 --- a/PaintingView/obj/Debug/PaintingView.csproj.FileListAbsolute.txt +++ b/PaintingView/obj/Debug/PaintingView.csproj.FileListAbsolute.txt @@ -47,3 +47,26 @@ D:\Project\2、北汽模塑一厂\SVN\新建文件夹\PaintingView\obj\Debug\Pai D:\Project\2、北汽模塑一厂\SVN\新建文件夹\PaintingView\obj\Debug\PaintingView.csproj.CopyComplete D:\Project\2、北汽模塑一厂\SVN\新建文件夹\PaintingView\obj\Debug\PaintingView.exe D:\Project\2、北汽模塑一厂\SVN\新建文件夹\PaintingView\obj\Debug\PaintingView.pdb +D:\Project\BBMPT1\PaintingView\bin\Debug\PaintingView.exe.config +D:\Project\BBMPT1\PaintingView\bin\Debug\PaintingView.exe +D:\Project\BBMPT1\PaintingView\bin\Debug\PaintingView.pdb +D:\Project\BBMPT1\PaintingView\bin\Debug\GlacialList.dll +D:\Project\BBMPT1\PaintingView\bin\Debug\MESClassLibrary.dll +D:\Project\BBMPT1\PaintingView\bin\Debug\EntityFramework.dll +D:\Project\BBMPT1\PaintingView\bin\Debug\Newtonsoft.Json.dll +D:\Project\BBMPT1\PaintingView\bin\Debug\MESClassLibrary.pdb +D:\Project\BBMPT1\PaintingView\bin\Debug\MESClassLibrary.dll.config +D:\Project\BBMPT1\PaintingView\bin\Debug\EntityFramework.xml +D:\Project\BBMPT1\PaintingView\bin\Debug\zh-Hans\EntityFramework.resources.dll +D:\Project\BBMPT1\PaintingView\obj\Debug\PaintingView.csproj.AssemblyReference.cache +D:\Project\BBMPT1\PaintingView\obj\Debug\Interop.grdesLib.dll +D:\Project\BBMPT1\PaintingView\obj\Debug\Interop.grproLib.dll +D:\Project\BBMPT1\PaintingView\obj\Debug\PaintingView.csproj.ResolveComReference.cache +D:\Project\BBMPT1\PaintingView\obj\Debug\PaintingView.Form1.resources +D:\Project\BBMPT1\PaintingView\obj\Debug\PaintingView.FrmDetail.resources +D:\Project\BBMPT1\PaintingView\obj\Debug\PaintingView.Properties.Resources.resources +D:\Project\BBMPT1\PaintingView\obj\Debug\PaintingView.csproj.GenerateResource.cache +D:\Project\BBMPT1\PaintingView\obj\Debug\PaintingView.csproj.CoreCompileInputs.cache +D:\Project\BBMPT1\PaintingView\obj\Debug\PaintingView.csproj.CopyComplete +D:\Project\BBMPT1\PaintingView\obj\Debug\PaintingView.exe +D:\Project\BBMPT1\PaintingView\obj\Debug\PaintingView.pdb diff --git a/PaintingView/obj/Debug/PaintingView.csproj.GenerateResource.cache b/PaintingView/obj/Debug/PaintingView.csproj.GenerateResource.cache index 93672a0..f6db39c 100644 Binary files a/PaintingView/obj/Debug/PaintingView.csproj.GenerateResource.cache and b/PaintingView/obj/Debug/PaintingView.csproj.GenerateResource.cache differ diff --git a/PaintingView/obj/Debug/PaintingView.exe b/PaintingView/obj/Debug/PaintingView.exe index 7586b73..22a949f 100644 Binary files a/PaintingView/obj/Debug/PaintingView.exe and b/PaintingView/obj/Debug/PaintingView.exe differ diff --git a/PaintingView/obj/Debug/PaintingView.pdb b/PaintingView/obj/Debug/PaintingView.pdb index 000218d..63d011e 100644 Binary files a/PaintingView/obj/Debug/PaintingView.pdb and b/PaintingView/obj/Debug/PaintingView.pdb differ diff --git a/PaintingView/obj/Release/Interop.grdesLib.dll b/PaintingView/obj/Release/Interop.grdesLib.dll index bf52d8c..38553ca 100644 Binary files a/PaintingView/obj/Release/Interop.grdesLib.dll and b/PaintingView/obj/Release/Interop.grdesLib.dll differ diff --git a/PaintingView/obj/Release/Interop.grproLib.dll b/PaintingView/obj/Release/Interop.grproLib.dll index fed7a9a..dae83d5 100644 Binary files a/PaintingView/obj/Release/Interop.grproLib.dll and b/PaintingView/obj/Release/Interop.grproLib.dll differ diff --git a/PaintingView/obj/Release/PaintingView.csproj.AssemblyReference.cache b/PaintingView/obj/Release/PaintingView.csproj.AssemblyReference.cache index 7bf50ff..84cc711 100644 Binary files a/PaintingView/obj/Release/PaintingView.csproj.AssemblyReference.cache and b/PaintingView/obj/Release/PaintingView.csproj.AssemblyReference.cache differ diff --git a/PaintingView/obj/Release/PaintingView.csproj.ResolveComReference.cache b/PaintingView/obj/Release/PaintingView.csproj.ResolveComReference.cache index 3b4fb2d..d91e993 100644 Binary files a/PaintingView/obj/Release/PaintingView.csproj.ResolveComReference.cache and b/PaintingView/obj/Release/PaintingView.csproj.ResolveComReference.cache differ diff --git a/PunchingMistake/bin/Debug/MESClassLibrary.dll b/PunchingMistake/bin/Debug/MESClassLibrary.dll index 4dbd39a..41641ee 100644 Binary files a/PunchingMistake/bin/Debug/MESClassLibrary.dll and b/PunchingMistake/bin/Debug/MESClassLibrary.dll differ diff --git a/PunchingMistake/bin/Debug/MESClassLibrary.dll.config b/PunchingMistake/bin/Debug/MESClassLibrary.dll.config index fc1dd55..7dc4db2 100644 --- a/PunchingMistake/bin/Debug/MESClassLibrary.dll.config +++ b/PunchingMistake/bin/Debug/MESClassLibrary.dll.config @@ -15,13 +15,13 @@ - + - + diff --git a/PunchingMistake/bin/Debug/MESClassLibrary.pdb b/PunchingMistake/bin/Debug/MESClassLibrary.pdb index 8380b50..0b0d642 100644 Binary files a/PunchingMistake/bin/Debug/MESClassLibrary.pdb and b/PunchingMistake/bin/Debug/MESClassLibrary.pdb differ diff --git a/PunchingMistake/bin/Debug/PunchingMistake.exe b/PunchingMistake/bin/Debug/PunchingMistake.exe index 6a57946..bd2db0b 100644 Binary files a/PunchingMistake/bin/Debug/PunchingMistake.exe and b/PunchingMistake/bin/Debug/PunchingMistake.exe differ diff --git a/PunchingMistake/bin/Debug/PunchingMistake.pdb b/PunchingMistake/bin/Debug/PunchingMistake.pdb index 1b5451e..e6035b2 100644 Binary files a/PunchingMistake/bin/Debug/PunchingMistake.pdb and b/PunchingMistake/bin/Debug/PunchingMistake.pdb differ diff --git a/PunchingMistake/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/PunchingMistake/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d468bce..411608a 100644 Binary files a/PunchingMistake/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/PunchingMistake/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/PunchingMistake/obj/Debug/PunchingMistake.csproj.AssemblyReference.cache b/PunchingMistake/obj/Debug/PunchingMistake.csproj.AssemblyReference.cache index 7ba9e27..7fe0698 100644 Binary files a/PunchingMistake/obj/Debug/PunchingMistake.csproj.AssemblyReference.cache and b/PunchingMistake/obj/Debug/PunchingMistake.csproj.AssemblyReference.cache differ diff --git a/PunchingMistake/obj/Debug/PunchingMistake.csproj.CoreCompileInputs.cache b/PunchingMistake/obj/Debug/PunchingMistake.csproj.CoreCompileInputs.cache index b255a5d..a6e7667 100644 --- a/PunchingMistake/obj/Debug/PunchingMistake.csproj.CoreCompileInputs.cache +++ b/PunchingMistake/obj/Debug/PunchingMistake.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -67ac350ff71280a1adf1f93270040d855795fab963c0eb4e53e73cb920771117 +fc0921a78bf1cf56ff8dd3bc76d8e6f166de02f3 diff --git a/PunchingMistake/obj/Debug/PunchingMistake.csproj.FileListAbsolute.txt b/PunchingMistake/obj/Debug/PunchingMistake.csproj.FileListAbsolute.txt index 42fb0ee..88353b2 100644 --- a/PunchingMistake/obj/Debug/PunchingMistake.csproj.FileListAbsolute.txt +++ b/PunchingMistake/obj/Debug/PunchingMistake.csproj.FileListAbsolute.txt @@ -64,3 +64,27 @@ D:\Project\2、北汽模塑一厂\SVN\新建文件夹\PunchingMistake\obj\Debug\ D:\Project\2、北汽模塑一厂\SVN\新建文件夹\PunchingMistake\obj\Debug\PunchingMistake.csproj.CopyComplete D:\Project\2、北汽模塑一厂\SVN\新建文件夹\PunchingMistake\obj\Debug\PunchingMistake.exe D:\Project\2、北汽模塑一厂\SVN\新建文件夹\PunchingMistake\obj\Debug\PunchingMistake.pdb +D:\Project\BBMPT1\PunchingMistake\bin\Debug\PunchingMistake.exe.config +D:\Project\BBMPT1\PunchingMistake\bin\Debug\PunchingMistake.exe +D:\Project\BBMPT1\PunchingMistake\bin\Debug\PunchingMistake.pdb +D:\Project\BBMPT1\PunchingMistake\bin\Debug\MESClassLibrary.dll +D:\Project\BBMPT1\PunchingMistake\bin\Debug\EntityFramework.dll +D:\Project\BBMPT1\PunchingMistake\bin\Debug\Newtonsoft.Json.dll +D:\Project\BBMPT1\PunchingMistake\bin\Debug\MESClassLibrary.pdb +D:\Project\BBMPT1\PunchingMistake\bin\Debug\MESClassLibrary.dll.config +D:\Project\BBMPT1\PunchingMistake\bin\Debug\EntityFramework.xml +D:\Project\BBMPT1\PunchingMistake\bin\Debug\zh-Hans\EntityFramework.resources.dll +D:\Project\BBMPT1\PunchingMistake\obj\Debug\PunchingMistake.csproj.AssemblyReference.cache +D:\Project\BBMPT1\PunchingMistake\obj\Debug\Interop.grdes6Lib.dll +D:\Project\BBMPT1\PunchingMistake\obj\Debug\Interop.grdesLib.dll +D:\Project\BBMPT1\PunchingMistake\obj\Debug\Interop.gregn6Lib.dll +D:\Project\BBMPT1\PunchingMistake\obj\Debug\Interop.grproLib.dll +D:\Project\BBMPT1\PunchingMistake\obj\Debug\PunchingMistake.csproj.ResolveComReference.cache +D:\Project\BBMPT1\PunchingMistake\obj\Debug\PunchingMistake.Form1.resources +D:\Project\BBMPT1\PunchingMistake\obj\Debug\PunchingMistake.FrmScan.resources +D:\Project\BBMPT1\PunchingMistake\obj\Debug\PunchingMistake.Properties.Resources.resources +D:\Project\BBMPT1\PunchingMistake\obj\Debug\PunchingMistake.csproj.GenerateResource.cache +D:\Project\BBMPT1\PunchingMistake\obj\Debug\PunchingMistake.csproj.CoreCompileInputs.cache +D:\Project\BBMPT1\PunchingMistake\obj\Debug\PunchingMistake.csproj.CopyComplete +D:\Project\BBMPT1\PunchingMistake\obj\Debug\PunchingMistake.exe +D:\Project\BBMPT1\PunchingMistake\obj\Debug\PunchingMistake.pdb diff --git a/PunchingMistake/obj/Debug/PunchingMistake.csproj.GenerateResource.cache b/PunchingMistake/obj/Debug/PunchingMistake.csproj.GenerateResource.cache index 93672a0..f6db39c 100644 Binary files a/PunchingMistake/obj/Debug/PunchingMistake.csproj.GenerateResource.cache and b/PunchingMistake/obj/Debug/PunchingMistake.csproj.GenerateResource.cache differ diff --git a/PunchingMistake/obj/Debug/PunchingMistake.exe b/PunchingMistake/obj/Debug/PunchingMistake.exe index 6a57946..bd2db0b 100644 Binary files a/PunchingMistake/obj/Debug/PunchingMistake.exe and b/PunchingMistake/obj/Debug/PunchingMistake.exe differ diff --git a/PunchingMistake/obj/Debug/PunchingMistake.pdb b/PunchingMistake/obj/Debug/PunchingMistake.pdb index 1b5451e..e6035b2 100644 Binary files a/PunchingMistake/obj/Debug/PunchingMistake.pdb and b/PunchingMistake/obj/Debug/PunchingMistake.pdb differ diff --git a/PunchingMistake/obj/Release/Interop.grdes6Lib.dll b/PunchingMistake/obj/Release/Interop.grdes6Lib.dll index db77fd4..866a5a9 100644 Binary files a/PunchingMistake/obj/Release/Interop.grdes6Lib.dll and b/PunchingMistake/obj/Release/Interop.grdes6Lib.dll differ diff --git a/PunchingMistake/obj/Release/Interop.grdesLib.dll b/PunchingMistake/obj/Release/Interop.grdesLib.dll index 2a47ef5..b6fc19d 100644 Binary files a/PunchingMistake/obj/Release/Interop.grdesLib.dll and b/PunchingMistake/obj/Release/Interop.grdesLib.dll differ diff --git a/PunchingMistake/obj/Release/Interop.gregn6Lib.dll b/PunchingMistake/obj/Release/Interop.gregn6Lib.dll index 7d20c81..67910e8 100644 Binary files a/PunchingMistake/obj/Release/Interop.gregn6Lib.dll and b/PunchingMistake/obj/Release/Interop.gregn6Lib.dll differ diff --git a/PunchingMistake/obj/Release/Interop.grproLib.dll b/PunchingMistake/obj/Release/Interop.grproLib.dll index 08e7346..ada89e1 100644 Binary files a/PunchingMistake/obj/Release/Interop.grproLib.dll and b/PunchingMistake/obj/Release/Interop.grproLib.dll differ diff --git a/PunchingMistake/obj/Release/PunchingMistake.csproj.ResolveComReference.cache b/PunchingMistake/obj/Release/PunchingMistake.csproj.ResolveComReference.cache index 87a9c42..c52975e 100644 Binary files a/PunchingMistake/obj/Release/PunchingMistake.csproj.ResolveComReference.cache and b/PunchingMistake/obj/Release/PunchingMistake.csproj.ResolveComReference.cache differ diff --git a/Updater/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Updater/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 100f02f..255b7de 100644 Binary files a/Updater/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Updater/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Updater/obj/Debug/Updater.csproj.CoreCompileInputs.cache b/Updater/obj/Debug/Updater.csproj.CoreCompileInputs.cache index 04a5d2f..8862471 100644 --- a/Updater/obj/Debug/Updater.csproj.CoreCompileInputs.cache +++ b/Updater/obj/Debug/Updater.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d890630fbc65bdfa044a5910a29dca2f0d3e439ae83d3eb83cdc8cf3980decf7 +ee13c27e086190c5fc16eada1d2a2b578a4f8310 diff --git a/Updater/obj/Debug/Updater.csproj.FileListAbsolute.txt b/Updater/obj/Debug/Updater.csproj.FileListAbsolute.txt index e98356d..f1f8478 100644 --- a/Updater/obj/Debug/Updater.csproj.FileListAbsolute.txt +++ b/Updater/obj/Debug/Updater.csproj.FileListAbsolute.txt @@ -26,3 +26,13 @@ D:\Project\2、北汽模塑一厂\SVN\新建文件夹\Updater\obj\Debug\Updater. D:\Project\2、北汽模塑一厂\SVN\新建文件夹\Updater\obj\Debug\Updater.csproj.CoreCompileInputs.cache D:\Project\2、北汽模塑一厂\SVN\新建文件夹\Updater\obj\Debug\Updater.exe D:\Project\2、北汽模塑一厂\SVN\新建文件夹\Updater\obj\Debug\Updater.pdb +D:\Project\Publish\Debug\UniApi\Updater.exe.config +D:\Project\Publish\Debug\UniApi\Updater.exe +D:\Project\Publish\Debug\UniApi\Updater.pdb +D:\Project\BBMPT1\Updater\obj\Debug\Updater.csproj.AssemblyReference.cache +D:\Project\BBMPT1\Updater\obj\Debug\ChangKeTec.Wms.Updater.FormAutoUpdate.resources +D:\Project\BBMPT1\Updater\obj\Debug\ChangKeTec.Wms.Updater.Properties.Resources.resources +D:\Project\BBMPT1\Updater\obj\Debug\Updater.csproj.GenerateResource.cache +D:\Project\BBMPT1\Updater\obj\Debug\Updater.csproj.CoreCompileInputs.cache +D:\Project\BBMPT1\Updater\obj\Debug\Updater.exe +D:\Project\BBMPT1\Updater\obj\Debug\Updater.pdb diff --git a/Updater/obj/Debug/Updater.csproj.GenerateResource.cache b/Updater/obj/Debug/Updater.csproj.GenerateResource.cache index 4e61cf0..5da68b3 100644 Binary files a/Updater/obj/Debug/Updater.csproj.GenerateResource.cache and b/Updater/obj/Debug/Updater.csproj.GenerateResource.cache differ diff --git a/Updater/obj/Debug/Updater.exe b/Updater/obj/Debug/Updater.exe index 1377cfb..615c364 100644 Binary files a/Updater/obj/Debug/Updater.exe and b/Updater/obj/Debug/Updater.exe differ diff --git a/Updater/obj/Debug/Updater.pdb b/Updater/obj/Debug/Updater.pdb index c8ead27..707e6f2 100644 Binary files a/Updater/obj/Debug/Updater.pdb and b/Updater/obj/Debug/Updater.pdb differ diff --git a/Updater/obj/Release/Updater.csproj.AssemblyReference.cache b/Updater/obj/Release/Updater.csproj.AssemblyReference.cache index 12219f0..c4bbaec 100644 Binary files a/Updater/obj/Release/Updater.csproj.AssemblyReference.cache and b/Updater/obj/Release/Updater.csproj.AssemblyReference.cache differ diff --git a/WebService/Function.cs b/WebService/Function.cs index 0fad5c5..1f1ae8c 100644 --- a/WebService/Function.cs +++ b/WebService/Function.cs @@ -1137,23 +1137,19 @@ namespace Webservice productName = inspectTable.Rows[0]["remark2"].ToString(); carType = inspectTable.Rows[0]["CarType"].ToString(); paintColor = inspectTable.Rows[0]["remark1"].ToString(); - //返喷状态 - int rePaint = GetRepainState(inspectTable); - pRepaint = rePaint; - + string lastState = string.Empty; if (inspectTable.Rows.Count > 1) { lastState = inspectTable.Rows[1]["inspectResult"].ToString(); } //返喷状态 - pRepaint = GetRapaintState(inspectTable); + int rePaint = GetRepaintStateNew(inspectTable); + pRepaint = rePaint; //合格 1 最近一条是报废记录,可以重发. 否则不可以. if (state == 1) { - - //第一次合格 if (string.IsNullOrEmpty(lastState)) { @@ -1359,7 +1355,7 @@ namespace Webservice /// /// /// - static int GetRapaintState(DataTable inspectTable) + static int GetRepaintState(DataTable inspectTable) { int rePaintCount = inspectTable.AsEnumerable().Count(p => p.Field("inspectResult").Contains("返喷")); int reOtherCount = inspectTable.AsEnumerable().Count(p => p.Field("inspectResult").Contains("其它")); @@ -1380,44 +1376,37 @@ namespace Webservice return 0; } } - /// - /// 计算返喷状态 线边返喷=1,库房判定返喷=2 其它状态=9 正常=0 - /// - /// - /// - static int GetRepainState(DataTable inspectTable) + static int GetRepaintStateNew(DataTable inspectTable) { - int rePaint = 0; //0:未返喷,1:喷涂线边判断返喷 2:物流仓库判定返喷 - List paintRows = inspectTable.AsEnumerable().Where(p => p.Field("inspectResult").Contains("打磨")).ToList(); - if (paintRows.Count > 0) + if (inspectTable.Rows.Count < 2) { - List wmsPaintRows = paintRows.Where(p => p.Field("inspectResult").Contains("打磨WMS")).ToList(); - if (wmsPaintRows.Count > 0) - { - rePaint = 2; - } - else - { - rePaint = 1; - } + return 0; + } + + string lastState = inspectTable.Rows[1]["inspectResult"].ToString(); + if(lastState == "打磨") + { + return 1; + } + else if (lastState.ToUpper() == "打磨WMS") + { + return 2; + } + else if (lastState.ToUpper() == "其它WMS") + { + return 3; + } + else if (lastState == "其它") + { + return 4; } else { - List paintRows2 = inspectTable.AsEnumerable().Where(p => p.Field("inspectResult").Contains("其它")).ToList(); - if (paintRows2.Count > 0) - { - rePaint = 9; - } - else - { - rePaint = 0; - } - //rePaint = 0; + return 0; } - - return rePaint; + } - + /// /// 将二维码转换成相应一维码 /// diff --git a/WebService/Properties/Settings.settings b/WebService/Properties/Settings.settings index 24ff054..17b281e 100644 --- a/WebService/Properties/Settings.settings +++ b/WebService/Properties/Settings.settings @@ -3,7 +3,7 @@ - http://10.60.101.2:88/JsonService.asmx + http://10.60.101.97:8018/JsonService.asmx \ No newline at end of file diff --git a/WebService/Web References/WebReference/JsonService.disco b/WebService/Web References/WebReference/JsonService.disco index b533f04..c1f69c2 100644 --- a/WebService/Web References/WebReference/JsonService.disco +++ b/WebService/Web References/WebReference/JsonService.disco @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file diff --git a/WebService/Web References/WebReference/JsonService.wsdl b/WebService/Web References/WebReference/JsonService.wsdl index fc117d5..6c8943e 100644 --- a/WebService/Web References/WebReference/JsonService.wsdl +++ b/WebService/Web References/WebReference/JsonService.wsdl @@ -12,6 +12,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -138,6 +201,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -153,6 +244,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -168,6 +309,21 @@ + + + + + + + + + + + + + + + @@ -193,6 +349,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -247,18 +427,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -269,6 +485,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -325,6 +572,18 @@ + + + + + + + + + + + + @@ -332,6 +591,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -339,6 +624,13 @@ + + + + + + + @@ -349,6 +641,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -405,6 +728,18 @@ + + + + + + + + + + + + @@ -412,6 +747,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,6 +780,13 @@ + + + + + + + @@ -430,6 +798,22 @@ + + + + + + + + + + + + + + + + @@ -466,14 +850,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -484,6 +892,22 @@ + + + + + + + + + + + + + + + + @@ -520,14 +944,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -538,6 +986,22 @@ + + + + + + + + + + + + + + + + @@ -574,14 +1038,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -598,6 +1086,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -679,6 +1203,24 @@ + + + + + + + + + + + + + + + + + + @@ -688,6 +1230,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -697,6 +1266,15 @@ + + + + + + + + + @@ -718,6 +1296,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -799,6 +1413,24 @@ + + + + + + + + + + + + + + + + + + @@ -808,6 +1440,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -817,6 +1476,15 @@ + + + + + + + + + @@ -838,6 +1506,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -919,6 +1623,24 @@ + + + + + + + + + + + + + + + + + + @@ -928,6 +1650,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -937,6 +1686,15 @@ + + + + + + + + + @@ -958,6 +1716,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1039,6 +1833,24 @@ + + + + + + + + + + + + + + + + + + @@ -1048,6 +1860,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1057,6 +1896,15 @@ + + + + + + + + + @@ -1069,16 +1917,16 @@ - + - + - + - + \ No newline at end of file diff --git a/WebService/Web References/WebReference/Reference.map b/WebService/Web References/WebReference/Reference.map index 3ada245..296c9eb 100644 --- a/WebService/Web References/WebReference/Reference.map +++ b/WebService/Web References/WebReference/Reference.map @@ -1,7 +1,7 @@ - - + + \ No newline at end of file diff --git a/WebService/Web.config b/WebService/Web.config index b8c698b..3c9e3a6 100644 --- a/WebService/Web.config +++ b/WebService/Web.config @@ -18,15 +18,26 @@ - - - + + + + + + + + + + - - + + + + + + + + + + http://10.60.101.97:8016/JsonService.asmx + + + \ No newline at end of file diff --git a/WebService/WebService.csproj.user b/WebService/WebService.csproj.user index ccb19f7..e32f45c 100644 --- a/WebService/WebService.csproj.user +++ b/WebService/WebService.csproj.user @@ -2,7 +2,7 @@ Debug|Any CPU - D:\Project\2、北汽模塑一厂\SVN\Code\WebService\Properties\PublishProfiles\FolderProfile.pubxml + D:\Project\BBMPT1\WebService\Properties\PublishProfiles\FolderProfile1.pubxml true @@ -15,7 +15,7 @@ - PaintWebservice.asmx + WMSWebService.asmx SpecificPage True False diff --git a/WebService/bin/MESClassLibrary.dll b/WebService/bin/MESClassLibrary.dll index 4c8c50f..41641ee 100644 Binary files a/WebService/bin/MESClassLibrary.dll and b/WebService/bin/MESClassLibrary.dll differ diff --git a/WebService/bin/MESClassLibrary.dll.config b/WebService/bin/MESClassLibrary.dll.config index fc1dd55..7dc4db2 100644 --- a/WebService/bin/MESClassLibrary.dll.config +++ b/WebService/bin/MESClassLibrary.dll.config @@ -15,13 +15,13 @@ - + - + diff --git a/WebService/bin/MESClassLibrary.pdb b/WebService/bin/MESClassLibrary.pdb index 1c2e21c..0b0d642 100644 Binary files a/WebService/bin/MESClassLibrary.pdb and b/WebService/bin/MESClassLibrary.pdb differ diff --git a/WebService/bin/Web.config b/WebService/bin/Web.config index b8c698b..3c9e3a6 100644 --- a/WebService/bin/Web.config +++ b/WebService/bin/Web.config @@ -18,15 +18,26 @@ - - - + + + + + + + + + + - - + + + + + + + + + + http://10.60.101.97:8016/JsonService.asmx + + + \ No newline at end of file diff --git a/WebService/bin/WebService.XmlSerializers.dll b/WebService/bin/WebService.XmlSerializers.dll index 3507ee9..9bee2b5 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 af46872..8af281f 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 b8c698b..3c9e3a6 100644 --- a/WebService/bin/WebService.dll.config +++ b/WebService/bin/WebService.dll.config @@ -18,15 +18,26 @@ - - - + + + + + + + + + + - - + + + + + + + + + + http://10.60.101.97:8016/JsonService.asmx + + + \ No newline at end of file diff --git a/WebService/bin/WebService.pdb b/WebService/bin/WebService.pdb index f2bac33..07e968d 100644 Binary files a/WebService/bin/WebService.pdb and b/WebService/bin/WebService.pdb differ diff --git a/WebService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WebService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 9649dd0..5901a91 100644 Binary files a/WebService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/WebService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/WebService/obj/Debug/TempPE/Web References.WebReference.Reference.cs.dll b/WebService/obj/Debug/TempPE/Web References.WebReference.Reference.cs.dll index 114ec83..01fc5c5 100644 Binary files a/WebService/obj/Debug/TempPE/Web References.WebReference.Reference.cs.dll and b/WebService/obj/Debug/TempPE/Web References.WebReference.Reference.cs.dll differ diff --git a/WebService/obj/Debug/WebService.csproj.AssemblyReference.cache b/WebService/obj/Debug/WebService.csproj.AssemblyReference.cache index 85cb5b0..dc1f19c 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.CoreCompileInputs.cache b/WebService/obj/Debug/WebService.csproj.CoreCompileInputs.cache index dcf7761..fe2ec20 100644 --- a/WebService/obj/Debug/WebService.csproj.CoreCompileInputs.cache +++ b/WebService/obj/Debug/WebService.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8d0aeee86c998cba00551e94417727cd42a571297ed9de4eac174dba89a5d4d8 +e5b683ce40ef4a0d5448933cc1e4cb12168ceaaa diff --git a/WebService/obj/Debug/WebService.csproj.FileListAbsolute.txt b/WebService/obj/Debug/WebService.csproj.FileListAbsolute.txt index 01f3e87..733f688 100644 --- a/WebService/obj/Debug/WebService.csproj.FileListAbsolute.txt +++ b/WebService/obj/Debug/WebService.csproj.FileListAbsolute.txt @@ -62,3 +62,22 @@ D:\Project\2、北汽模塑一厂\SVN\新建文件夹\WebService\obj\Debug\WebSe D:\Project\2、北汽模塑一厂\SVN\新建文件夹\WebService\obj\Debug\WebService.csproj.CopyComplete D:\Project\2、北汽模塑一厂\SVN\新建文件夹\WebService\obj\Debug\WebService.dll D:\Project\2、北汽模塑一厂\SVN\新建文件夹\WebService\obj\Debug\WebService.pdb +D:\Project\BBMPT1\WebService\bin\Web.config +D:\Project\BBMPT1\WebService\bin\Web.Debug.config +D:\Project\BBMPT1\WebService\bin\Web.Release.config +D:\Project\BBMPT1\WebService\bin\WebService.dll.config +D:\Project\BBMPT1\WebService\bin\WebService.dll +D:\Project\BBMPT1\WebService\bin\WebService.pdb +D:\Project\BBMPT1\WebService\bin\MESClassLibrary.dll +D:\Project\BBMPT1\WebService\bin\Newtonsoft.Json.dll +D:\Project\BBMPT1\WebService\bin\Tools.dll +D:\Project\BBMPT1\WebService\bin\EntityFramework.dll +D:\Project\BBMPT1\WebService\bin\MESClassLibrary.pdb +D:\Project\BBMPT1\WebService\bin\MESClassLibrary.dll.config +D:\Project\BBMPT1\WebService\bin\EntityFramework.xml +D:\Project\BBMPT1\WebService\bin\zh-Hans\EntityFramework.resources.dll +D:\Project\BBMPT1\WebService\obj\Debug\WebService.csproj.CoreCompileInputs.cache +D:\Project\BBMPT1\WebService\obj\Debug\WebService.csproj.CopyComplete +D:\Project\BBMPT1\WebService\obj\Debug\WebService.dll +D:\Project\BBMPT1\WebService\obj\Debug\WebService.pdb +D:\Project\BBMPT1\WebService\obj\Debug\WebService.csproj.AssemblyReference.cache diff --git a/WebService/obj/Debug/WebService.dll b/WebService/obj/Debug/WebService.dll index af46872..8af281f 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 f2bac33..07e968d 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/PrecompiledApp.config b/WebService/obj/Release/Package/PackageTmp/PrecompiledApp.config deleted file mode 100644 index f7f4068..0000000 --- a/WebService/obj/Release/Package/PackageTmp/PrecompiledApp.config +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/WebService/obj/Release/Package/PackageTmp/Web References/WebReference/Reference.map b/WebService/obj/Release/Package/PackageTmp/Web References/WebReference/Reference.map deleted file mode 100644 index 3ada245..0000000 --- a/WebService/obj/Release/Package/PackageTmp/Web References/WebReference/Reference.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/WebService/obj/Release/Package/PackageTmp/Web.config b/WebService/obj/Release/Package/PackageTmp/Web.config index f320554..25432f0 100644 --- a/WebService/obj/Release/Package/PackageTmp/Web.config +++ b/WebService/obj/Release/Package/PackageTmp/Web.config @@ -1,7 +1,7 @@  - +
@@ -10,23 +10,34 @@ - - - - + + + + - - + + + + + + + + + + - + - - + + + + + - \ No newline at end of file + + + + http://10.60.101.97:8016/JsonService.asmx + + + + + \ No newline at end of file diff --git a/WebService/obj/Release/Package/PackageTmp/bin/MESClassLibrary.dll b/WebService/obj/Release/Package/PackageTmp/bin/MESClassLibrary.dll index c296418..fa3615c 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/Newtonsoft.Json.dll b/WebService/obj/Release/Package/PackageTmp/bin/Newtonsoft.Json.dll index e7ae07b..cfee60e 100644 Binary files a/WebService/obj/Release/Package/PackageTmp/bin/Newtonsoft.Json.dll and b/WebService/obj/Release/Package/PackageTmp/bin/Newtonsoft.Json.dll differ diff --git a/WebService/obj/Release/Package/PackageTmp/bin/Web.config b/WebService/obj/Release/Package/PackageTmp/bin/Web.config index f320554..25432f0 100644 --- a/WebService/obj/Release/Package/PackageTmp/bin/Web.config +++ b/WebService/obj/Release/Package/PackageTmp/bin/Web.config @@ -1,7 +1,7 @@  - +
@@ -10,23 +10,34 @@ - - - - + + + + - - + + + + + + + + + + - + - - + + + + + - \ No newline at end of file + + + + http://10.60.101.97:8016/JsonService.asmx + + + + + \ No newline at end of file diff --git a/WebService/obj/Release/Package/PackageTmp/bin/WebService.XmlSerializers.dll b/WebService/obj/Release/Package/PackageTmp/bin/WebService.XmlSerializers.dll index 3507ee9..9bee2b5 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 87ded45..0f9e521 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/TempPE/Web References.WebReference.Reference.cs.dll b/WebService/obj/Release/TempPE/Web References.WebReference.Reference.cs.dll index 978f7f8..7177527 100644 Binary files a/WebService/obj/Release/TempPE/Web References.WebReference.Reference.cs.dll and b/WebService/obj/Release/TempPE/Web References.WebReference.Reference.cs.dll differ diff --git a/WebService/obj/Release/TransformWebConfig/original/Web.config b/WebService/obj/Release/TransformWebConfig/original/Web.config index b8c698b..3c9e3a6 100644 --- a/WebService/obj/Release/TransformWebConfig/original/Web.config +++ b/WebService/obj/Release/TransformWebConfig/original/Web.config @@ -18,15 +18,26 @@ - - - + + + + + + + + + + - - + + + + + + + + + + http://10.60.101.97:8016/JsonService.asmx + + + \ No newline at end of file diff --git a/WebService/obj/Release/TransformWebConfig/original/bin/Web.config b/WebService/obj/Release/TransformWebConfig/original/bin/Web.config index b8c698b..3c9e3a6 100644 --- a/WebService/obj/Release/TransformWebConfig/original/bin/Web.config +++ b/WebService/obj/Release/TransformWebConfig/original/bin/Web.config @@ -18,15 +18,26 @@ - - - + + + + + + + + + + - - + + + + + + + + + + http://10.60.101.97:8016/JsonService.asmx + + + \ No newline at end of file diff --git a/WebService/obj/Release/TransformWebConfig/transformed/Web.config b/WebService/obj/Release/TransformWebConfig/transformed/Web.config index f320554..25432f0 100644 --- a/WebService/obj/Release/TransformWebConfig/transformed/Web.config +++ b/WebService/obj/Release/TransformWebConfig/transformed/Web.config @@ -1,7 +1,7 @@  - +
@@ -10,23 +10,34 @@ - - - - + + + + - - + + + + + + + + + + - + - - + + + + + - \ No newline at end of file + + + + http://10.60.101.97:8016/JsonService.asmx + + + + + \ No newline at end of file diff --git a/WebService/obj/Release/TransformWebConfig/transformed/bin/Web.config b/WebService/obj/Release/TransformWebConfig/transformed/bin/Web.config index f320554..25432f0 100644 --- a/WebService/obj/Release/TransformWebConfig/transformed/bin/Web.config +++ b/WebService/obj/Release/TransformWebConfig/transformed/bin/Web.config @@ -1,7 +1,7 @@  - +
@@ -10,23 +10,34 @@ - - - - + + + + - - + + + + + + + + + + - + - - + + + + + - \ No newline at end of file + + + + http://10.60.101.97:8016/JsonService.asmx + + + + + \ No newline at end of file diff --git a/WebService/obj/Release/WebService.csproj.AssemblyReference.cache b/WebService/obj/Release/WebService.csproj.AssemblyReference.cache index 4269323..7982a2b 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.csproj.CoreCompileInputs.cache b/WebService/obj/Release/WebService.csproj.CoreCompileInputs.cache index 8f5e644..e85c262 100644 --- a/WebService/obj/Release/WebService.csproj.CoreCompileInputs.cache +++ b/WebService/obj/Release/WebService.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ba0e33a7d7d92d940316710283b8cf4e24d5c92c3f8c985c32424dba9cbb715 +12113464ca3efe46944f3a175fa288b8aea35f97 diff --git a/WebService/obj/Release/WebService.csproj.FileListAbsolute.txt b/WebService/obj/Release/WebService.csproj.FileListAbsolute.txt index 6b7299b..58d8db8 100644 --- a/WebService/obj/Release/WebService.csproj.FileListAbsolute.txt +++ b/WebService/obj/Release/WebService.csproj.FileListAbsolute.txt @@ -20,3 +20,24 @@ D:\Project\2、北汽模塑一厂\SVN\Code\WebService\obj\Release\WebService.csp D:\Project\2、北汽模塑一厂\SVN\Code\WebService\obj\Release\WebService.csproj.CoreCompileInputs.cache D:\Project\2、北汽模塑一厂\SVN\Code\WebService\obj\Release\WebService.dll D:\Project\2、北汽模塑一厂\SVN\Code\WebService\obj\Release\WebService.pdb +D:\Project\BBMPT1\WebService\bin\Web.config +D:\Project\BBMPT1\WebService\bin\Web.Debug.config +D:\Project\BBMPT1\WebService\bin\Web.Release.config +D:\Project\BBMPT1\WebService\bin\WebService.dll.config +D:\Project\BBMPT1\WebService\bin\WebService.dll +D:\Project\BBMPT1\WebService\bin\WebService.XmlSerializers.dll +D:\Project\BBMPT1\WebService\bin\WebService.pdb +D:\Project\BBMPT1\WebService\bin\MESClassLibrary.dll +D:\Project\BBMPT1\WebService\bin\Newtonsoft.Json.dll +D:\Project\BBMPT1\WebService\bin\Tools.dll +D:\Project\BBMPT1\WebService\bin\EntityFramework.dll +D:\Project\BBMPT1\WebService\bin\MESClassLibrary.pdb +D:\Project\BBMPT1\WebService\bin\MESClassLibrary.dll.config +D:\Project\BBMPT1\WebService\bin\EntityFramework.xml +D:\Project\BBMPT1\WebService\bin\zh-Hans\EntityFramework.resources.dll +D:\Project\BBMPT1\WebService\obj\Release\WebService.csproj.AssemblyReference.cache +D:\Project\BBMPT1\WebService\obj\Release\WebService.csproj.CoreCompileInputs.cache +D:\Project\BBMPT1\WebService\obj\Release\WebService.csproj.CopyComplete +D:\Project\BBMPT1\WebService\obj\Release\WebService.dll +D:\Project\BBMPT1\WebService\obj\Release\WebService.pdb +D:\Project\BBMPT1\WebService\obj\Release\WebService.XmlSerializers.dll diff --git a/WebService/obj/Release/WebService.dll b/WebService/obj/Release/WebService.dll index 988afb5..0f9e521 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 da82b04..5c182a4 100644 Binary files a/WebService/obj/Release/WebService.pdb and b/WebService/obj/Release/WebService.pdb differ diff --git a/WebService/obj/Release/_WPPLastBuildInfo.txt b/WebService/obj/Release/_WPPLastBuildInfo.txt index 802b3af..c70b8fa 100644 Binary files a/WebService/obj/Release/_WPPLastBuildInfo.txt and b/WebService/obj/Release/_WPPLastBuildInfo.txt differ diff --git a/foda/bin/Debug/foda.dll b/foda/bin/Debug/foda.dll index bdc01b4..9c017f8 100644 Binary files a/foda/bin/Debug/foda.dll and b/foda/bin/Debug/foda.dll differ diff --git a/foda/bin/Debug/foda.pdb b/foda/bin/Debug/foda.pdb index 7741a3c..bf1b230 100644 Binary files a/foda/bin/Debug/foda.pdb and b/foda/bin/Debug/foda.pdb differ diff --git a/foda/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/foda/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 73b8cc3..354f189 100644 Binary files a/foda/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/foda/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/foda/obj/Debug/foda.csproj.AssemblyReference.cache b/foda/obj/Debug/foda.csproj.AssemblyReference.cache index 2d1f274..331d120 100644 Binary files a/foda/obj/Debug/foda.csproj.AssemblyReference.cache and b/foda/obj/Debug/foda.csproj.AssemblyReference.cache differ diff --git a/foda/obj/Debug/foda.csproj.CoreCompileInputs.cache b/foda/obj/Debug/foda.csproj.CoreCompileInputs.cache index 7e391d2..3ce96c7 100644 --- a/foda/obj/Debug/foda.csproj.CoreCompileInputs.cache +++ b/foda/obj/Debug/foda.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -97857433fdc46a5b76d3bfe36242f3d98cfa245c0026f1bd5996a26633126d1c +5c8c1dddd6fc8fa67eaa7a036e859c0b410f30d0 diff --git a/foda/obj/Debug/foda.csproj.FileListAbsolute.txt b/foda/obj/Debug/foda.csproj.FileListAbsolute.txt index 920fd09..8ef82b8 100644 --- a/foda/obj/Debug/foda.csproj.FileListAbsolute.txt +++ b/foda/obj/Debug/foda.csproj.FileListAbsolute.txt @@ -42,3 +42,15 @@ D:\Project\2、北汽模塑一厂\SVN\新建文件夹\foda\obj\Debug\foda.csproj D:\Project\2、北汽模塑一厂\SVN\新建文件夹\foda\obj\Debug\foda.csproj.CopyComplete D:\Project\2、北汽模塑一厂\SVN\新建文件夹\foda\obj\Debug\foda.dll D:\Project\2、北汽模塑一厂\SVN\新建文件夹\foda\obj\Debug\foda.pdb +D:\Project\BBMPT1\foda\bin\Debug\foda.dll.config +D:\Project\BBMPT1\foda\bin\Debug\foda.dll +D:\Project\BBMPT1\foda\bin\Debug\foda.pdb +D:\Project\BBMPT1\foda\bin\Debug\EntityFramework.dll +D:\Project\BBMPT1\foda\bin\Debug\Tools.dll +D:\Project\BBMPT1\foda\bin\Debug\EntityFramework.xml +D:\Project\BBMPT1\foda\bin\Debug\zh-Hans\EntityFramework.resources.dll +D:\Project\BBMPT1\foda\obj\Debug\foda.csproj.AssemblyReference.cache +D:\Project\BBMPT1\foda\obj\Debug\foda.csproj.CoreCompileInputs.cache +D:\Project\BBMPT1\foda\obj\Debug\foda.csproj.CopyComplete +D:\Project\BBMPT1\foda\obj\Debug\foda.dll +D:\Project\BBMPT1\foda\obj\Debug\foda.pdb diff --git a/foda/obj/Debug/foda.dll b/foda/obj/Debug/foda.dll index bdc01b4..9c017f8 100644 Binary files a/foda/obj/Debug/foda.dll and b/foda/obj/Debug/foda.dll differ diff --git a/foda/obj/Debug/foda.pdb b/foda/obj/Debug/foda.pdb index 7741a3c..bf1b230 100644 Binary files a/foda/obj/Debug/foda.pdb and b/foda/obj/Debug/foda.pdb differ diff --git a/foda/obj/Release/foda.csproj.AssemblyReference.cache b/foda/obj/Release/foda.csproj.AssemblyReference.cache index 3bcebb0..d03bd0e 100644 Binary files a/foda/obj/Release/foda.csproj.AssemblyReference.cache and b/foda/obj/Release/foda.csproj.AssemblyReference.cache differ diff --git a/喷涂上线/Code/.vs/BBMPT/v16/.suo b/喷涂上线/Code/.vs/BBMPT/v16/.suo index 52c9e6e..1161d7d 100644 Binary files a/喷涂上线/Code/.vs/BBMPT/v16/.suo and b/喷涂上线/Code/.vs/BBMPT/v16/.suo differ diff --git a/喷涂上线/Code/PaintingPC/bin/Debug/PaintingPC.application b/喷涂上线/Code/PaintingPC/bin/Debug/PaintingPC.application index f14afb8..cff9d83 100644 --- a/喷涂上线/Code/PaintingPC/bin/Debug/PaintingPC.application +++ b/喷涂上线/Code/PaintingPC/bin/Debug/PaintingPC.application @@ -14,7 +14,7 @@ - s/VaQtZjdAx53oBU2ghOq9j9Bq5g0DNyPkREnQATyhQ= + ki7Kb15N1YKTethSTjgGgnxdn6T4EZehrxfepYzcYJo= diff --git a/喷涂上线/Code/PaintingPC/bin/Debug/PaintingPC.exe b/喷涂上线/Code/PaintingPC/bin/Debug/PaintingPC.exe index 9557d86..230659c 100644 Binary files a/喷涂上线/Code/PaintingPC/bin/Debug/PaintingPC.exe and b/喷涂上线/Code/PaintingPC/bin/Debug/PaintingPC.exe differ diff --git a/喷涂上线/Code/PaintingPC/bin/Debug/PaintingPC.exe.manifest b/喷涂上线/Code/PaintingPC/bin/Debug/PaintingPC.exe.manifest index 1f6ab3d..2166d07 100644 --- a/喷涂上线/Code/PaintingPC/bin/Debug/PaintingPC.exe.manifest +++ b/喷涂上线/Code/PaintingPC/bin/Debug/PaintingPC.exe.manifest @@ -50,7 +50,7 @@ - 1svxAgyuODojI8G2FIR8Kjloyye/3e6oq/+n2EgHzQg= + lpmvkGWlhBg8IE7pCa5If9cUM0BlVt8XVvATR8uOzZ4= diff --git a/喷涂上线/Code/PaintingPC/bin/Debug/PaintingPC.pdb b/喷涂上线/Code/PaintingPC/bin/Debug/PaintingPC.pdb index 9a6f59e..211a164 100644 Binary files a/喷涂上线/Code/PaintingPC/bin/Debug/PaintingPC.pdb and b/喷涂上线/Code/PaintingPC/bin/Debug/PaintingPC.pdb differ diff --git a/喷涂上线/Code/PaintingPC/bin/Debug/app.publish/PaintingPC.exe b/喷涂上线/Code/PaintingPC/bin/Debug/app.publish/PaintingPC.exe index 9557d86..230659c 100644 Binary files a/喷涂上线/Code/PaintingPC/bin/Debug/app.publish/PaintingPC.exe and b/喷涂上线/Code/PaintingPC/bin/Debug/app.publish/PaintingPC.exe differ diff --git a/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.application b/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.application index f14afb8..cff9d83 100644 --- a/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.application +++ b/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.application @@ -14,7 +14,7 @@ - s/VaQtZjdAx53oBU2ghOq9j9Bq5g0DNyPkREnQATyhQ= + ki7Kb15N1YKTethSTjgGgnxdn6T4EZehrxfepYzcYJo= diff --git a/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.csproj.AssemblyReference.cache b/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.csproj.AssemblyReference.cache index 0a9f810..f5e894a 100644 Binary files a/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.csproj.AssemblyReference.cache and b/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.csproj.AssemblyReference.cache differ diff --git a/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.csproj.GenerateResource.cache b/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.csproj.GenerateResource.cache index 077bde6..174fae9 100644 Binary files a/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.csproj.GenerateResource.cache and b/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.csproj.GenerateResource.cache differ diff --git a/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.exe b/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.exe index 9557d86..230659c 100644 Binary files a/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.exe and b/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.exe differ diff --git a/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.exe.manifest b/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.exe.manifest index 1f6ab3d..2166d07 100644 --- a/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.exe.manifest +++ b/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.exe.manifest @@ -50,7 +50,7 @@ - 1svxAgyuODojI8G2FIR8Kjloyye/3e6oq/+n2EgHzQg= + lpmvkGWlhBg8IE7pCa5If9cUM0BlVt8XVvATR8uOzZ4= diff --git a/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.pdb b/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.pdb index 9a6f59e..211a164 100644 Binary files a/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.pdb and b/喷涂上线/Code/PaintingPC/obj/Debug/PaintingPC.pdb differ