diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs index 66a6c4f..9268a6b 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs @@ -8594,7 +8594,25 @@ namespace ibk.IPD.Controller.IPD_PS //2025-02-07 针对XAC正品余材及(表面等级和产品等级都为1的材)不应受缺陷约束 if (prP_PLATE.PROC_CD == "XAC" && prP_PLATE.PROD_GRD == "1" && prP_PLATE.SURF_GRD == "1") { - return true; + // G0099 DBB 厚度1 / 2点状缺陷 厚度1/ 2点状缺陷 探伤 + //G0099 DBC 厚度1 / 2片状缺陷 厚度1/ 2片状缺陷 探伤 + //G0099 DBD 厚度1 / 4点状缺陷 厚度1/ 4点状缺陷 探伤 + //G0099 DBE 厚度1 / 4片状缺陷 厚度1/ 4片状缺陷 探伤 + //G0099 DBF 厚度1 / 2、1 / 4点状缺陷 厚度1/ 2、1 / 4点状缺陷 探伤 + //G0099 DBG 厚度1 / 2、1 / 4片状缺陷 厚度1/ 2、1 / 4片状缺陷 探伤 + if ((prP_PLATE.WOO_RSN == "DBB" + || prP_PLATE.WOO_RSN == "DBC" + || prP_PLATE.WOO_RSN == "DBD" + || prP_PLATE.WOO_RSN == "DBE" + || prP_PLATE.WOO_RSN == "DBF" + || prP_PLATE.WOO_RSN == "DBG") && !string.IsNullOrEmpty(prorde.UST_FL)) + { + return false; + } + else + { + return true; + } } //-对非船板替代的标准(标准表维护输入值为“是”) //-厚度规格≤40mm; diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe index b52abcd..4d6dcb7 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 43e620c..8e025b8 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/SinglePlateHandle.csproj.AssemblyReference.cache b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache index 5b8de0a..6eb26ca 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe index b52abcd..4d6dcb7 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 43e620c..8e025b8 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb differ