diff --git a/InjectionPC/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/InjectionPC/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs deleted file mode 100644 index e5dc9b8..0000000 --- a/InjectionPC/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs +++ /dev/null @@ -1,4 +0,0 @@ -// -using System; -using System.Reflection; -[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")] diff --git a/InjectionPC/obj/Debug/InjectionPC.Form1.resources b/InjectionPC/obj/Debug/InjectionPC.Form1.resources deleted file mode 100644 index 6c05a97..0000000 Binary files a/InjectionPC/obj/Debug/InjectionPC.Form1.resources and /dev/null differ diff --git a/InjectionPC/obj/Debug/InjectionPC.FrmBarCode.resources b/InjectionPC/obj/Debug/InjectionPC.FrmBarCode.resources deleted file mode 100644 index e826fc6..0000000 Binary files a/InjectionPC/obj/Debug/InjectionPC.FrmBarCode.resources and /dev/null differ diff --git a/InjectionPC/obj/Debug/InjectionPC.FrmDown.resources b/InjectionPC/obj/Debug/InjectionPC.FrmDown.resources deleted file mode 100644 index 37583bf..0000000 Binary files a/InjectionPC/obj/Debug/InjectionPC.FrmDown.resources and /dev/null differ diff --git a/InjectionPC/obj/Debug/InjectionPC.FrmLogin.resources b/InjectionPC/obj/Debug/InjectionPC.FrmLogin.resources deleted file mode 100644 index 068f6ca..0000000 Binary files a/InjectionPC/obj/Debug/InjectionPC.FrmLogin.resources and /dev/null differ diff --git a/InjectionPC/obj/Debug/InjectionPC.FrmQuality.resources b/InjectionPC/obj/Debug/InjectionPC.FrmQuality.resources deleted file mode 100644 index 37583bf..0000000 Binary files a/InjectionPC/obj/Debug/InjectionPC.FrmQuality.resources and /dev/null differ diff --git a/InjectionPC/obj/Debug/InjectionPC.Properties.Resources.resources b/InjectionPC/obj/Debug/InjectionPC.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 Binary files a/InjectionPC/obj/Debug/InjectionPC.Properties.Resources.resources and /dev/null differ diff --git a/InjectionPC/obj/Debug/InjectionPC.csproj.CopyComplete b/InjectionPC/obj/Debug/InjectionPC.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 diff --git a/InjectionPC/obj/Debug/InjectionPC.exe b/InjectionPC/obj/Debug/InjectionPC.exe deleted file mode 100644 index 58689d7..0000000 Binary files a/InjectionPC/obj/Debug/InjectionPC.exe and /dev/null differ diff --git a/InjectionPC/obj/Debug/Interop.grdesLib.dll b/InjectionPC/obj/Debug/Interop.grdesLib.dll deleted file mode 100644 index 18846dd..0000000 Binary files a/InjectionPC/obj/Debug/Interop.grdesLib.dll and /dev/null differ diff --git a/InjectionPC/obj/Debug/Interop.grproLib.dll b/InjectionPC/obj/Debug/Interop.grproLib.dll deleted file mode 100644 index dbf0070..0000000 Binary files a/InjectionPC/obj/Debug/Interop.grproLib.dll and /dev/null differ diff --git a/InjectionPC/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/InjectionPC/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll deleted file mode 100644 index 45be215..0000000 Binary files a/InjectionPC/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and /dev/null differ diff --git a/InjectionPC/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/InjectionPC/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs deleted file mode 100644 index e69de29..0000000 diff --git a/InjectionPC/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/InjectionPC/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs deleted file mode 100644 index e69de29..0000000 diff --git a/InjectionPC/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/InjectionPC/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs deleted file mode 100644 index e69de29..0000000 diff --git a/InjectionPC/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/InjectionPC/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs deleted file mode 100644 index e5dc9b8..0000000 --- a/InjectionPC/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs +++ /dev/null @@ -1,4 +0,0 @@ -// -using System; -using System.Reflection; -[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")] diff --git a/InjectionPC/obj/Release/Interop.grdesLib.dll b/InjectionPC/obj/Release/Interop.grdesLib.dll deleted file mode 100644 index 409e3c4..0000000 Binary files a/InjectionPC/obj/Release/Interop.grdesLib.dll and /dev/null differ diff --git a/InjectionPC/obj/Release/Interop.grproLib.dll b/InjectionPC/obj/Release/Interop.grproLib.dll deleted file mode 100644 index 43125e2..0000000 Binary files a/InjectionPC/obj/Release/Interop.grproLib.dll and /dev/null differ diff --git a/InjectionPC/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/InjectionPC/obj/Release/TempPE/Properties.Resources.Designer.cs.dll deleted file mode 100644 index 91e7107..0000000 Binary files a/InjectionPC/obj/Release/TempPE/Properties.Resources.Designer.cs.dll and /dev/null differ diff --git a/InjectionPC/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/InjectionPC/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs deleted file mode 100644 index e69de29..0000000 diff --git a/InjectionPC/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/InjectionPC/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs deleted file mode 100644 index e69de29..0000000 diff --git a/InjectionPC/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/InjectionPC/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs deleted file mode 100644 index e69de29..0000000 diff --git a/InjectionPC/obj/Release/build.force b/InjectionPC/obj/Release/build.force deleted file mode 100644 index e69de29..0000000 diff --git a/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3.cs b/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3.cs index 52841ad..10482e3 100644 --- a/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3.cs +++ b/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3.cs @@ -663,25 +663,27 @@ namespace PunchAndWeld } SendToPLC(0, 0, 0); + ShowDevState(false); - - ClearDisplay(); _produceModel = string.Empty; _lastScan = string.Empty; _leftScanCode = string.Empty; _rightScanCode = string.Empty; txtLastScanL.Text = string.Empty; txtLastScanR.Text = string.Empty; - + txtLeftScan.Text = ""; + lbMsg.Text = ""; _leftScanCodeLast = string.Empty; _rightScanCodeLast = string.Empty; GetScanRecords(); + //_leftScanCode // _rightScanCode // tb_ScanRecord_Laser //高配表 // tb_ScanRecord_LaserL //低配表 } + txtLeftScan.Focus(); } } }