sunhao
/
NG_Project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
main
sunhao 4 months ago
parent ec6e392ec7
commit 278f3c1663
49 changed files with 2033 additions and 1825 deletions
Show Stats Download Patch File Download Diff File

BIN
余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo
View File

Binary file not shown.

24
余坯替代——中板/SlabHandle/SlabHandle/SlabControler.cs
Unescape Escape View File

@ -339,7 +339,6 @@ namespace SlabHandle
try
{
glLtPlateFilter = new List<string>();
glFbSlabDes_T = new List<FP_SLAB_DES>();
@ -767,12 +766,19 @@ namespace SlabHandle
//////根据宽度做分组多线程
SetPlateGroupTask(gltTbPlateGrp, iSlab);
//if (iSlab.SLAB_NO.Contains("2420317") && iSlab.STEEL_GRD_DETAIL.Contains("S355J-2"))
//{
// iSlab.ORD_NO = "OMK24040059";
// iSlab.ORD_ITEM = "015";
//}
//var lt = gltTbPlateUseGrp.Where(p => p.CRU_PIEs.Where(e => e.Order.STDSPEC.Contains("-SANY")).Count() > 0);
//if (gltTbPlateUseGrp.Where(p => p.CRU_PIEs.Where(e => e.Order.STDSPEC.Contains("-SANY")).Count() > 0).Count()>0)
//{
//}
if (iSlab.SLAB_NO.Contains("2420317") && iSlab.STEEL_GRD_DETAIL.Contains("S355J-2"))
{
iSlab.ORD_NO = "OMK24040059";
iSlab.ORD_ITEM = "015";
}
//分析数据
if (glStrAnalyse == "1")
{
@ -1466,7 +1472,7 @@ namespace SlabHandle
try
{
//OM423070031 004 005
if (iPlateGrp.CRU_PIEs.Where(p => p.ORD_NO == "OMC24050001" && p.ORD_ITEM == "017").Count() > 0)
if (iPlateGrp.CRU_PIEs.Where(p => p.ORD_NO == "OMK24050015" && p.ORD_ITEM == "009").Count() > 0)
{
}
//GB / T713 - Q245R
@ -1712,7 +1718,7 @@ namespace SlabHandle
continue;
}
if (iPlateFic.ORD_NO == "OMK23110028" && iPlateFic.ORD_ITEM == "004")
if (iPlateFic.ORD_NO == "OMK24050015" && iPlateFic.ORD_ITEM == "009")
{
}
@ -15564,7 +15570,7 @@ namespace SlabHandle
}
//修改一下程序管控，轧制标准号后缀-SANY ，次头尾坯不能替代，现在头尾坯是管控的，因为有G1，次头尾坯也要管控住 2024-05-06 武振
if (BOI.STDSPEC == "-SANY" )
if (BOI.STDSPEC.Contains("-SANY") )
{
logger.InfoFormat(" ####次头尾坯不能轧制 -SANY :{0}-{1}", BOI.ORD_NO, BOI.ORD_ITEM);
return true;

12
余坯替代——中板/SlabHandle/SlabHandle/SlabService.cs
Unescape Escape View File

@ -96,13 +96,13 @@ namespace SlabHandle
/// strSql.AppendLine(" AND A.SLAB_NO = '2331114206'");
//strSql.AppendLine(" AND A.SLAB_NO IN ('2410328131'");
//strSql.AppendLine(",'2420364440'");
////strSql.AppendLine(",'2331085505'");
////strSql.AppendLine(",'2331085504'");
////strSql.AppendLine(",'2331085503'");
//strSql.AppendLine(" AND A.SLAB_NO IN ('2430408333'");
//strSql.AppendLine(",'2430408334'");
//strSql.AppendLine(",'2430408335'");
//strSql.AppendLine(",'2420426231'");
//strSql.AppendLine(",'2420426232'");
////strSql.AppendLine(",'2331085601'");
//strSql.AppendLine(",'2430306439')");
//strSql.AppendLine(",'2430408336')");
//strSql.AppendLine(" AND A.SLAB_NO IN ( ");

158
余坯替代——中板/SlabHandle/SlabHandle/SlabServiceTest.cs
Unescape Escape View File

@ -90,7 +90,7 @@ namespace SlabHandle
strSql.AppendLine("WHERE 1 = 1 ");
////TODO:测试数据
strSql.AppendLine(" AND A.SLAB_NO = '2310768931'");
strSql.AppendLine(" AND A.SLAB_NO = '2430408334'");
//if (strWHere != string.Empty)
//{
@ -194,38 +194,39 @@ namespace SlabHandle
strSql.AppendLine(" SELECT* FROM(SELECT QQM.*,");
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(" 'OMK24040013-005' ");
//strSql.AppendLine(" where(QQM.ORD_NO || '-' || QQM.ORD_ITEM) IN( ");
strSql.AppendLine(" where(QQM.ORD_NO, QQM.ORD_ITEM) IN( ");
//strSql.AppendLine(" 'OMK24050015-009' ");
//OMK24010042-002
//strSql.AppendLine(" SELECT ");
//strSql.AppendLine(" TO_CHAR(BOI.ORD_NO), TO_CHAR(BOI.ORD_ITEM) ");
//strSql.AppendLine("FROM NISCO.cp_prc CPP ");
//strSql.AppendLine("INNER JOIN ");
//strSql.AppendLine("NISCO.BP_ORDER_ITEM boi ");
//strSql.AppendLine("ON BOI.ORD_NO = CPP.ORD_NO ");
//strSql.AppendLine("AND BOI.ORD_ITEM = CPP.ORD_ITEM ");
//strSql.AppendLine("AND BOI.ORD_WID<> 0 ");
//strSql.AppendLine("AND BOI.ORD_LEN<> 0 ");
//strSql.AppendLine("AND BOI.ORD_THK<> 0 ");
//strSql.AppendLine("WHERE 1=1 ");// ROUND(CPP.ORD_REM_WGT / (((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)) >= 1");
//strSql.AppendLine(" AND ");
//strSql.AppendLine(" (SELECT COUNT(A.REQ_SEQ_NO) ");
//strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B");
//strSql.AppendLine(" WHERE ");
//strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM");
//strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' ");
//strSql.AppendLine(" AND A.SEQ >= '01' ");
//strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO ");
//strSql.AppendLine(" AND B.REC_STS = '1') + GREATEST(0, (NVL(CPP.ORD_REM_WGT, 0) - CPP.ORD_WGT * (CPP.DEL_TOL_MAX + ABS(CPP.DEL_TOL_MIN)) / 100) / (((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85) )>= 0.95");
//strSql.AppendLine(" AND boi.PROD_CD = 'PP' ");
//strSql.AppendLine(" AND boi.REC_STS = '2' ");
//strSql.AppendLine(" and boi.ORD_STS IN('E') ");
//strSql.AppendLine(" AND (boi.ord_knd ='A' OR (boi.ord_knd ='T' AND (SELECT COUNT(*) FROM NISCO.BP_ODER_XY BOXY WHERE BOXY.ORDER_NO=BOI.ORD_NO AND BOXY.ORDER_ITEM=BOI.ORD_ITEM )>0)) ");
//strSql.AppendLine("AND boi.CFM_MILL_PLT='C3' ");
//strSql.AppendLine("AND (boi.ORD_NO NOT LIKE 'OMZ%' OR (boi.ORD_NO LIKE 'OMZ%' AND boi.STDSPEC LIKE '%KRZN-A%'))");
//strSql.AppendLine("AND((BOI.CUST_DEL_TO_DATE > TO_CHAR(SYSDATE - 183, 'YYYYMMdd')) OR(boi.ORD_NO LIKE 'OMA%'))");
strSql.AppendLine(" SELECT ");
strSql.AppendLine(" TO_CHAR(BOI.ORD_NO), TO_CHAR(BOI.ORD_ITEM) ");
strSql.AppendLine("FROM NISCO.cp_prc CPP ");
strSql.AppendLine("INNER JOIN ");
strSql.AppendLine("NISCO.BP_ORDER_ITEM boi ");
strSql.AppendLine("ON BOI.ORD_NO = CPP.ORD_NO ");
strSql.AppendLine("AND BOI.ORD_ITEM = CPP.ORD_ITEM ");
strSql.AppendLine("AND BOI.ORD_WID<> 0 ");
strSql.AppendLine("AND BOI.ORD_LEN<> 0 ");
strSql.AppendLine("AND BOI.ORD_THK<> 0 ");
strSql.AppendLine("WHERE 1=1 ");// ROUND(CPP.ORD_REM_WGT / (((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)) >= 1");
strSql.AppendLine(" AND ");
strSql.AppendLine(" (SELECT COUNT(A.REQ_SEQ_NO) ");
strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B");
strSql.AppendLine(" WHERE ");
strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM");
strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' ");
strSql.AppendLine(" AND A.SEQ >= '01' ");
strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO ");
strSql.AppendLine(" AND B.REC_STS = '1') + GREATEST(0, (NVL(CPP.ORD_REM_WGT, 0) - CPP.ORD_WGT * (CPP.DEL_TOL_MAX + ABS(CPP.DEL_TOL_MIN)) / 100) / (((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85) )>= 0.95");
strSql.AppendLine(" AND boi.PROD_CD = 'PP' ");
strSql.AppendLine(" AND boi.REC_STS = '2' ");
strSql.AppendLine(" and boi.ORD_STS IN('E') ");
strSql.AppendLine(" AND (boi.ord_knd ='A' OR (boi.ord_knd ='T' AND (SELECT COUNT(*) FROM NISCO.BP_ODER_XY BOXY WHERE BOXY.ORDER_NO=BOI.ORD_NO AND BOXY.ORDER_ITEM=BOI.ORD_ITEM )>0)) ");
strSql.AppendLine("AND boi.CFM_MILL_PLT='C3' ");
strSql.AppendLine("AND (boi.ORD_NO NOT LIKE 'OMZ%' OR (boi.ORD_NO LIKE 'OMZ%' AND boi.STDSPEC LIKE '%KRZN-A%'))");
strSql.AppendLine("AND((BOI.CUST_DEL_TO_DATE > TO_CHAR(SYSDATE - 183, 'YYYYMMdd')) OR(boi.ORD_NO LIKE 'OMA%'))");
strSql.AppendLine(" )");
strSql.AppendLine(") T WHERE T.RK = 1");
try
@ -355,24 +356,25 @@ namespace SlabHandle
strSql.AppendLine("WHERE 1 = 1 ");
strSql.AppendLine(" AND BOI.ORD_NO || '-' || BOI.ORD_ITEM IN ('OMK24040013-005')");
//strSql.AppendLine(" AND BOI.ORD_NO || '-' || BOI.ORD_ITEM IN ('OMK24050015-009')"); //OMK24050015 009
//strSql.AppendLine(" AND ");
//strSql.AppendLine(" (SELECT COUNT(A.REQ_SEQ_NO) ");
//strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B");
//strSql.AppendLine(" WHERE ");
//strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM");
//strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' ");
//strSql.AppendLine(" AND A.SEQ >= '01' ");
//strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO ");
//strSql.AppendLine(" AND B.REC_STS = '1') + GREATEST(0, (NVL(CPP.ORD_REM_WGT, 0) - CPP.ORD_WGT * (CPP.DEL_TOL_MAX + ABS(CPP.DEL_TOL_MIN)) / 100) / (((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)) >= 0.95");
//strSql.AppendLine(" AND boi.PROD_CD = 'PP' ");
//strSql.AppendLine("AND boi.REC_STS = '2' ");
//strSql.AppendLine("and boi.ORD_STS IN('E') ");
//strSql.AppendLine("AND (boi.ord_knd ='A' OR (boi.ord_knd ='T' AND (SELECT COUNT(*) FROM NISCO.BP_ODER_XY BOXY WHERE BOXY.ORDER_NO=BOI.ORD_NO AND BOXY.ORDER_ITEM=BOI.ORD_ITEM )>0)) ");
//strSql.AppendLine("AND boi.CFM_MILL_PLT='C3' ");
//strSql.AppendLine("AND (boi.ORD_NO NOT LIKE 'OMZ%' OR (boi.ORD_NO LIKE 'OMZ%' AND boi.STDSPEC LIKE '%KRZN-A%'))");
//strSql.AppendLine("AND((BOI.CUST_DEL_TO_DATE > TO_CHAR(SYSDATE - 183, 'YYYYMMdd')) OR(boi.ORD_NO LIKE 'OMA%'))");
strSql.AppendLine(" AND ");
strSql.AppendLine(" (SELECT COUNT(A.REQ_SEQ_NO) ");
strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B");
strSql.AppendLine(" WHERE ");
strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM");
strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' ");
strSql.AppendLine(" AND A.SEQ >= '01' ");
strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO ");
strSql.AppendLine(" AND B.REC_STS = '1') + GREATEST(0, (NVL(CPP.ORD_REM_WGT, 0) - CPP.ORD_WGT * (CPP.DEL_TOL_MAX + ABS(CPP.DEL_TOL_MIN)) / 100) / (((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)) >= 0.95");
strSql.AppendLine(" AND boi.PROD_CD = 'PP' ");
strSql.AppendLine("AND boi.REC_STS = '2' ");
strSql.AppendLine("and boi.ORD_STS IN('E') ");
strSql.AppendLine("AND (boi.ord_knd ='A' OR (boi.ord_knd ='T' AND (SELECT COUNT(*) FROM NISCO.BP_ODER_XY BOXY WHERE BOXY.ORDER_NO=BOI.ORD_NO AND BOXY.ORDER_ITEM=BOI.ORD_ITEM )>0)) ");
strSql.AppendLine("AND boi.CFM_MILL_PLT='C3' ");
strSql.AppendLine("AND (boi.ORD_NO NOT LIKE 'OMZ%' OR (boi.ORD_NO LIKE 'OMZ%' AND boi.STDSPEC LIKE '%KRZN-A%'))");
strSql.AppendLine("AND((BOI.CUST_DEL_TO_DATE > TO_CHAR(SYSDATE - 183, 'YYYYMMdd')) OR(boi.ORD_NO LIKE 'OMA%'))");
try
{
@ -406,34 +408,34 @@ namespace SlabHandle
IList<QP_QLTY_CHEM> orderChemistrys = new List<QP_QLTY_CHEM>();
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(" 'OMK24040013-005'");
//strSql.AppendLine("SELECT");
//strSql.AppendLine("TO_CHAR(BOI.ORD_NO), TO_CHAR(BOI.ORD_ITEM)");
//strSql.AppendLine("FROM NISCO.cp_prc CPP ");
//strSql.AppendLine("INNER JOIN ");
//strSql.AppendLine("NISCO.BP_ORDER_ITEM boi ");
//strSql.AppendLine("ON BOI.ORD_NO = CPP.ORD_NO ");
//strSql.AppendLine("AND BOI.ORD_ITEM = CPP.ORD_ITEM ");
//strSql.AppendLine("AND BOI.ORD_WID <> 0 ");
//strSql.AppendLine("AND BOI.ORD_LEN <> 0 ");
//strSql.AppendLine("AND BOI.ORD_THK <> 0 ");
//strSql.AppendLine(" WHERE 1=1 AND ");
//strSql.AppendLine(" (SELECT COUNT(A.REQ_SEQ_NO) ");
//strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B");
//strSql.AppendLine(" WHERE ");
//strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM");
//strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' ");
//strSql.AppendLine(" AND A.SEQ >= '01' ");
//strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO ");
//strSql.AppendLine(" AND B.REC_STS = '1') + GREATEST(0, (NVL(CPP.ORD_REM_WGT, 0) - CPP.ORD_WGT * (CPP.DEL_TOL_MAX + ABS(CPP.DEL_TOL_MIN)) / 100) / (((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)) >= 0.95");
//strSql.AppendLine("AND boi.PROD_CD = 'PP'");
//strSql.AppendLine("AND boi.REC_STS = '2' ");
//strSql.AppendLine("and boi.ORD_STS IN('E') ");
//strSql.AppendLine("AND (boi.ord_knd ='A' OR (boi.ord_knd ='T' AND (SELECT COUNT(*) FROM NISCO.BP_ODER_XY BOXY WHERE BOXY.ORDER_NO=BOI.ORD_NO AND BOXY.ORDER_ITEM=BOI.ORD_ITEM )>0)) ");
//strSql.AppendLine("AND boi.CFM_MILL_PLT='C3' ");
//strSql.AppendLine("AND (boi.ORD_NO NOT LIKE 'OMZ%' OR (boi.ORD_NO LIKE 'OMZ%' AND boi.STDSPEC LIKE '%KRZN-A%'))");
//strSql.AppendLine("AND((BOI.CUST_DEL_TO_DATE > TO_CHAR(SYSDATE - 183, 'YYYYMMdd')) OR(boi.ORD_NO LIKE 'OMA%'))");
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(" 'OMK24050015-009'");
strSql.AppendLine("SELECT");
strSql.AppendLine("TO_CHAR(BOI.ORD_NO), TO_CHAR(BOI.ORD_ITEM)");
strSql.AppendLine("FROM NISCO.cp_prc CPP ");
strSql.AppendLine("INNER JOIN ");
strSql.AppendLine("NISCO.BP_ORDER_ITEM boi ");
strSql.AppendLine("ON BOI.ORD_NO = CPP.ORD_NO ");
strSql.AppendLine("AND BOI.ORD_ITEM = CPP.ORD_ITEM ");
strSql.AppendLine("AND BOI.ORD_WID <> 0 ");
strSql.AppendLine("AND BOI.ORD_LEN <> 0 ");
strSql.AppendLine("AND BOI.ORD_THK <> 0 ");
strSql.AppendLine(" WHERE 1=1 AND ");
strSql.AppendLine(" (SELECT COUNT(A.REQ_SEQ_NO) ");
strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B");
strSql.AppendLine(" WHERE ");
strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM");
strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' ");
strSql.AppendLine(" AND A.SEQ >= '01' ");
strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO ");
strSql.AppendLine(" AND B.REC_STS = '1') + GREATEST(0, (NVL(CPP.ORD_REM_WGT, 0) - CPP.ORD_WGT * (CPP.DEL_TOL_MAX + ABS(CPP.DEL_TOL_MIN)) / 100) / (((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)) >= 0.95");
strSql.AppendLine("AND boi.PROD_CD = 'PP'");
strSql.AppendLine("AND boi.REC_STS = '2' ");
strSql.AppendLine("and boi.ORD_STS IN('E') ");
strSql.AppendLine("AND (boi.ord_knd ='A' OR (boi.ord_knd ='T' AND (SELECT COUNT(*) FROM NISCO.BP_ODER_XY BOXY WHERE BOXY.ORDER_NO=BOI.ORD_NO AND BOXY.ORDER_ITEM=BOI.ORD_ITEM )>0)) ");
strSql.AppendLine("AND boi.CFM_MILL_PLT='C3' ");
strSql.AppendLine("AND (boi.ORD_NO NOT LIKE 'OMZ%' OR (boi.ORD_NO LIKE 'OMZ%' AND boi.STDSPEC LIKE '%KRZN-A%'))");
strSql.AppendLine("AND((BOI.CUST_DEL_TO_DATE > TO_CHAR(SYSDATE - 183, 'YYYYMMdd')) OR(boi.ORD_NO LIKE 'OMA%'))");
strSql.AppendLine(") ");
strSql.AppendLine(" AND QQC.KND IN ('1','2') ) T WHERE T.rk = 1 ");
@ -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 = '2310768931 '");
strSql.AppendLine(" AND A.SLAB_NO = '2430408334 '");
//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(" ( '2310768931 ' ");
strSql.AppendLine(" ( '2430408334 ' ");
//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(" ( '2310768931 ' ");
strSql.AppendLine(" ( '2430408334 ' ");
//strSql.AppendLine(" SELECT DISTINCT A.SLAB_NO ");

BIN
余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.exe
View File

Binary file not shown.

BIN
余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.pdb
View File

Binary file not shown.

BIN
余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.exe
View File

Binary file not shown.

BIN
余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.pdb
View File

Binary file not shown.

BIN
余坯替代——宽板/SlabWidThkHandle/.vs/SlabHandle/v17/.suo
View File

Binary file not shown.

BIN
余坯替代——板卷/SlabCoilHandle/.vs/SlabHandle/v17/.suo
View File

Binary file not shown.

BIN
余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.exe
View File

Binary file not shown.

BIN
余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.pdb
View File

Binary file not shown.

BIN
余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.exe
View File

Binary file not shown.

BIN
余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.pdb
View File

Binary file not shown.

BIN
余材异标准维护/PlateAnalysisStandard/.vs/PlateAnalysisStandard/FileContentIndex/d042461e-4b45-4ef0-bce5-7ba149a76a5e.vsidx
View File

Binary file not shown.

BIN
余材异标准维护/PlateAnalysisStandard/.vs/PlateAnalysisStandard/v17/.suo
View File

Binary file not shown.

3
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/Enity/BP_ORDER_ITEM.cs
Unescape Escape View File

@ -950,6 +950,9 @@ namespace ibk.IPD.Entity.IpdPs
[Persistent("ROUNDSTD"), DisplayName("修约标准")]
public string ROUNDSTD { get; set; }
[Persistent("STDSPEC_STLGRD"), DisplayName("打印钢种")]
public string STDSPEC_STLGRD { get; set; }
////替代钢材号
//[Persistent("SUB_SLAB_NO"), DisplayName("替代钢材号")]
//public string SUB_SLAB_NO { get; set; }

5
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/Enity/GP_PLATE.cs
Unescape Escape View File

@ -899,6 +899,9 @@ namespace ibk.IPD.Entity.IpdPs
[Persistent("GP_WGT"), DisplayName("钢板重")]
public string GP_WGT { get; set; }
//STEEL_GRD_DETAIL
////钢种说明
[Persistent("STEEL_GRD_DETAIL"), DisplayName("钢种说明")]
public string STEEL_GRD_DETAIL { get; set; }
}
}

8
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/Enity/YCTD_WH_NO.cs
Unescape Escape View File

@ -35,6 +35,14 @@ namespace ibk.IPD.Entity.IpdPs
public string INS_DATE { get; set; }
[Persistent("UPD_DATE"), DisplayName("修改日期")]
public string UPD_DATE { get; set; }
[Persistent("STEEL_GRD_DETAIL"), DisplayName("板坯钢种")]
public string STEEL_GRD_DETAIL { get; set; }
[Persistent("STDSPEC_STLGRD"), DisplayName("订单牌号")]
public string STDSPEC_STLGRD { get; set; }
[Persistent("STD_FLG"), DisplayName("是否异钢种")]
public string STD_FLG { get; set; }
}
}

