diff --git a/余坯替代——中板/SlabHandle/SlabHandle/Enity/TB_PLATE_GRP.cs b/余坯替代——中板/SlabHandle/SlabHandle/Enity/TB_PLATE_GRP.cs index c34da51..76db718 100644 --- a/余坯替代——中板/SlabHandle/SlabHandle/Enity/TB_PLATE_GRP.cs +++ b/余坯替代——中板/SlabHandle/SlabHandle/Enity/TB_PLATE_GRP.cs @@ -65,6 +65,10 @@ namespace SlabHandle.Enity [Persistent("VAC_FLG"), DisplayName("真空标识")] public string VAC_FLG { get; set; } + //切边方式 + [Persistent("TRIM_FL"), DisplayName("切边方式")] + public string TRIM_FL { get; set; } + //交货期 [Persistent("CUST_DEL_TO_DATE"), DisplayName("交货期")] public string CUST_DEL_TO_DATE { get; set; } diff --git a/余坯替代——中板/SlabHandle/SlabHandle/SlabControler.cs b/余坯替代——中板/SlabHandle/SlabHandle/SlabControler.cs index 12ac14d..83135bc 100644 --- a/余坯替代——中板/SlabHandle/SlabHandle/SlabControler.cs +++ b/余坯替代——中板/SlabHandle/SlabHandle/SlabControler.cs @@ -1012,6 +1012,7 @@ namespace SlabHandle && p.STLGRD == iPlateFic.STLGRD && p.XY_FLG == iPlateFic.Order.XY_FLG && p.VAC_FLG == iPlateFic.Order.VAC_FLG + && p.TRIM_FL == iPlateFic.Order.TRIM_FL //切边方式相同 && p.STDSPEC == iPlateFic.Order.STDSPEC && p.MIN_THK == iPlateFic.Order.THK_TOL_MIN && p.MAX_THK == iPlateFic.Order.THK_TOL_MAX @@ -1035,6 +1036,8 @@ namespace SlabHandle tB_PLATE_GRP.VAC_FLG = iPlateFic.Order.VAC_FLG; + tB_PLATE_GRP.TRIM_FL= iPlateFic.Order.TRIM_FL; + tB_PLATE_GRP.MIN_THK = iPlateFic.Order.THK_TOL_MIN; tB_PLATE_GRP.MAX_THK = iPlateFic.Order.THK_TOL_MAX; @@ -1642,6 +1645,8 @@ namespace SlabHandle tB_PLATE_GRP.STDSPEC = iPlateGrp.STDSPEC; //钢种 + tB_PLATE_GRP.TRIM_FL = iPlateGrp.TRIM_FL; //切边方式 + tB_PLATE_GRP.STDSPEC_STLGRD = iPlateGrp.STDSPEC_STLGRD;//目标钢种 tB_PLATE_GRP.CAL_WID = iPlateGrp.WID + decWidMrgin; @@ -6097,6 +6102,12 @@ namespace SlabHandle { continue; } + //切边方式不同不匹配 + if (iTbPlateGrp_F.TRIM_FL != iTbPlateGrp_S.TRIM_FL) + { + continue; + } + tBPlateGrpMany.CAL_THK = Math.Max(iTbPlateGrp_F.CAL_THK, iTbPlateGrp_S.CAL_THK); @@ -7545,6 +7556,12 @@ namespace SlabHandle { continue; } + + //切边方式不同不匹配 + if (iTbPlateGrp_F.TRIM_FL != iTbPlateGrp_S.TRIM_FL) + { + continue; + } ////记录添加的组号 //ltgrpID.Add(iTbPlateGrp_S.GRP_ID); @@ -7710,6 +7727,12 @@ namespace SlabHandle { continue; } + + //切边方式不同不匹配 + if (iTbPlateGrp_F.TRIM_FL != iTbPlateGrp_S.TRIM_FL) + { + continue; + } ////记录添加的组号 //ltgrpID.Add(iTbPlateGrp_T.GRP_ID); @@ -15781,6 +15804,14 @@ namespace SlabHandle return true; } + //####头尾坯不能轧制 宽度大于2450的订单 + if (BOI.ORD_WID > 2450) + { + logger.InfoFormat(" ####头尾坯不能轧制 宽度大于2450的订单 :{0}-{1}", BOI.ORD_NO, BOI.ORD_ITEM); + return true; + } + + return false; } diff --git a/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.exe b/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.exe index 4b4f736..30ac934 100644 Binary files a/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.exe and b/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.exe differ diff --git a/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.pdb b/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.pdb index d60e89c..8977a0c 100644 Binary files a/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.pdb and b/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.pdb differ diff --git a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.exe b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.exe index 4b4f736..30ac934 100644 Binary files a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.exe and b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.exe differ diff --git a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.pdb b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.pdb index d60e89c..8977a0c 100644 Binary files a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.pdb and b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.pdb differ