diff --git a/余坯替代——宽板/SlabWidThkHandle/.vs/SlabHandle/v17/.suo b/余坯替代——宽板/SlabWidThkHandle/.vs/SlabHandle/v17/.suo index 9ad5b8d..a6b6267 100644 Binary files a/余坯替代——宽板/SlabWidThkHandle/.vs/SlabHandle/v17/.suo and b/余坯替代——宽板/SlabWidThkHandle/.vs/SlabHandle/v17/.suo differ diff --git a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkControler.cs b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkControler.cs index cc2a282..b5171f0 100644 --- a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkControler.cs +++ b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkControler.cs @@ -5733,6 +5733,12 @@ namespace SlabHandle //} } + //坯料是Q235B-NG 不能与订单是OMZ的匹配 + if (TS.STLGRD == "Q235B-NG" && BOI.ORD_NO.StartsWith("OMZ")) + { + return false; + } + if (TS.EST_COMMENT != null && TS.EST_COMMENT.Contains("金润") && !(BOI.ORD_NO.StartsWith("OMZ") && BOI.STDSPEC.Contains("NMXY"))) { return false; diff --git a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.exe b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.exe index db4d833..f8b67e8 100644 Binary files a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.exe and b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.exe differ diff --git a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.pdb b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.pdb index 461f32e..a9b6380 100644 Binary files a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.pdb and b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.pdb differ diff --git a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.exe b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.exe index db4d833..f8b67e8 100644 Binary files a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.exe and b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.exe differ diff --git a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.pdb b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.pdb index 461f32e..a9b6380 100644 Binary files a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.pdb and b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.pdb differ