9
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/Enity/YCTD_WH_NO_COPY.cs
Unescape Escape View File

@ -36,5 +36,14 @@ namespace ibk.IPD.Entity.IpdPs
[Persistent("UPD_DATE"), DisplayName("修改日期")]
public string UPD_DATE { get; set; }
[Persistent("STEEL_GRD_DETAIL"), DisplayName("板坯钢种")]
public string STEEL_GRD_DETAIL { get; set; }
[Persistent("STDSPEC_STLGRD"), DisplayName("订单牌号")]
public string STDSPEC_STLGRD { get; set; }
[Persistent("STD_FLG"), DisplayName("是否异钢种")]
public string STD_FLG { get; set; }
}
}

11
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/Enity/YCTD_WH_NO_TIME.cs
Unescape Escape View File

@ -35,6 +35,17 @@ namespace ibk.IPD.Entity.IpdPs
public string INS_DATE { get; set; }
[Persistent("UPD_DATE"), DisplayName("修改日期")]
public string UPD_DATE { get; set; }
//&& p.ORESTLGRD == prP_PLATE.STEEL_GRD_DETAIL
// && p.TGT_STLGRD == prorde.STDSPEC_STLGRD
[Persistent("STEEL_GRD_DETAIL"), DisplayName("板坯钢种")]
public string STEEL_GRD_DETAIL { get; set; }
[Persistent("STDSPEC_STLGRD"), DisplayName("订单牌号")]
public string STDSPEC_STLGRD { get; set; }
[Persistent("STD_FLG"), DisplayName("是否异钢种")]
public string STD_FLG { get; set; }
}
}

