diff --git a/余坯替代——宽板/SlabWidThkHandle/.vs/SlabHandle/v17/.suo b/余坯替代——宽板/SlabWidThkHandle/.vs/SlabHandle/v17/.suo index f6489d0..58b6eef 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 8f27291..c0c610e 100644 --- a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkControler.cs +++ b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkControler.cs @@ -2046,6 +2046,7 @@ namespace SlabHandle var pWgt = itemsToRemove.Where(p => p.SEQ != "00" && p.BLOCK_SEQ != "00").Sum(q => q.WGT); var zLEN = itemsToRemove.Where(p => p.SEQ == "00" && p.BLOCK_SEQ == "00"&&p.WID>1600).Sum(q => q.SLAB_LEN); var wgt = iSlab.WGT; + List calLen = itemsToRemove.Where(p => p.SEQ != "00" && p.BLOCK_SEQ != "00").ToList(); if (iSlab.LEN - zLEN > 200) { wgt = zLEN / 1000 * iSlab.WID / 1000 * iSlab.THK / 1000 * ConverDataToDecimal(7.85); @@ -2103,6 +2104,43 @@ namespace SlabHandle iSlab.REM_WGT = iSlab.WGT; logger.Info("已删除:" + iSlab.SLAB_NO + "==>"); } + + foreach (FP_SLAB_DES Vartpg in itemsToRemove) + { + if (Vartpg.BLOCK_SEQ!="00" || Vartpg.SEQ != "00") + { + continue; + } + + decimal intMaxLen = glEpAsrollLenStd.Where(p => p.PLT == "C2" + && (p.STLGRD == iSlab.STLGRD || p.STLGRD == "*") + && p.THK_MIN <= Vartpg.THK + && p.THK_MAX > Vartpg.THK + && p.ASROLL_WID_MIN <= Vartpg.WID + && p.ASROLL_WID_MAX > Vartpg.WID).OrderByDescending(p => p.STLGRD).FirstOrDefault().ASROLL_LEN_MAX; + + decimal maxLen = Vartpg.LEN; + + if (maxLen > intMaxLen) + { + logger.Info("长度大于:" + intMaxLen + "-" + maxLen); + foreach (var fP_SLAB_DES in itemsToRemove) + { + glFbSlabDes_T.Remove(fP_SLAB_DES); + + } + //删除还未被使用的钢板号 + foreach (var strPlateCD in glLtPlateFilter) + { + glLtPlate.Remove(strPlateCD); + } + iSlab.REM_LEN = iSlab.LEN; + iSlab.REM_WGT = iSlab.WGT; + logger.Info("已删除:" + iSlab.SLAB_NO + "==>"); + } + + } + } if (iSlab.REM_LEN >= 1600 && backMode == 0 && glFbSlabDes_T.Count > 0) { diff --git a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkService - 复制.cs b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkService - 复制.cs index 0622618..5f7a879 100644 --- a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkService - 复制.cs +++ b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkService - 复制.cs @@ -30,8 +30,8 @@ namespace SlabHandle public class SlabWidThkService_test { private static readonly ILog logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private static string slab = " AND SLAB_NO in ('2420957304') "; - private static string boi = " boi.ORD_NO || '-' || boi.ORD_ITEM in ('OM424110002-007')"; + private static string slab = " AND SLAB_NO in ('2510359602') "; + private static string boi = " boi.ORD_NO || '-' || boi.ORD_ITEM in ('OMC25040082-042','OMC25040083-183','OMC25040084-005','OMC25040084-010')"; private static string lack_num = ",'1'AS SUB_LACK_NUM,'1'AS LACK_NUM"; private static string wgt_max = ",'200' AS WGT_MAX "; diff --git a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.exe b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.exe index 57db75e..7caf22a 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 956dbb6..f0ba597 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 57db75e..7caf22a 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 956dbb6..f0ba597 100644 Binary files a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.pdb and b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.pdb differ