diff --git a/余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo b/余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo index e2a986f..38b4900 100644 Binary files a/余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo and b/余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo differ diff --git a/余坯替代——中板/SlabHandle/SlabHandle/SlabService.cs b/余坯替代——中板/SlabHandle/SlabHandle/SlabService.cs index ffea0a4..7b4cf8f 100644 --- a/余坯替代——中板/SlabHandle/SlabHandle/SlabService.cs +++ b/余坯替代——中板/SlabHandle/SlabHandle/SlabService.cs @@ -172,7 +172,7 @@ namespace SlabHandle strSql.AppendLine(" AND((GREATEST(A.WID, A.LEN) >= 2050 AND LEAST(A.WID, A.LEN) >= 800 AND A.THK > 50) "); strSql.AppendLine(" OR(GREATEST(A.WID, A.LEN) >= 2050 AND LEAST(A.WID, A.LEN) >= 850 AND A.THK = 50))---短尺 "); strSql.AppendLine(" AND((SELECT COUNT(*) FROM NISCO.FB_SLAB_001 R WHERE R.SLAB_NO = A.SLAB_NO AND R.TYPE1 ='B' ) < 1 )"); - strSql.AppendLine(" AND ((A.CUR_INV ='ZB' AND A.WGT <=30.5) OR (A.CUR_INV IN('00','ZZ','HB','B1','52','C7','HC') AND A.WGT <30.5 ))"); + strSql.AppendLine(" AND ((A.CUR_INV ='ZB' AND A.WGT <=26.4) OR (A.CUR_INV IN('00','ZZ','HB','B1','52','C7','HC') AND A.WGT <26.4 ))"); //P_SLAB_DELI_DET表中字段EST_CD是5或者6开头是协议板。 strSql.AppendLine(" ORDER BY A.LOC DESC, A.SLAB_NO ASC "); @@ -1349,7 +1349,7 @@ namespace SlabHandle strSql.AppendLine(" AND((GREATEST(A.WID, A.LEN) >= 2050 AND LEAST(A.WID, A.LEN) >= 800 AND A.THK > 50) "); strSql.AppendLine(" OR(GREATEST(A.WID, A.LEN) >= 2050 AND LEAST(A.WID, A.LEN) >= 850 AND A.THK = 50))---短尺 "); strSql.AppendLine(" AND((SELECT COUNT(*) FROM NISCO.FB_SLAB_001 R WHERE R.SLAB_NO = A.SLAB_NO AND R.TYPE1 ='B' ) < 1 )"); - strSql.AppendLine(" AND ((A.CUR_INV ='ZB' AND A.WGT <=30.5) OR (A.CUR_INV IN('00','ZZ','HB','B1','52','C7','HC') AND A.WGT <30.5 ))"); + strSql.AppendLine(" AND ((A.CUR_INV ='ZB' AND A.WGT <=26.4) OR (A.CUR_INV IN('00','ZZ','HB','B1','52','C7','HC') AND A.WGT <26.4 ))"); strSql.AppendLine(") "); try @@ -1424,7 +1424,7 @@ namespace SlabHandle strSql.AppendLine(" AND((GREATEST(A.WID, A.LEN) >= 2050 AND LEAST(A.WID, A.LEN) >= 800 AND A.THK > 50) "); strSql.AppendLine(" OR(GREATEST(A.WID, A.LEN) >= 2050 AND LEAST(A.WID, A.LEN) >= 850 AND A.THK = 50))---短尺 "); strSql.AppendLine(" AND((SELECT COUNT(*) FROM NISCO.FB_SLAB_001 R WHERE R.SLAB_NO = A.SLAB_NO AND R.TYPE1 ='B' ) < 1 )"); - strSql.AppendLine(" AND ((A.CUR_INV ='ZB' AND A.WGT <=30.5) OR (A.CUR_INV IN('00','ZZ','HB','B1','52','C7','HC') AND A.WGT <30.5 ))"); + strSql.AppendLine(" AND ((A.CUR_INV ='ZB' AND A.WGT <=26.4) OR (A.CUR_INV IN('00','ZZ','HB','B1','52','C7','HC') AND A.WGT <26.4 ))"); strSql.AppendLine(") "); strSql.AppendLine("CONNECT BY PRIOR fs.MOTHER_SLAB = fs.SLAB_NO -- 父子关系连接条件 "); @@ -1501,7 +1501,7 @@ namespace SlabHandle strSql.AppendLine(" AND((GREATEST(A.WID, A.LEN) >= 2050 AND LEAST(A.WID, A.LEN) >= 800 AND A.THK > 50) "); strSql.AppendLine(" OR(GREATEST(A.WID, A.LEN) >= 2050 AND LEAST(A.WID, A.LEN) >= 850 AND A.THK = 50))---短尺 "); strSql.AppendLine(" AND((SELECT COUNT(*) FROM NISCO.FB_SLAB_001 R WHERE R.SLAB_NO = A.SLAB_NO AND R.TYPE1 ='B' ) < 1 )"); - strSql.AppendLine(" AND ((A.CUR_INV ='ZB' AND A.WGT <=30.5) OR (A.CUR_INV IN('00','ZZ','HB','B1','52','C7','HC') AND A.WGT <30.5 ))"); + strSql.AppendLine(" AND ((A.CUR_INV ='ZB' AND A.WGT <=26.4) OR (A.CUR_INV IN('00','ZZ','HB','B1','52','C7','HC') AND A.WGT <26.4 ))"); strSql.AppendLine(") "); strSql.AppendLine("CONNECT BY PRIOR fs.MOTHER_SLAB = fs.SLAB_NO -- 父子关系连接条件 "); @@ -1873,7 +1873,7 @@ namespace SlabHandle strSql.AppendLine(" AND((GREATEST(A.WID, A.LEN) >= 2050 AND LEAST(A.WID, A.LEN) >= 800 AND A.THK > 50) "); strSql.AppendLine(" OR(GREATEST(A.WID, A.LEN) >= 2050 AND LEAST(A.WID, A.LEN) >= 850 AND A.THK = 50))---短尺 "); strSql.AppendLine(" AND((SELECT COUNT(*) FROM NISCO.FB_SLAB_001 R WHERE R.SLAB_NO = A.SLAB_NO AND R.TYPE1 ='B' ) < 1 )"); - strSql.AppendLine(" AND ((A.CUR_INV ='ZB' AND A.WGT <=30.5) OR (A.CUR_INV IN('00','ZZ','HB','B1','52','C7','HC') AND A.WGT <30.5 ))"); + strSql.AppendLine(" AND ((A.CUR_INV ='ZB' AND A.WGT <=26.4) OR (A.CUR_INV IN('00','ZZ','HB','B1','52','C7','HC') AND A.WGT <26.4 ))"); //P_SLAB_DELI_DET表中字段EST_CD是5或者6开头是协议板。 //strSql.AppendLine(" ORDER BY A.LOC DESC, A.SLAB_NO ASC "); diff --git a/余坯替代——中板/SlabHandle/SlabHandle/SlabServiceTest.cs b/余坯替代——中板/SlabHandle/SlabHandle/SlabServiceTest.cs index 448ea78..be1081b 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 = '2410566831'"); + strSql.AppendLine(" AND A.SLAB_NO = '2430573233'"); //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(" 'OM824070038-001' "); + strSql.AppendLine(" 'OME24060052-012','OM724070015-006','OM724070015-007','OME24060009-129' "); //OMK24010042-002 @@ -355,7 +355,7 @@ namespace SlabHandle strSql.AppendLine("WHERE 1 = 1 "); - strSql.AppendLine(" AND BOI.ORD_NO || '-' || BOI.ORD_ITEM IN ('OM824070038-001')"); + strSql.AppendLine(" AND BOI.ORD_NO || '-' || BOI.ORD_ITEM IN ( 'OME24060052-012','OM724070015-006','OM724070015-007','OME24060009-129')"); //strSql.AppendLine(" AND "); //strSql.AppendLine(" (SELECT COUNT(A.REQ_SEQ_NO) "); @@ -407,7 +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(" 'OM824070038-001'"); + //strSql.AppendLine(" 'OME24060052-012','OM724070015-006','OM724070015-007','OME24060009-129'"); + + strSql.AppendLine(" 'OME24060052-012','OM724070015-006','OM724070015-007','OME24060009-129'"); //strSql.AppendLine("SELECT"); //strSql.AppendLine("TO_CHAR(BOI.ORD_NO), TO_CHAR(BOI.ORD_ITEM)"); //strSql.AppendLine("FROM NISCO.cp_prc CPP "); @@ -1285,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 = '2410566831 '"); + strSql.AppendLine(" AND A.SLAB_NO = '2430573233 '"); //strSql.AppendLine(" AND (A.CUR_INV IN('ZB','ZZ','HB','B1','52','C7','HC') " + @@ -1360,7 +1362,7 @@ namespace SlabHandle strSql.AppendLine(" FROM NISCO.FP_SLAB fs "); strSql.AppendLine(" START WITH fs.SLAB_NO "); strSql.AppendLine(" IN "); - strSql.AppendLine(" ( '2410566831' "); + strSql.AppendLine(" ( '2430573233' "); //strSql.AppendLine(" SELECT DISTINCT A.SLAB_NO "); @@ -1485,7 +1487,7 @@ namespace SlabHandle strSql.AppendLine(" FROM NISCO.FP_SLAB fs "); strSql.AppendLine(" START WITH fs.SLAB_NO "); strSql.AppendLine(" IN "); - strSql.AppendLine(" ( '2410566831' "); + strSql.AppendLine(" ( '2430573233' "); //strSql.AppendLine(" SELECT DISTINCT A.SLAB_NO "); diff --git a/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.exe b/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.exe index 97c106b..15af239 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 9ccf0fc..1649dd5 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 97c106b..15af239 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 9ccf0fc..1649dd5 100644 Binary files a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.pdb and b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.pdb differ