1
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/PlateAnalysisStandard.csproj
Unescape Escape View File

@ -165,6 +165,7 @@
<Compile Include="Enity\Product.cs" />
<Compile Include="Enity\QP_CHEM_RSLT_FP.cs" />
<Compile Include="Enity\QP_QLTY_CHEM_FP.cs" />
<Compile Include="Enity\QP_QLTY_TECH_REPLACE.cs" />
<Compile Include="Enity\QP_STD_HEAD.cs" />
<Compile Include="Enity\RACTLAYOUT.cs" />
<Compile Include="Enity\REMA_LOC_WG.cs" />

3355
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/SurMatSubController.cs
View File

File diff suppressed because it is too large Load Diff

24
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/SurMatSubService.cs
Unescape Escape View File

@ -426,6 +426,10 @@ namespace ibk.IPD.Service.IPD_PS
strSql.AppendLine(" AND A.ORD_FL = '1' ");
strSql.AppendLine(" AND B.REC_STS = '1') + (NVL(CPP.ORD_REM_WGT, 0) - CPP.ORD_WGT * (CPP.DEL_TOL_MAX + ABS(CPP.DEL_TOL_MIN)) / 100) / TRUNC(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85, 3)) AS LACK_NUM ");
strSql.AppendLine(",QSH.STDSPEC_STLGRD");
strSql.AppendLine("FROM NISCO.cp_prc CPP ");
strSql.AppendLine("INNER JOIN ");
strSql.AppendLine("NISCO.BP_ORDER_ITEM boi ");
@ -455,6 +459,12 @@ namespace ibk.IPD.Service.IPD_PS
strSql.AppendLine("ON MATR.ORD_NO = boi.ORD_NO ");
strSql.AppendLine("AND MATR.ORD_ITEM= boi.ORD_ITEM");
strSql.AppendLine("LEFT JOIN NISCO.QP_STD_HEAD QSH ");
strSql.AppendLine(" ON boi.STDSPEC = QSH.STDSPEC ");
strSql.AppendLine(" AND boi.STDSPEC_YY = QSH.STDSPEC_YY ");
strSql.AppendLine("LEFT JOIN NISCO.EP_REQ_SLAB_D EP_SLAB_D");
strSql.AppendLine("ON EP_SLAB_D.ORD_NO = QQD.ORD_NO ");
strSql.AppendLine("AND EP_SLAB_D.REQ_SEQ_NO= EP_SLAB_D.REQ_SEQ_NO");
@ -860,7 +870,7 @@ namespace ibk.IPD.Service.IPD_PS
strSql.AppendLine(", CASE WHEN gpr.THK > 0 and gp.PROC_CD <> 'XAC' THEN gpr.THK ELSE gp.THK END THK");
strSql.AppendLine(", CASE WHEN gpr.WID > 0 and gp.PROC_CD <> 'XAC' THEN gpr.WID ELSE gp.WID END WID");
strSql.AppendLine(", CASE WHEN gpr.LEN > 0 and gp.PROC_CD <> 'XAC' THEN gpr.LEN ELSE gp.LEN END LEN");
strSql.AppendLine(",QNC.STEEL_GRD_DETAIL ");
//20231129新增
strSql.AppendLine(", GP.THK AS GP_THK ,GP.WID AS GP_WID ,GP.LEN AS GP_LEN,GP.WGT AS GP_WGT ");
@ -923,6 +933,9 @@ namespace ibk.IPD.Service.IPD_PS
strSql.AppendLine("LEFT JOIN NISCO.GP_INSPPLATE GI ON GI.MAT_NO = GP.PLATE_NO ");
strSql.AppendLine("LEFT JOIN NISCO.GP_USTRESULT UST ON UST.PLATE_NO = GP.PLATE_NO ");
strSql.AppendLine("LEFT JOIN NISCO.GP_REMARK RE ON RE.MAT_NO = GP.PLATE_NO ");
strSql.AppendLine("LEFT JOIN NISCO.QP_NISCO_CHMC QNC ON QNC.STLGRD = GP.STLGRD");
strSql.AppendLine("LEFT JOIN NISCO.QP_QLTY_MATR MATR ");
strSql.AppendLine("ON MATR.ORD_NO = boo.ORD_NO ");
strSql.AppendLine("AND MATR.ORD_ITEM= boo.ORD_ITEM");
@ -994,7 +1007,7 @@ namespace ibk.IPD.Service.IPD_PS
strSql.AppendLine(", CASE WHEN gpr.THK > 0 and gp.PROC_CD <> 'XAC' THEN gpr.THK ELSE gp.THK END THK");
strSql.AppendLine(", CASE WHEN gpr.WID > 0 and gp.PROC_CD <> 'XAC' THEN gpr.WID ELSE gp.WID END WID");
strSql.AppendLine(", CASE WHEN gpr.LEN > 0 and gp.PROC_CD <> 'XAC' THEN gpr.LEN ELSE gp.LEN END LEN");
strSql.AppendLine(",QNC.STEEL_GRD_DETAIL ");
//20231129新增
strSql.AppendLine(", GP.THK AS GP_THK ,GP.WID AS GP_WID ,GP.LEN AS GP_LEN,GP.WGT AS GP_WGT");
@ -1057,6 +1070,7 @@ namespace ibk.IPD.Service.IPD_PS
strSql.AppendLine("LEFT JOIN NISCO.GP_INSPPLATE GI ON GI.MAT_NO = GP.PLATE_NO ");
strSql.AppendLine("LEFT JOIN NISCO.GP_USTRESULT UST ON UST.PLATE_NO = GP.PLATE_NO ");
strSql.AppendLine("LEFT JOIN NISCO.GP_REMARK RE ON RE.MAT_NO = GP.PLATE_NO ");
strSql.AppendLine("LEFT JOIN NISCO.QP_NISCO_CHMC QNC ON QNC.STLGRD = GP.STLGRD");
strSql.AppendLine("LEFT JOIN NISCO.QP_QLTY_MATR MATR ");
strSql.AppendLine("ON MATR.ORD_NO = boo.ORD_NO ");
strSql.AppendLine("AND MATR.ORD_ITEM= boo.ORD_ITEM");
@ -1151,6 +1165,8 @@ namespace ibk.IPD.Service.IPD_PS
strSql.AppendLine(",MATR.ROUNDSTD ");
strSql.AppendLine(",count(EP_SLAB_D.REQ_SEQ_NO) SLAB_LACK_NUM , count(EP_SLAB_D.REQ_SEQ_NO) + FLOOR( (NVL(CPP.ORD_REM_WGT, 0) - CPP.ORD_WGT * (CPP.DEL_TOL_MAX + ABS(CPP.DEL_TOL_MIN)) / 100)/ TRUNC(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85,3)) AS LACK_NUM ");
strSql.AppendLine(",QSH.STDSPEC_STLGRD");
strSql.AppendLine("FROM NISCO.cp_prc CPP ");
strSql.AppendLine("INNER JOIN ");
strSql.AppendLine("NISCO.BP_ORDER_ITEM boi ");
@ -1190,6 +1206,10 @@ namespace ibk.IPD.Service.IPD_PS
strSql.AppendLine("AND EP_SLAB_D.SEQ >= '01'");
strSql.AppendLine("AND EP_SLAB_B.REC_STS = '1'");
strSql.AppendLine("LEFT JOIN NISCO.QP_STD_HEAD QSH ");
strSql.AppendLine(" ON boi.STDSPEC = QSH.STDSPEC ");
strSql.AppendLine(" AND boi.STDSPEC_YY = QSH.STDSPEC_YY ");
//TODO:TEST_DATA
//strSql.AppendLine("WHERE 1=1 ");
//strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) ");

