diff --git a/余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo b/余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo index 38b4900..af53260 100644 Binary files a/余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo and b/余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo differ diff --git a/余坯替代——中板/SlabHandle/SlabHandle/SlabControler.cs b/余坯替代——中板/SlabHandle/SlabHandle/SlabControler.cs index e4476c6..b4950a5 100644 --- a/余坯替代——中板/SlabHandle/SlabHandle/SlabControler.cs +++ b/余坯替代——中板/SlabHandle/SlabHandle/SlabControler.cs @@ -4738,6 +4738,11 @@ namespace SlabHandle //成材率 //tBPlateGrpMany.RATE = ConverDataToDecimal((Math.Round(tBPlateGrpMany.CRU_PIEs_ACT.Sum(p => p.ORD_THK / 1000 * p.ORD_WID / 1000 * p.ORD_LEN / 1000 * ConverDataToDecimal(7.85)) / tBPlateGrpMany.MAX_WGT, 2))); + //判断实际长度，特别长取消计算 + if (Math.Round((TSCopy.THK / 1000) * (tBPlateGrpMany.SLAB_LEN / 1000) * (TSCopy.WID / 1000) / ((tBPlateGrpMany.CAL_THK / 1000) * (tBPlateGrpMany.CAL_WID / 1000)), 3) >= tBPlateGrpMany.CUT_MAXLEN / 1000) + { + tBPlateGrpMany.CRU_PIEs_ACT.Clear(); + } if (tBPlateGrpMany.MAX_LEN == 0) { @@ -6532,7 +6537,11 @@ namespace SlabHandle { tBPlateGrpMany.RATE = ConverDataToDecimal((Math.Round(tBPlateGrpMany.CRU_PIEs_ACT.Sum(p => p.ORD_THK / 1000 * p.ORD_WID / 1000 * p.ORD_LEN / 1000 * ConverDataToDecimal(7.85)) / tBPlateGrpMany.MAX_WGT, 4))); } - + //判断实际长度，特别长取消计算 + if (Math.Round((TSCopy.THK / 1000) * (tBPlateGrpMany.SLAB_LEN / 1000) * (TSCopy.WID / 1000) / ((tBPlateGrpMany.CAL_THK / 1000) * (tBPlateGrpMany.CAL_WID / 1000)), 3) >= tBPlateGrpMany.CUT_MAXLEN / 1000) + { + tBPlateGrpMany.CRU_PIEs_ACT.Clear(); + } if (tBPlateGrpMany.MAX_LEN == 0) { tBPlateGrpMany.CRU_PIEs_ACT.Clear(); @@ -8144,6 +8153,12 @@ namespace SlabHandle { tBPlateGrpMany.RATE = ConverDataToDecimal((Math.Round(tBPlateGrpMany.CRU_PIEs_ACT.Sum(p => p.ORD_THK / 1000 * p.ORD_WID / 1000 * p.ORD_LEN / 1000 * ConverDataToDecimal(7.85)) / tBPlateGrpMany.MAX_WGT, 4))); } + //判断实际长度，特别长取消计算 + if (Math.Round((TSCopy.THK / 1000) * (tBPlateGrpMany.SLAB_LEN / 1000) * (TSCopy.WID / 1000) / ((tBPlateGrpMany.CAL_THK / 1000) * (tBPlateGrpMany.CAL_WID / 1000)), 3) >= tBPlateGrpMany.CUT_MAXLEN / 1000) + { + tBPlateGrpMany.CRU_PIEs_ACT.Clear(); + } + if (tBPlateGrpMany.MAX_LEN == 0) { tBPlateGrpMany.CRU_PIEs_ACT.Clear(); @@ -14418,7 +14433,6 @@ namespace SlabHandle //TODO:欠量测试 int intLack = iOrder.SUB_LACK_NUM;//欠量 ServiceTest 测试 - //配置限制 厚、宽、交货期 if (gltTBCNFC3.Count() > 0) { diff --git a/余坯替代——中板/SlabHandle/SlabHandle/SlabServiceTest.cs b/余坯替代——中板/SlabHandle/SlabHandle/SlabServiceTest.cs index be1081b..84f56b0 100644 --- a/余坯替代——中板/SlabHandle/SlabHandle/SlabServiceTest.cs +++ b/余坯替代——中板/SlabHandle/SlabHandle/SlabServiceTest.cs @@ -90,7 +90,7 @@ namespace SlabHandle strSql.AppendLine("WHERE 1 = 1 "); ////TODO:测试数据 - strSql.AppendLine(" AND A.SLAB_NO = '2430573233'"); + strSql.AppendLine(" AND A.SLAB_NO = '2410724811'"); //if (strWHere != string.Empty) //{ @@ -195,7 +195,7 @@ namespace SlabHandle strSql.AppendLine(" rank() over(partition by QQM.ord_no, QQM.ord_item order by knd desc) rk"); strSql.AppendLine(" from NISCO.QP_QLTY_MATR QQM "); strSql.AppendLine(" where(QQM.ORD_NO || '-' || QQM.ORD_ITEM) IN( "); - strSql.AppendLine(" 'OME24060052-012','OM724070015-006','OM724070015-007','OME24060009-129' "); + strSql.AppendLine(" 'OM824080128-011','OMD24090008-085','OMD24090008-099','OMD24090008-300','OMD24090024-012' "); //OMK24010042-002 @@ -354,8 +354,8 @@ namespace SlabHandle strSql.AppendLine(" AND boi.STDSPEC_YY = QSH.STDSPEC_YY "); strSql.AppendLine("WHERE 1 = 1 "); - - strSql.AppendLine(" AND BOI.ORD_NO || '-' || BOI.ORD_ITEM IN ( 'OME24060052-012','OM724070015-006','OM724070015-007','OME24060009-129')"); + + strSql.AppendLine(" AND BOI.ORD_NO || '-' || BOI.ORD_ITEM IN ( 'OM824080128-011','OMD24090008-085','OMD24090008-099','OMD24090008-300','OMD24090024-012')"); //strSql.AppendLine(" AND "); //strSql.AppendLine(" (SELECT COUNT(A.REQ_SEQ_NO) "); @@ -407,9 +407,9 @@ namespace SlabHandle strSql.AppendLine("SELECT T.*FROM("); strSql.AppendLine("SELECT QQC.*, rank() over(partition by QQC.ord_no, QQC.ord_item order by knd desc) rk from NISCO.QP_QLTY_CHEM QQC where (QQC.ORD_NO || '-' || QQC.ORD_ITEM) IN("); - //strSql.AppendLine(" 'OME24060052-012','OM724070015-006','OM724070015-007','OME24060009-129'"); + //strSql.AppendLine(" 'OM824080128-011','OMD24090008-085','OMD24090008-099','OMD24090008-300','OMD24090024-012'"); - strSql.AppendLine(" 'OME24060052-012','OM724070015-006','OM724070015-007','OME24060009-129'"); + strSql.AppendLine(" 'OM824080128-011','OMD24090008-085','OMD24090008-099','OMD24090008-300','OMD24090024-012'"); //strSql.AppendLine("SELECT"); //strSql.AppendLine("TO_CHAR(BOI.ORD_NO), TO_CHAR(BOI.ORD_ITEM)"); //strSql.AppendLine("FROM NISCO.cp_prc CPP "); @@ -1287,7 +1287,7 @@ namespace SlabHandle strSql.AppendLine("LEFT JOIN NISCO.QP_NISCO_CHMC QNC ON QNC.STLGRD = A.STLGRD"); strSql.AppendLine("WHERE 1 = 1 "); - strSql.AppendLine(" AND A.SLAB_NO = '2430573233 '"); + strSql.AppendLine(" AND A.SLAB_NO = '2410724811 '"); //strSql.AppendLine(" AND (A.CUR_INV IN('ZB','ZZ','HB','B1','52','C7','HC') " + @@ -1362,7 +1362,7 @@ namespace SlabHandle strSql.AppendLine(" FROM NISCO.FP_SLAB fs "); strSql.AppendLine(" START WITH fs.SLAB_NO "); strSql.AppendLine(" IN "); - strSql.AppendLine(" ( '2430573233' "); + strSql.AppendLine(" ( '2410724811' "); //strSql.AppendLine(" SELECT DISTINCT A.SLAB_NO "); @@ -1487,7 +1487,7 @@ namespace SlabHandle strSql.AppendLine(" FROM NISCO.FP_SLAB fs "); strSql.AppendLine(" START WITH fs.SLAB_NO "); strSql.AppendLine(" IN "); - strSql.AppendLine(" ( '2430573233' "); + strSql.AppendLine(" ( '2410724811' "); //strSql.AppendLine(" SELECT DISTINCT A.SLAB_NO "); diff --git a/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.exe b/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.exe index 15af239..7ff5669 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 1649dd5..93b5b51 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 15af239..7ff5669 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 1649dd5..93b5b51 100644 Binary files a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.pdb and b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.pdb differ