diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs index 7a39c06..5dbf61b 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs @@ -9137,7 +9137,9 @@ namespace ibk.IPD.Controller.IPD_PS decimal thkmin = 0;//最小厚度 //焊接判断 2025年9月21日追加 不允许补焊 - if (prP_PLATE.HJ_FLG == "1" && (prorde.REMARK.Contains("不允许补焊") || prorde.COLOR_STROKE.Contains("不允许补焊")) ) + if (prP_PLATE.HJ_FLG == "1" && (prorde.REMARK.Contains("不允许补焊") + || prorde.COLOR_STROKE.Contains("不允许补焊") + || prorde.ORD_NO.Contains ("OM8")) ) { COM_DATA CD = new COM_DATA(); CD.PLATE_NO = prP_PLATE.PLATE_NO; diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe index f086ead..a1eeea0 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb index 2cd6597..41b56e1 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index ba52e36..508f9aa 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe index f086ead..a1eeea0 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb index 2cd6597..41b56e1 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb differ