BIN
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/bin/Debug/PlateAnalysisStandard.exe
View File

Binary file not shown.

BIN
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/bin/Debug/PlateAnalysisStandard.pdb
View File

Binary file not shown.

BIN
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/obj/Debug/PlateAnalysisStandard.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/obj/Debug/PlateAnalysisStandard.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
e7a0ed2a0319b6b353f2d0f8cbe0c89f57bf1431
e3c9eb27013f90f3673691b00081b3434425f5f1

16
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/obj/Debug/PlateAnalysisStandard.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -30,3 +30,19 @@ D:\_NGProject\ipd-file\余材异标准维护\PlateAnalysisStandard\PlateAnalysis
D:\_NGProject\ipd-file\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\obj\Debug\PlateAnalysisStandard.csproj.CopyComplete
D:\_NGProject\ipd-file\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\obj\Debug\PlateAnalysisStandard.exe
D:\_NGProject\ipd-file\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\obj\Debug\PlateAnalysisStandard.pdb
D:\_NG_1\NG_Project\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\bin\Debug\PlateAnalysisStandard.exe.config
D:\_NG_1\NG_Project\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\bin\Debug\PlateAnalysisStandard.exe
D:\_NG_1\NG_Project\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\bin\Debug\PlateAnalysisStandard.pdb
D:\_NG_1\NG_Project\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\bin\Debug\Newtonsoft.Json.dll
D:\_NG_1\NG_Project\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\bin\Debug\System.Buffers.dll
D:\_NG_1\NG_Project\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\bin\Debug\System.Memory.dll
D:\_NG_1\NG_Project\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\bin\Debug\System.Net.Http.Formatting.dll
D:\_NG_1\NG_Project\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\bin\Debug\System.Numerics.Vectors.dll
D:\_NG_1\NG_Project\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
D:\_NG_1\NG_Project\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\obj\Debug\PlateAnalysisStandard.csproj.AssemblyReference.cache
D:\_NG_1\NG_Project\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\obj\Debug\PlateAnalysisStandard.csproj.SuggestedBindingRedirects.cache
D:\_NG_1\NG_Project\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\obj\Debug\PlateAnalysisStandard.exe.config
D:\_NG_1\NG_Project\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\obj\Debug\PlateAnalysisStandard.csproj.CoreCompileInputs.cache
D:\_NG_1\NG_Project\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\obj\Debug\PlateAnalysisStandard.csproj.CopyComplete
D:\_NG_1\NG_Project\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\obj\Debug\PlateAnalysisStandard.exe
D:\_NG_1\NG_Project\余材异标准维护\PlateAnalysisStandard\PlateAnalysisStandard\obj\Debug\PlateAnalysisStandard.pdb

