@ -928,7 +928,7 @@ namespace ibk.IPD.Controller.IPD_PS
{
strWHerePlate + = " AND (GP.PROD_DATE > TO_CHAR(SYSdate + '" + intPLATE_DAYS_DIFF . ToString ( ) + "' ,'yyyyMMdd') or GP.STLGRD in ( SELECT STLGRD FROM NISCO.QP_NISCO_CHMC WHERE STLGRD_FL='N' AND STLGRD IN('A20050NIQQT', 'A20051NIQQT', 'A20090NIQQT', 'A20092NIQQT', 'A20093NIQQT')))" ;
//测试test指定
//strWHerePlate += " AND GP.PLATE_NO in ('2 321188 4040101')";
//strWHerePlate += " AND GP.PLATE_NO in ('2 42 054 4732 0101')";
}
//余材自动替代周期
if ( intORD_DAYS_DIFF ! = 0 )
@ -936,7 +936,7 @@ namespace ibk.IPD.Controller.IPD_PS
//strWHereOrd += " AND boi.CUST_DEL_TO_DATE > TO_CHAR(SYSdate + '" + intORD_DAYS_DIFF.ToString() + "' ,'yyyyMMdd')";
//测试test指定
//strWHereOrd += " AND boi.ORD_NO='OM M24050019' AND boi.ORD_ITEM='085 '";
//strWHereOrd += " AND boi.ORD_NO='OM D24070005' AND boi.ORD_ITEM='096 '";
strWHereOrd + = " AND (boi.CUST_DEL_TO_DATE > TO_CHAR(SYSdate + '" + intORD_DAYS_DIFF . ToString ( ) + "' ,'yyyyMMdd') or boi.STLGRD in ( SELECT STLGRD FROM NISCO.QP_NISCO_CHMC WHERE STLGRD_FL='N' AND STLGRD IN('A20050NIQQT','A20051NIQQT','A20090NIQQT','A20092NIQQT','A20093NIQQT'))) " ;
}
@ -7929,6 +7929,38 @@ namespace ibk.IPD.Controller.IPD_PS
// && Convert.ToDecimal(itemQP_QLTY_CHEM.CHEM_COMP_MAX) >= Convert.ToDecimal(p.CHEM_RSLT)
// && itemQP_QLTY_CHEM.CHEM_COMP_CD + itemQP_QLTY_CHEM.FOMULA_CD == p.CHEM_COMP_CD).ToList();
//CEQ 特殊处理
if ( itemQP_QLTY_CHEM . CHEM_COMP_CD . ToUpper ( ) = = "CEQ" )
{
//CEQ 字符串
string strCEQ = ( itemQP_QLTY_CHEM . CHEM_COMP_CD + ConverDataToString ( itemQP_QLTY_CHEM . FOMULA_CD ) ) . Trim ( ) ;
//CEQ 字符串长度
int intSub = strCEQ . Length ;
//2024/1/4 改
List < QP_CHEM_RSLT > ltCheck = ltQPChemRslt . Where
( p = > Convert . ToDecimal ( itemQP_QLTY_CHEM . CHEM_COMP_MIN ) < = Convert . ToDecimal ( p . CHEM_RSLT )
& & Convert . ToDecimal ( itemQP_QLTY_CHEM . CHEM_COMP_MAX ) > = Convert . ToDecimal ( p . CHEM_RSLT )
& & ( strCEQ = = ( p . CHEM_COMP_CD + ConverDataToString ( p . FOMULA_CD ) ) . Trim ( ) ) ) . ToList ( ) ;
if ( ltCheck . Count = = 0 )
{
COM_DATA CD = new COM_DATA ( ) ;
CD . PLATE_NO = prP_PLATE . PLATE_NO ;
CD . ORD_NO = prorde . ORD_NO ;
CD . ORD_ITEM = prorde . ORD_ITEM ;
CD . Chem = "1" ; //化学特性
//gCOM_DATA.Add(CD);//全局变量添加对不结果数据
//不满足，
//logger.InfoFormat("钢板:{0}，订单号:{1}-{2},钢板炉号化学成分不满足订单", prP_PLATE.PLATE_NO, prorde.ORD_NO, prorde.ORD_ITEM);
return false ;
}
}
else
{
//2024/1/4 改
List < QP_CHEM_RSLT > ltCheck = ltQPChemRslt . Where
( p = > Convert . ToDecimal ( itemQP_QLTY_CHEM . CHEM_COMP_MIN ) < = Convert . ToDecimal ( p . CHEM_RSLT )
@ -7956,6 +7988,36 @@ namespace ibk.IPD.Controller.IPD_PS
}
}
}
////2024/1/4 改
//List<QP_CHEM_RSLT> ltCheck = ltQPChemRslt.Where
// (p => Convert.ToDecimal(itemQP_QLTY_CHEM.CHEM_COMP_MIN) <= Convert.ToDecimal(p.CHEM_RSLT)
// && Convert.ToDecimal(itemQP_QLTY_CHEM.CHEM_COMP_MAX) >= Convert.ToDecimal(p.CHEM_RSLT)
// && (itemQP_QLTY_CHEM.CHEM_COMP_CD + itemQP_QLTY_CHEM.FOMULA_CD == p.CHEM_COMP_CD || itemQP_QLTY_CHEM.CHEM_COMP_CD == p.CHEM_COMP_CD)).ToList();
//if (ltCheck.Count == 0)
//{
// if (itemQP_QLTY_CHEM.CHEM_COMP_CD == "N" && ltQPChemRslt.Where(p => p.CHEM_COMP_CD == "N").ToList().Count == 0)
// {
// prP_PLATE.SUB_FULL = "P";
// prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/化学成分N";
// }
// else
// {
// COM_DATA CD = new COM_DATA();
// CD.PLATE_NO = prP_PLATE.PLATE_NO;
// CD.ORD_NO = prorde.ORD_NO;
// CD.ORD_ITEM = prorde.ORD_ITEM;
// CD.Chem = "1"; //化学特性
// //gCOM_DATA.Add(CD);//全局变量添加对不结果数据
// //不满足，
// //logger.InfoFormat("钢板:{0}，订单号:{1}-{2},钢板炉号化学成分不满足订单", prP_PLATE.PLATE_NO, prorde.ORD_NO, prorde.ORD_ITEM);
// return false;
// }
//}
}
catch ( Exception )
{
sunhao
4 months ago