diff --git a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo b/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo index f946222..36831d4 100644 Binary files a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo and b/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs index 3bf6110..16a0738 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs @@ -2579,6 +2579,19 @@ namespace ibk.IPD.Controller.IPD_PS } } } + //订单标准前面带G1 G2 G3 高表暂时不做切割,请后台管控下。 + if (order.STDSPEC.StartsWith("G1-") || order.STDSPEC.StartsWith("G2-") || order.STDSPEC.StartsWith("G3-")) + { + if (itemGP_PLATE.APLY_STDSPEC == order.STDSPEC && itemGP_PLATE.SUB_FULL == "C") + { + + } + else + { + continue; + } + } + //二次试样号先停 //if (!itemGP_PLATE.SUB_LACK_CON.Contains("物理") || itemGP_PLATE.PROC_CD == "XAC" || !isSMP) //{ @@ -3928,7 +3941,18 @@ namespace ibk.IPD.Controller.IPD_PS } } } + //订单标准前面带G1 G2 G3 高表暂时不做切割,请后台管控下。 + if (order.STDSPEC.StartsWith("G1-") || order.STDSPEC.StartsWith("G2-") || order.STDSPEC.StartsWith("G3-")) + { + if (itemGP_PLATE.APLY_STDSPEC == order.STDSPEC && itemGP_PLATE.SUB_FULL == "C") + { + } + else + { + continue; + } + } //if(i==1) //{ @@ -10393,17 +10417,17 @@ namespace ibk.IPD.Controller.IPD_PS { //if (prP_PLATE.APLY_STDSPEC.StartsWith("G1-") || prorder.STDSPEC.StartsWith("G1-")) //特殊钢,只看订单 - //if (prorder.STDSPEC.StartsWith("G1-")) - //{ - // if (prP_PLATE.APLY_STDSPEC == prorder.STDSPEC && prP_PLATE.SUB_FULL == "C") - // { - // return true; - // } - // else - // { - // return false; - // } - //} + if (prorder.STDSPEC.StartsWith("G1-") || prorder.STDSPEC.StartsWith("G2-") || prorder.STDSPEC.StartsWith("G3-")) + { + if (prP_PLATE.APLY_STDSPEC == prorder.STDSPEC && prP_PLATE.SUB_FULL == "C") + { + return true; + } + else + { + return false; + } + } if (prorder.STDSPEC.StartsWith("G3-")) { if (prP_PLATE.SUB_FULL == "P") diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe index 78b1c06..6b56e27 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 c665091..c3e0a03 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 78b1c06..6b56e27 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 c665091..c3e0a03 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb differ