BIN
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/obj/Debug/PlateAnalysisStandard.exe
View File

Binary file not shown.

BIN
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/obj/Debug/PlateAnalysisStandard.pdb
View File

Binary file not shown.

BIN
余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/FileContentIndex/7b8838e3-f01b-466a-9d0f-f02a910c8c00.vsidx
View File

Binary file not shown.

BIN
余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo
View File

Binary file not shown.

1
余材替代程序/SinglePlateHandle/SinglePlateHandle/SinglePlateHandle.csproj
Unescape Escape View File

@ -237,6 +237,7 @@
<Compile Include="Enity\SUPERSEDE_CONFIRAM.cs" />
<Compile Include="SupersedeRequestArgs.cs" />
<Compile Include="SurMatSubController.cs" />
<Compile Include="SurMatSubServiceTest.cs" />
<Compile Include="SurMatSubService.cs" />
<Compile Include="Enity\TBDIPDO.cs" />
<Compile Include="Enity\TB_PS_CONFIG.cs" />

BIN
余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe
View File

Binary file not shown.

BIN
余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb
View File

Binary file not shown.

BIN
余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

2
余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
f2b6a7505f23c440e1d165b68582c10757f1e477
bd3cb3de55817ef298700d9ac2099473ffcd480c

BIN
余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe
View File

