diff --git a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo b/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo index 81b9758..0bc7377 100644 Binary files a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo and b/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs index 908bd22..ebbd450 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs @@ -23,6 +23,7 @@ using System.IO; using System.Linq; using System.Reflection; using System.Runtime.ConstrainedExecution; +using System.Security.Cryptography; using System.Text; using System.Text.RegularExpressions; using System.Threading; @@ -928,7 +929,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 ('24205447320101')"; + //strWHerePlate += " AND GP.PLATE_NO in ('24102504410202')"; } //余材自动替代周期 if (intORD_DAYS_DIFF != 0) @@ -936,7 +937,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='OMD24070005' AND boi.ORD_ITEM='096'"; + //strWHereOrd += " AND boi.ORD_NO='OM724070045' AND boi.ORD_ITEM='010'"; 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'))) "; } @@ -8531,6 +8532,82 @@ namespace ibk.IPD.Controller.IPD_PS { return false; } + + #region 缺陷编号 + //G0099 AAD 吊运撞伤 吊运撞伤 板型 + //G0099 AAF 成分不合 成分不合 成分 + //G0099 AAH 凸块 凸块 表面 + //G0099 AAK 划伤 划伤 表面 + //G0099 ABA 结疤 结疤 表面 + //G0099 ABC 辊印 辊印 表面 + //G0099 ACA 麻面 麻面 表面 + //G0099 ACB 麻坑 麻坑 表面 + //G0099 ACC 卷轧头尾麻面划伤 卷轧头尾麻面划伤 卷轧划伤 + //G0099 ACQ 水波纹 水波纹 表面 + //G0099 AEB 重皮 重皮 表面 + //G0099 AFA 卷取炉掉渣 卷取炉掉渣 表面 + //G0099 AFB 夹杂 夹杂 表面 + //G0099 AGA 横向裂纹 横向裂纹 裂纹 + //G0099 AGB 纵向裂纹 纵向裂纹 裂纹 + //G0099 AGC 气泡状裂纹 气泡状裂纹 裂纹 + //G0099 AGD 应力裂纹 应力裂纹 裂纹 + //G0099 AGZ 碎裂纹 碎裂纹 裂纹 + //G0099 AHA 过烧 过烧 表面 + //G0099 AJA 网纹 网纹 表面 + //G0099 AKA 凹坑 凹坑 表面 + //G0099 AKB 矫直辊压痕 矫直辊压痕 表面 + //G0099 AKC 双边剪压痕 双边剪压痕 表面 + //G0099 AKD 异物压入 异物压入 表面 + //G0099 AKE 定尺剪压痕 定尺剪压痕 表面 + //G0099 AKF 轧辊压痕 轧辊压痕 表面 + //G0099 AKI 丸粒压入 丸粒压入 表面 + //G0099 ALA 毛刺 毛刺 剪切 + //G0099 APA 端部未剪 端部未剪 剪切 + //G0099 AQB 台阶 台阶 剪切 + //G0099 ARD 氧化皮破损 氧化皮破损 热轧 + //G0099 ARE 钢板角裂 钢板角裂 + //G0099 ARF 倒角折叠 倒角折叠 炼钢 + //G0099 BAM 厚度超上限 厚度超上限 尺寸 + //G0099 BAN 厚度超下限 厚度超下限 尺寸 + //G0099 BAQ 厚度异常 厚度异常 尺寸 + //G0099 BBQ 短尺 短尺 尺寸 + //G0099 BCA 小尺板 小尺板 尺寸 + //G0099 BDA 产品宽度不足 产品宽度不足 尺寸 + //G0099 BDE 折叠 折叠 表面 + //G0099 CAT 瓢曲 瓢曲 板型 + //G0099 CCA 矩形度超标 矩形度超标 尺寸 + //G0099 CDA 塔形度超标 塔形度超标 尺寸 + //G0099 CEC 单侧毛边 单侧毛边 剪切 + //G0099 CFA 轧损 轧损 板型 + //G0099 CGA 镰刀弯 镰刀弯 板型 + //G0099 CHA 松卷 松卷 板型 + //G0099 DAA 分层 分层 探伤 + //G0099 DBA 内部缺陷 内部缺陷 探伤 + //G0099 DBB 厚度1 / 2点状缺陷 厚度1/ 2点状缺陷 探伤 + //G0099 DBC 厚度1 / 2片状缺陷 厚度1/ 2片状缺陷 探伤 + //G0099 DBD 厚度1 / 4点状缺陷 厚度1/ 4点状缺陷 探伤 + //G0099 DBE 厚度1 / 4片状缺陷 厚度1/ 4片状缺陷 探伤 + //G0099 DBF 厚度1 / 2、1 / 4点状缺陷 厚度1/ 2、1 / 4点状缺陷 探伤 + //G0099 DBG 厚度1 / 2、1 / 4片状缺陷 厚度1/ 2、1 / 4片状缺陷 探伤 + //G0099 QAE 炉底辊结瘤 炉底辊结瘤 表面 + //G0099 QAF 单板性能不合 单板性能不合 性能 + //G0099 QAG 质量异议 质量异议 + //G0099 QQA 性能不合 性能不合 性能 + //G0099 QZA 消化余坯 消化余坯 + //G0099 QZB 工艺附带 工艺附带 + //G0099 QZD 销售录单 销售录单 + //G0099 QZE 夹杂物超标 夹杂物超标 + //G0099 QZF 新品试制 新品试制 + //G0099 QZG 产品认证 产品认证 + //G0099 QZI 成品成分不合 成品成分不合 + //G0099 QZJ 金相不合 金相不合 + //G0099 QZK 工艺异常 工艺异常 + //G0099 QZL HIC不合 HIC不合 + //G0099 QZM 双鼓折叠 双鼓折叠 + //G0099 QZN 热装裂纹 热装裂纹 + //G0099 QZO 边部黑线 边部黑线 + #endregion + //BAN 厚度超下限 //QQA 性能不合 if (prP_PLATE.WOO_RSN == "BAN" @@ -8540,6 +8617,7 @@ namespace ibk.IPD.Controller.IPD_PS || prP_PLATE.WOO_RSN == "AFB" || prP_PLATE.WOO_RSN == "QZE" || prP_PLATE.WOO_RSN == "QAF" + || prP_PLATE.WOO_RSN == "ABA" || prP_PLATE.WOO_RSN == "DAA") { return false; @@ -8670,7 +8748,7 @@ namespace ibk.IPD.Controller.IPD_PS { if (prP_PLATE.SUB_FULL == "P") { - if (gYCTD_WHs.Where(p => p.TD_STANDARD_NO == prorde.STDSPEC && ConverDataToString(p.TD_FL).Contains("完全")).ToList().Count > 0) + if (ltPlateSTD.Where(p => p.TD_STANDARD_NO == prorde.STDSPEC && ConverDataToString(p.TD_FL).Contains("完全")).ToList().Count > 0) { return false; } @@ -9253,6 +9331,21 @@ namespace ibk.IPD.Controller.IPD_PS if (gNI.Where(p => p.STLGRD == prP_PLATE.STLGRD).ToList().Count > 0) { STLGRD = prP_PLATE.STLGRD; + //2024-08-01 Ni钢余材在WX,WJ,WN,WQ,WT,LG,KH,WL,RY、W7库，最早交货期偏移量≥15天 + if (ConverDataToDecimal(prorde.CUST_DEL_TO_DATE) <= ConverDataToDecimal(DateTime.Now.AddDays(15).ToString("yyyyMMdd"))) + { + STLGRD = string.Empty; + INV = string.Empty; + 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.War = "1"; //仓库 + //gCOM_DATA.Add(CD);//全局变量添加对不结果数据 + return false; + } + + //2023.1.28 可以刘桂英提出 镍系钢不做部分替代 //if(prP_PLATE.SUB_FULL=="P") //{ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubServiceTest.cs b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubServiceTest.cs index 8fbeb59..6d32fcc 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubServiceTest.cs +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubServiceTest.cs @@ -20,11 +20,11 @@ namespace ibk.IPD.Service.IPD_PS { private static readonly ILog logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private static string glstrPlateNo = "24205447320101";//24101846070122 + private static string glstrPlateNo = "24105918350201";//24101846070122 - private static string glstrOrdNo = "OMD24070005"; + private static string glstrOrdNo = "OMB22110001"; - private static string glstrOrdItem = "096"; + private static string glstrOrdItem = "020"; #region 获取存储数据 diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe index 1597c50..9618978 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb index c87ea7c..007e700 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe index 1597c50..9618978 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb index c87ea7c..007e700 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb differ