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

1

Browse Source
main
sunhao 2 months ago
parent 4ed99c415c
commit b856678bd1
6 changed files with 6579 additions and 14 deletions
Show Stats Download Patch File Download Diff File

90
余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs
Unescape Escape View File

@ -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 ('23211884040101')";
//strWHerePlate += " AND GP.PLATE_NO in ('24205447320101')";
}
//余材自动替代周期
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='OMM24050019' AND boi.ORD_ITEM='085'";
//strWHereOrd += " AND boi.ORD_NO='OMD24070005' 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,20 +7929,23 @@ 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();
//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)
//CEQ 特殊处理
if (itemQP_QLTY_CHEM.CHEM_COMP_CD.ToUpper() == "CEQ")
{
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
//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;
@ -7953,9 +7956,68 @@ namespace ibk.IPD.Controller.IPD_PS
//不满足，返回false
//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)
&& 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);//全局变量添加对不结果数据
//不满足，返回false
//logger.InfoFormat("钢板:{0}，订单号:{1}-{2},钢板炉号化学成分不满足订单", prP_PLATE.PLATE_NO, prorde.ORD_NO, prorde.ORD_ITEM);
return false;
}
}
}
////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);//全局变量添加对不结果数据
// //不满足，返回false
// //logger.InfoFormat("钢板:{0}，订单号:{1}-{2},钢板炉号化学成分不满足订单", prP_PLATE.PLATE_NO, prorde.ORD_NO, prorde.ORD_ITEM);
// return false;
// }
//}
}
catch (Exception)
{

6503
余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubServiceTest.cs
View File

File diff suppressed because it is too large Load Diff

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/SinglePlateHandle.exe
View File

Binary file not shown.

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

Binary file not shown.
Write Preview
Loading…
Cancel
Save