Binary file not shown.

BIN
余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb
View File

Binary file not shown.

6
前端程序/ipd-frontend/src/pages/materialsSubstitution/YCTDWHNO.tsx
Unescape Escape View File

@ -206,10 +206,14 @@ const Main = () => {
width: 50,
fixed: 'left',
},
{ title: '板坯钢种', dataIndex: 'STEEL_GRD_DETAIL', key: 'STEEL_GRD_DETAIL', width: 100, ellipsis: true },
{ title: '订单牌号', dataIndex: 'STDSPEC_STLGRD', key: 'STDSPEC_STLGRD', width: 100, ellipsis: true },
{ title: '是否异钢种', dataIndex: 'STD_FLG', key: 'STD_FLG', width: 100, ellipsis: true },
{ title: '标准号', dataIndex: 'STANDARD_NO', key: 'STANDARD_NO', width: 100, ellipsis: true },
{ title: '可替代标准号', dataIndex: 'TD_STANDARD_NO', key: 'TD_STANDARD_NO', width: 100, ellipsis: true },
{ title: '维护区分', dataIndex: 'TD_FL', key: 'TD_FL', width: 100, ellipsis: true },
{ title: '备注', dataIndex: 'REMARK', key: 'REMARK', width: 100, ellipsis: true },
{ title: '备注', dataIndex: 'REMARK', key: 'REMARK', width: 450, ellipsis: true },
// { title: '公差下限', dataIndex: 'THK_TOL_MIN', key: 'THK_TOL_MIN', width: 100, ellipsis: true },
// { title: '公差上限', dataIndex: 'THK_TOL_MAX', key: 'THK_TOL_MAX', width: 100, ellipsis: true },
{ title: '录入时间', dataIndex: 'INS_DATE', key: 'INS_DATE', width: 100, ellipsis: true },

BIN
后端接口/ipd-server/.vs/iBkLinker-IPD/v17/.suo
View File

Binary file not shown.

BIN
后端接口/ipd-server/Debug/iBKLinker.IPD.Service.dll
View File

Binary file not shown.

BIN
后端接口/ipd-server/Debug/iBKLinker.IPD.Service.pdb
View File

Binary file not shown.

11
后端接口/ipd-server/Service/Controller/IPD-PS/SurplusMaterialSubstitutionController.cs
Unescape Escape View File

@ -1667,15 +1667,15 @@ namespace ibk.IPD.Controller.IPD_PS
//strSql.AppendLine(" ) WHERE rn = 1 ");
strSql.AppendLine("SELECT * FROM( ");
strSql.AppendLine(" SELECT STANDARD_NO, TD_STANDARD_NO, INS_DATE, UPD_DATE, TD_FL,THK_TOL_MIN,THK_TOL_MAX,REMARK ");
strSql.AppendLine(" SELECT STANDARD_NO, TD_STANDARD_NO, INS_DATE, UPD_DATE, TD_FL,THK_TOL_MIN,THK_TOL_MAX,REMARK ,STEEL_GRD_DETAIL,STDSPEC_STLGRD,STD_FLG ");
strSql.AppendLine("FROM ( ");
strSql.AppendLine(" SELECT ");
strSql.AppendLine(" STANDARD_NO, ");
strSql.AppendLine(" TD_STANDARD_NO, ");
strSql.AppendLine("INS_DATE, ");
strSql.AppendLine("UPD_DATE, ");
strSql.AppendLine("TD_FL, THK_TOL_MIN,THK_TOL_MAX ,REMARK, ");
strSql.AppendLine(" ROW_NUMBER() OVER(PARTITION BY STANDARD_NO, TD_STANDARD_NO ORDER BY INS_DATE DESC) AS rn ");
strSql.AppendLine("TD_FL, THK_TOL_MIN,THK_TOL_MAX ,REMARK, STEEL_GRD_DETAIL,STDSPEC_STLGRD,STD_FLG ");
strSql.AppendLine(" ,ROW_NUMBER() OVER(PARTITION BY STANDARD_NO, TD_STANDARD_NO ORDER BY INS_DATE DESC) AS rn ");
strSql.AppendLine(" FROM YCTD_WH_NO ");
strSql.AppendLine(" ) WHERE rn = 1 ");
strSql.AppendLine(" UNION ALL ");
@ -1758,7 +1758,7 @@ namespace ibk.IPD.Controller.IPD_PS
//bool b = true;
foreach (var model in delModel)
{
strSql.AppendLine(" INSERT INTO YCTD_WH_NO_COPY (STANDARD_NO, TD_STANDARD_NO, INS_DATE, UPD_DATE, TD_FL,THK_TOL_MIN,THK_TOL_MAX,REMARK) VALUES ( ");
strSql.AppendLine(" INSERT INTO YCTD_WH_NO_COPY (STANDARD_NO, TD_STANDARD_NO, INS_DATE, UPD_DATE, TD_FL,THK_TOL_MIN,THK_TOL_MAX,REMARK,STEEL_GRD_DETAIL,STDSPEC_STLGRD,STD_FLG) VALUES ( ");
strSql.AppendLine(string.Format(" '{0}', ", model.STANDARD_NO));
strSql.AppendLine(string.Format(" '{0}', ", model.TD_STANDARD_NO));
strSql.AppendLine(string.Format(" '{0}', ", DateTime.Now.ToString("yyyyMMddHHmmss")));
@ -1767,6 +1767,9 @@ namespace ibk.IPD.Controller.IPD_PS
strSql.AppendLine(string.Format(" '{0}', ", model.THK_TOL_MIN));
strSql.AppendLine(string.Format(" '{0}' ", model.THK_TOL_MAX));
strSql.AppendLine(string.Format(" '{0}' ", model.REMARK));
strSql.AppendLine(string.Format(" '{0}' ", model.STEEL_GRD_DETAIL));
strSql.AppendLine(string.Format(" '{0}' ", model.STDSPEC_STLGRD));
strSql.AppendLine(string.Format(" '{0}' ", model.STD_FLG));
strSql.AppendLine(string.Format(" ) "));
db.Execute(strSql.ToString());

10
后端接口/ipd-server/Service/Entity/IPD-PS/YCTD_WH_NO.cs
Unescape Escape View File

@ -38,5 +38,15 @@ namespace ibk.IPD.Entity.IpdPs
[Persistent("UPD_DATE"), DisplayName("修改日期")]
public string UPD_DATE { get; set; }
[Persistent("STEEL_GRD_DETAIL"), DisplayName("板坯钢种")]
public string STEEL_GRD_DETAIL { get; set; }
[Persistent("STDSPEC_STLGRD"), DisplayName("订单牌号")]
public string STDSPEC_STLGRD { get; set; }
[Persistent("STD_FLG"), DisplayName("是否异钢种")]
public string STD_FLG { get; set; }
}
}

BIN
后端接口/ipd-server/Service/obj/Debug/iBKLinker.IPD.Service.dll
View File

Binary file not shown.

BIN
后端接口/ipd-server/Service/obj/Debug/iBKLinker.IPD.Service.pdb
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save