diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs index 3a76ff2..11d41f3 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs @@ -14,6 +14,7 @@ using SinglePlateHandle.Enity; using SOA.Objects; using SOA.Persistent; using System; +using System.Collections.Concurrent; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -191,6 +192,9 @@ namespace ibk.IPD.Controller.IPD_PS //手动匹配钢板 private static IList gTB_PLATE_MANUAL = new List(); + + //取样判断信息记录 物理性能 取样 + private static ConcurrentBag gTPM = new ConcurrentBag(); //手动匹配钢板 private static IList guTB_PLATE_MANUAL = new List(); @@ -1525,6 +1529,8 @@ namespace ibk.IPD.Controller.IPD_PS logger.InfoFormat("******* 开始统计匹配数据 *******"); DateTime DATE_3 = DateTime.Now; + gTPM = new ConcurrentBag();//初始化匹配过程信息 物理，化学，取样，标准 + foreach (BP_ORDER_ITEM order in orderEntities) { //测试 @@ -2362,8 +2368,6 @@ namespace ibk.IPD.Controller.IPD_PS continue; } - - bool isSMP = false; //20240126 @@ -2387,24 +2391,38 @@ namespace ibk.IPD.Controller.IPD_PS } if (itemGP_PLATE.PROC_CD == "XAC") { - if (ConverDataToString(itemGP_PLATE.SUB_LACK_CON) == String.Empty) - { + //if (ConverDataToString(itemGP_PLATE.SUB_LACK_CON) == String.Empty) + //{ + // itemGP_PLATE.SUB_FULL = "C"; + //} + //else + //{ + // if (itemGP_PLATE.SUB_LACK_CON.Contains("物理")) + // { + // itemGP_PLATE.SUB_FULL = "P"; + // } + // if (itemGP_PLATE.SUB_LACK_CON.Contains("化学")) + // { + // itemGP_PLATE.SUB_FULL = "P"; + // } + // if (itemGP_PLATE.SUB_LACK_CON.Contains("标准")) + // { + // itemGP_PLATE.SUB_FULL = "P"; + // } + //} + if (gTPM.Where(TPM => TPM.PLATE_NO == itemGP_PLATE.PLATE_NO + && TPM.ORD_NO == order.ORD_NO + && TPM.ORD_ITEM == order.ORD_ITEM).Count() == 0) { itemGP_PLATE.SUB_FULL = "C"; } - else + if (gTPM.Where(TPM => TPM.PLATE_NO == itemGP_PLATE.PLATE_NO + && TPM.ORD_NO == order.ORD_NO + && TPM.ORD_ITEM == order.ORD_ITEM + && (TPM.RETURN_RESULTS.Contains("取样") + || TPM.RETURN_RESULTS.Contains("物理") + || TPM.RETURN_RESULTS.Contains("化学"))).Count() > 0) { - if (itemGP_PLATE.SUB_LACK_CON.Contains("物理")) - { - itemGP_PLATE.SUB_FULL = "P"; - } - if (itemGP_PLATE.SUB_LACK_CON.Contains("化学")) - { - itemGP_PLATE.SUB_FULL = "P"; - } - if (itemGP_PLATE.SUB_LACK_CON.Contains("标准")) - { - itemGP_PLATE.SUB_FULL = "P"; - } + itemGP_PLATE.SUB_FULL = "P"; } } @@ -2543,6 +2561,28 @@ namespace ibk.IPD.Controller.IPD_PS continue; } } + if (gTPM.Where(TPM => TPM.PLATE_NO == itemGP_PLATE.PLATE_NO + && TPM.ORD_NO == order.ORD_NO + && TPM.ORD_ITEM == order.ORD_ITEM + && (TPM.RETURN_RESULTS.Contains("取样") + || TPM.RETURN_RESULTS.Contains("物理"))).Count() > 0) + { + if (gSUB_TYPE_MGT.Where(p => p.PLT == itemGP_PLATE.PLT && p.SUB_TYPE == "部分替代").ToList().Count == 0) + { + if (gTB_PLATE_MANUAL.Where(p => p.PLATE_NO == itemGP_PLATE.PLATE_NO && p.ORD_NO == order.ORD_NO && p.ORD_ITEM == order.ORD_ITEM).ToList().Count > 0) + { + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = itemGP_PLATE.PLATE_NO; + manual.ORD_NO = order.ORD_NO; + manual.ORD_ITEM = order.ORD_ITEM; + manual.RETURN_RESULTS = itemGP_PLATE.PLT + "部分替代未开"; + guTB_PLATE_MANUAL.Add(manual); + } + //logger.InfoFormat("钢板:{0}，订单号:{1}，协议号:{2},部分替代未开", itemGP_PLATE.PLATE_NO, order.ORD_NO, order.ORD_ITEM); + continue; + } + } + if (itemGP_PLATE.SUB_FULL == "P") { //不可替代订单页面设置 @@ -3923,13 +3963,24 @@ namespace ibk.IPD.Controller.IPD_PS if ((ConverDataToDecimal(itemGP_PLATE.LEN) >= ConverDataToDecimal(order.ORD_LEN_MIN) && ConverDataToDecimal(itemGP_PLATE.LEN) <= ConverDataToDecimal(order.ORD_LEN_MAX))) { - if (ConverDataToString(itemGP_PLATE.SUB_LACK_CON) == String.Empty - && itemGP_PLATE.PROC_CD == "XAC" + //if (ConverDataToString(itemGP_PLATE.SUB_LACK_CON) == String.Empty + // && itemGP_PLATE.PROC_CD == "XAC" + // && itemGP_PLATE.WID == order.ORD_WID + // ) + //{ + // itemGP_PLATE.SUB_FULL = "C"; + //} + + if (gTPM.Where(TPM => TPM.PLATE_NO == itemGP_PLATE.PLATE_NO + && TPM.ORD_NO == order.ORD_NO + && TPM.ORD_ITEM == order.ORD_ITEM + ).Count() == 0 + && itemGP_PLATE.PROC_CD == "XAC" && itemGP_PLATE.WID == order.ORD_WID - ) - { + ) { itemGP_PLATE.SUB_FULL = "C"; } + } } //if (itemGP_PLATE.SUB_FULL == "C" && ((order.SPRAY_FL != String.Empty && order.SPRAY_FL != "N") || ConverDataToString(order.PACK_WAY) != String.Empty)) @@ -4356,7 +4407,7 @@ namespace ibk.IPD.Controller.IPD_PS #region 注释掉并样并号 没有用到 - //if (gPhyTEMP_DATA.Count > 0) + //if (gPhyTEMP_DATA.Count > 0) //{ // string HA = string.Empty; // int iHA = 0; @@ -5456,6 +5507,16 @@ namespace ibk.IPD.Controller.IPD_PS //测试test SerSurMatSubService.SaveSupersede(ilistSUPERSEDE, gSUPERSEDE_ORDER, gTEMP_DATA); } + + try + { + SerSurMatSubService.UpdateManual(gTPM.ToList()); + } + catch (Exception ex) + { + logger.Info("******存储日志：" + ex.ToString()); + } + if (gTB_PLATE_MANUAL.Count > 0) { SerSurMatSubService.UpdateManual(guTB_PLATE_MANUAL); @@ -8022,6 +8083,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/化学成分"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorde.ORD_NO; + manual.ORD_ITEM = prorde.ORD_ITEM; + manual.RETURN_RESULTS = "/取样"; + gTPM.Add(manual); } if (ltQPQltyChem.Count > 0) @@ -8079,6 +8146,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/化学成分N"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorde.ORD_NO; + manual.ORD_ITEM = prorde.ORD_ITEM; + manual.RETURN_RESULTS = "/化学成分N"; + gTPM.Add(manual); } else { @@ -8371,6 +8444,12 @@ namespace ibk.IPD.Controller.IPD_PS prP_PLATE.SUB_FULL = "P"; //prP_PLATE.SMP_NO = ""; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/镍系钢/取样"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorde.ORD_NO; + manual.ORD_ITEM = prorde.ORD_ITEM; + manual.RETURN_RESULTS = "/镍系钢/取样"; + gTPM.Add(manual); return true; } @@ -8529,6 +8608,14 @@ namespace ibk.IPD.Controller.IPD_PS //return false; prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/标准"; + + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorde.ORD_NO; + manual.ORD_ITEM = prorde.ORD_ITEM; + manual.RETURN_RESULTS = "/标准"; + gTPM.Add(manual); + //return true; } } @@ -8597,6 +8684,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/取样"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorde.ORD_NO; + manual.ORD_ITEM = prorde.ORD_ITEM; + manual.RETURN_RESULTS = "/取样"; + gTPM.Add(manual); } } else @@ -8605,6 +8698,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/取样"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorde.ORD_NO; + manual.ORD_ITEM = prorde.ORD_ITEM; + manual.RETURN_RESULTS = "/取样"; + gTPM.Add(manual); } } } @@ -8612,6 +8711,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/取样"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorde.ORD_NO; + manual.ORD_ITEM = prorde.ORD_ITEM; + manual.RETURN_RESULTS = "/取样"; + gTPM.Add(manual); } } if (prP_PLATE.APLY_STDSPEC == "S45C-NG") @@ -8625,6 +8730,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/标准"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorde.ORD_NO; + manual.ORD_ITEM = prorde.ORD_ITEM; + manual.RETURN_RESULTS = "/标准"; + gTPM.Add(manual); } //船板验证 @@ -8903,6 +9014,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/标准"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorde.ORD_NO; + manual.ORD_ITEM = prorde.ORD_ITEM; + manual.RETURN_RESULTS = "/标准"; + gTPM.Add(manual); if (prorde.STDSPEC.Contains("YL")) { if (prP_PLATE.APLY_STDSPEC.Contains("YL")) @@ -9746,6 +9863,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/探伤GK31"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/探伤GK31"; + gTPM.Add(manual); return true; } else @@ -9765,6 +9888,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/探伤"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/探伤"; + gTPM.Add(manual); return true; //if (ConverDataToString(prorder.UST_FL).Substring(0, 2) == "AA" || ConverDataToString(prorder.UST_FL).Substring(0, 2) == "NN") @@ -9856,6 +9985,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/探伤"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/探伤"; + gTPM.Add(manual); return true; } else @@ -10476,6 +10611,12 @@ namespace ibk.IPD.Controller.IPD_PS else { prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/切边"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/切边"; + gTPM.Add(manual); prP_PLATE.SUB_FULL = "P"; return true; } @@ -10630,18 +10771,45 @@ namespace ibk.IPD.Controller.IPD_PS // prP_PLATE.SUB_FULL = "P"; // prP_PLATE.SUB_LACK_CON += "/取样"; //} - if (string.IsNullOrEmpty(prP_PLATE.SUB_LACK_CON)) + + //TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + //manual.PLATE_NO = prP_PLATE.PLATE_NO; + //manual.ORD_NO = prorde.ORD_NO; + //manual.ORD_ITEM = prorde.ORD_ITEM; + //manual.RETURN_RESULTS = "/镍系钢/取样"; + //gTPM.Add(manual); + + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM).Count() > 0) { return true; } - if (!prP_PLATE.SUB_LACK_CON.Contains("物理")) - { - if (!prP_PLATE.SUB_LACK_CON.Contains("取样")) - { - return true; - } + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + && (TPM.RETURN_RESULTS.Contains("取样") + || TPM.RETURN_RESULTS.Contains("物理"))).Count() == 0) + { + return true; } + + //if (string.IsNullOrEmpty(prP_PLATE.SUB_LACK_CON)) + //{ + // return true; + //} + + //if (!prP_PLATE.SUB_LACK_CON.Contains("物理")) + //{ + // if (!prP_PLATE.SUB_LACK_CON.Contains("取样")) + // { + // return true; + // } + + //} + + ////标记为1，部分替代不取样，同时电文标记1 //if (IsSMPLen == 1) //{ @@ -10670,6 +10838,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON += "/取样"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/取样"; + gTPM.Add(manual); return true; } else @@ -10696,6 +10870,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON += "/取样"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/取样"; + gTPM.Add(manual); return true; } else @@ -10781,6 +10961,12 @@ namespace ibk.IPD.Controller.IPD_PS if (ltQPQltyMatrHA.Count == 0) { prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/订单性能HA"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HA"; + gTPM.Add(manual); return true; //return false; } @@ -10791,6 +10977,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HA"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HA"; + gTPM.Add(manual); return true; } @@ -11041,6 +11233,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HA"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HA"; + gTPM.Add(manual); return true; } //屈服点实绩 @@ -11265,6 +11463,12 @@ namespace ibk.IPD.Controller.IPD_PS if (ltQPQltyMatrHB.Count == 0) { prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/订单性能HB"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HB"; + gTPM.Add(manual); return true; //return false; } @@ -11276,6 +11480,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HB"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HB"; + gTPM.Add(manual); return true; } //冷弯实验实绩 @@ -11290,6 +11500,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HB"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HB"; + gTPM.Add(manual); return true; } @@ -11299,6 +11515,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HB"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HB"; + gTPM.Add(manual); return true; } @@ -11344,6 +11566,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HB"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HC"; + gTPM.Add(manual); return true; } //冷弯实验实绩 @@ -11358,6 +11586,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HB"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HB"; + gTPM.Add(manual); return true; } @@ -11367,6 +11601,13 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HB"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HB"; + gTPM.Add(manual); + return true; } @@ -11386,6 +11627,12 @@ namespace ibk.IPD.Controller.IPD_PS if (ltQPQltyMatrHC.Count == 0) { prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/订单性能HC"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HC"; + gTPM.Add(manual); return true; } //获取钢板的物理特性 @@ -11399,6 +11646,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HC"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HC"; + gTPM.Add(manual); return true; } //20240407 满足其一即可 @@ -11512,6 +11765,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HC"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HC"; + gTPM.Add(manual); return true; } @@ -11525,6 +11784,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HC"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HC"; + gTPM.Add(manual); return true; } foreach (QP_TEST_RSLT_HC rsltHC_TIM in ltQPTestRsltHC_TIM) @@ -11628,6 +11893,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HC"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HC"; + gTPM.Add(manual); return false; } @@ -12098,6 +12369,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HC"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HC"; + gTPM.Add(manual); return true; } //冲击试验 @@ -12198,6 +12475,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HC"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HC"; + gTPM.Add(manual); return true; } //6个冲击试验只能有一个小于最小值，不能有两个小于最小值 @@ -12268,6 +12551,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HC"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HC"; + gTPM.Add(manual); return true; } } @@ -12381,6 +12670,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HC"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HC"; + gTPM.Add(manual); return true; } } @@ -12483,6 +12778,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HD"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HD"; + gTPM.Add(manual); return true; } @@ -12543,6 +12844,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HD"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HD"; + gTPM.Add(manual); return true; } @@ -12585,6 +12892,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HE"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HE"; + gTPM.Add(manual); return true; } @@ -12712,6 +13025,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HE"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HE"; + gTPM.Add(manual); return true; } @@ -12821,6 +13140,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HF"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HF"; + gTPM.Add(manual); return true; } @@ -12905,6 +13230,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HF"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HF"; + gTPM.Add(manual); return true; } @@ -12969,6 +13300,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HJ"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HJ"; + gTPM.Add(manual); return true; } @@ -13100,6 +13437,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HJ"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HJ"; + gTPM.Add(manual); return true; } @@ -13208,6 +13551,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HK"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HK"; + gTPM.Add(manual); return true; } @@ -13275,6 +13624,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HK"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HK"; + gTPM.Add(manual); return true; } @@ -13321,6 +13676,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HM"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HM"; + gTPM.Add(manual); return true; } @@ -13378,6 +13739,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HM"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HM"; + gTPM.Add(manual); return true; } @@ -13414,6 +13781,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HN"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HN"; + gTPM.Add(manual); return true; } @@ -13487,6 +13860,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HN"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HN"; + gTPM.Add(manual); return true; } @@ -13539,6 +13918,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HR"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HR"; + gTPM.Add(manual); return true; } @@ -13643,6 +14028,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HR"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HR"; + gTPM.Add(manual); return true; } @@ -13726,6 +14117,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HZ"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HZ"; + gTPM.Add(manual); return true; } @@ -13918,6 +14315,12 @@ namespace ibk.IPD.Controller.IPD_PS { prP_PLATE.SUB_FULL = "P"; prP_PLATE.SUB_LACK_CON = prP_PLATE.SUB_LACK_CON + "/物理性能HZ"; + TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + manual.PLATE_NO = prP_PLATE.PLATE_NO; + manual.ORD_NO = prorder.ORD_NO; + manual.ORD_ITEM = prorder.ORD_ITEM; + manual.RETURN_RESULTS = "/物理性能HZ"; + gTPM.Add(manual); return true; } @@ -14361,10 +14764,19 @@ namespace ibk.IPD.Controller.IPD_PS { iswid = false; } - if (!prP_PLATE.SUB_LACK_CON.Contains("取样")) + //if (!prP_PLATE.SUB_LACK_CON.Contains("取样")) + //{ + // smp_len = "0"; + //} + + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + && TPM.RETURN_RESULTS.Contains("取样")).Count() > 0) { smp_len = "0"; } + if (ConverDataToDecimal(eff_len) > ConverDataToDecimal(supersede.SUB_US_LEN)) { if (iswid) @@ -14863,10 +15275,18 @@ namespace ibk.IPD.Controller.IPD_PS { iswid = false; } - if (!prP_PLATE.SUB_LACK_CON.Contains("物理")) + //if (!prP_PLATE.SUB_LACK_CON.Contains("物理")) + //{ + // smp_len = "0"; + //} + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + && TPM.RETURN_RESULTS.Contains("物理")).Count() == 0) { smp_len = "0"; } + if (ConverDataToDecimal(eff_len) > ConverDataToDecimal(supersede.SUB_US_LEN)) { if (iswid) @@ -15198,24 +15618,39 @@ namespace ibk.IPD.Controller.IPD_PS if (prP_PLATE.PROC_CD == "XAC") { - if (ConverDataToString(prP_PLATE.SUB_LACK_CON) == String.Empty) + //if (ConverDataToString(prP_PLATE.SUB_LACK_CON) == String.Empty) + //{ + // td.SUB_KND = "C"; + //} + //else + //{ + // if (prP_PLATE.SUB_LACK_CON.Contains("物理")) + // { + // td.SUB_KND = "P"; + // } + // if (prP_PLATE.SUB_LACK_CON.Contains("化学")) + // { + // td.SUB_KND = "P"; + // } + // if (prP_PLATE.SUB_LACK_CON.Contains("标准")) + // { + // td.SUB_KND = "P"; + // } + //} + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM).Count() == 0) { td.SUB_KND = "C"; } - else + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + && (TPM.RETURN_RESULTS.Contains("取样") + || TPM.RETURN_RESULTS.Contains("物理") + || TPM.RETURN_RESULTS.Contains("化学"))).Count() > 0) { - if (prP_PLATE.SUB_LACK_CON.Contains("物理")) - { - td.SUB_KND = "P"; - } - if (prP_PLATE.SUB_LACK_CON.Contains("化学")) - { - td.SUB_KND = "P"; - } - if (prP_PLATE.SUB_LACK_CON.Contains("标准")) - { - td.SUB_KND = "P"; - } + td.SUB_KND = "P"; } } @@ -15411,10 +15846,19 @@ namespace ibk.IPD.Controller.IPD_PS decimal ord_len_min = 0; decimal ord_len_max = 0; List ltMain = gQP_QLTY_MATR_MAIN.Where(p => p.ORD_NO == prorder.ORD_NO && p.ORD_ITEM == prorder.ORD_ITEM).ToList(); - if (ltMain.Count > 0 && prP_PLATE.SUB_LACK_CON.Contains("取样")) + //if (ltMain.Count > 0 && prP_PLATE.SUB_LACK_CON.Contains("取样")) + //{ + // smp_len = ConverDataToDecimal(ltMain[0].SMP_LEN); + //} + if (ltMain.Count > 0 + && gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + && TPM.RETURN_RESULTS.Contains("取样")).Count() > 0) { smp_len = ConverDataToDecimal(ltMain[0].SMP_LEN); } + decimal len = ConverDataToDecimal(prP_PLATE.LEN); //钢板长 decimal wid = ConverDataToDecimal(prP_PLATE.WID); //钢板宽 decimal ord_wid = ConverDataToDecimal(prorder.ORD_WID); //订单宽 @@ -15598,17 +16042,31 @@ namespace ibk.IPD.Controller.IPD_PS // / (Convert.ToDecimal(prP_PLATE.WID) * Convert.ToDecimal(prP_PLATE.LEN))) * 100), 2);//替代率 //td.EFF_RATE = Math.Round((((Convert.ToDecimal(prorder.ORD_WID) * Convert.ToDecimal(prP_PLATE.LEN)) * intSubNum // / (Convert.ToDecimal(prP_PLATE.WID) * Convert.ToDecimal(prP_PLATE.LEN)))), 2);//替代率 - if (ConverDataToString(prP_PLATE.SUB_LACK_CON) == String.Empty - && prP_PLATE.PROC_CD == "XAC" - && prP_PLATE.WID == prorder.ORD_WID - ) + //if (ConverDataToString(prP_PLATE.SUB_LACK_CON) == String.Empty + // && prP_PLATE.PROC_CD == "XAC" + // && prP_PLATE.WID == prorder.ORD_WID + // ) + //{ + // //td.SUB_KND = "C"; + // //lizhuo + // td.SUB_RATE = 100; + // td.EFF_RATE = 1; + // prorder.ORD_LEN = prP_PLATE.LEN; + //} + + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + ).Count() == 0 + && prP_PLATE.PROC_CD == "XAC" + && prP_PLATE.WID == prorder.ORD_WID + ) { - //td.SUB_KND = "C"; - //lizhuo td.SUB_RATE = 100; td.EFF_RATE = 1; prorder.ORD_LEN = prP_PLATE.LEN; } + } } @@ -15625,24 +16083,40 @@ namespace ibk.IPD.Controller.IPD_PS //20240131改 if (prP_PLATE.PROC_CD == "XAC" && td.EFF_RATE == 1 && td.SUB_RATE == 100) { - if (ConverDataToString(prP_PLATE.SUB_LACK_CON) == String.Empty) + //if (ConverDataToString(prP_PLATE.SUB_LACK_CON) == String.Empty) + //{ + // td.SUB_KND = "C"; + //} + //else + //{ + // if (prP_PLATE.SUB_LACK_CON.Contains("物理")) + // { + // td.SUB_KND = "P"; + // } + // if (prP_PLATE.SUB_LACK_CON.Contains("化学")) + // { + // td.SUB_KND = "P"; + // } + // if (prP_PLATE.SUB_LACK_CON.Contains("标准")) + // { + // td.SUB_KND = "P"; + // } + //} + + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM).Count() == 0) { td.SUB_KND = "C"; } - else + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + && (TPM.RETURN_RESULTS.Contains("取样") + || TPM.RETURN_RESULTS.Contains("物理") + || TPM.RETURN_RESULTS.Contains("化学"))).Count() > 0) { - if (prP_PLATE.SUB_LACK_CON.Contains("物理")) - { - td.SUB_KND = "P"; - } - if (prP_PLATE.SUB_LACK_CON.Contains("化学")) - { - td.SUB_KND = "P"; - } - if (prP_PLATE.SUB_LACK_CON.Contains("标准")) - { - td.SUB_KND = "P"; - } + td.SUB_KND = "P"; } } @@ -15799,7 +16273,17 @@ namespace ibk.IPD.Controller.IPD_PS td.HOISTING_WAREHOUSE = td.INV; td.HOISTING_COSTS = DecHOISTING_COSTS.ToString(); } - if (!prP_PLATE.SUB_LACK_CON.Contains("取样")) + + //if (!prP_PLATE.SUB_LACK_CON.Contains("取样")) + //{ + // //cuttingcosts = 0;//切割给用费用 + // inspectcost = 0; + // transportcost += DecTRANSPORT_COSTS; + //} + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + && TPM.RETURN_RESULTS.Contains("取样")).Count() == 0) { //cuttingcosts = 0;//切割给用费用 inspectcost = 0; @@ -16018,10 +16502,19 @@ namespace ibk.IPD.Controller.IPD_PS { iswid = false; } - if (!prP_PLATE.SUB_LACK_CON.Contains("取样")) + + //if (!prP_PLATE.SUB_LACK_CON.Contains("取样")) + //{ + // smp_len = "0"; + //} + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + && TPM.RETURN_RESULTS.Contains("取样")).Count() == 0) { smp_len = "0"; } + //decimal cuttingcosts = 0; //decimal transportcost = 0; //decimal inspectcost = 0; @@ -16586,10 +17079,20 @@ namespace ibk.IPD.Controller.IPD_PS //{ // smp_len = ConverDataToDecimal(ltMain[0].SMP_LEN); //} - if (ltMain.Count > 0 && prP_PLATE.SUB_LACK_CON != null && prP_PLATE.SUB_LACK_CON.Contains("取样")) + //if (ltMain.Count > 0 && prP_PLATE.SUB_LACK_CON != null && prP_PLATE.SUB_LACK_CON.Contains("取样")) + //{ + // smp_len = ConverDataToDecimal(ltMain[0].SMP_LEN); + //} + + if (ltMain.Count > 0 + && gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + && TPM.RETURN_RESULTS.Contains("取样")).Count() > 0) { smp_len = ConverDataToDecimal(ltMain[0].SMP_LEN); } + decimal len = ConverDataToDecimal(prP_PLATE.LEN); //钢板长 decimal wid = ConverDataToDecimal(prP_PLATE.WID); //钢板宽 decimal ord_wid = ConverDataToDecimal(prorder.ORD_WID); //订单宽 @@ -16767,13 +17270,26 @@ namespace ibk.IPD.Controller.IPD_PS // / (Convert.ToDecimal(prP_PLATE.WID) * Convert.ToDecimal(prP_PLATE.LEN))) * 100), 2);//替代率 //td.EFF_RATE = Math.Round((((Convert.ToDecimal(prorder.ORD_WID) * Convert.ToDecimal(prP_PLATE.LEN)) * intSubNum // / (Convert.ToDecimal(prP_PLATE.WID) * Convert.ToDecimal(prP_PLATE.LEN)))), 2);//替代率 - if (ConverDataToString(prP_PLATE.SUB_LACK_CON) == String.Empty - && prP_PLATE.PROC_CD == "XAC" - && prP_PLATE.WID == prorder.ORD_WID - ) + //if (ConverDataToString(prP_PLATE.SUB_LACK_CON) == String.Empty + // && prP_PLATE.PROC_CD == "XAC" + // && prP_PLATE.WID == prorder.ORD_WID + // ) + //{ + // //td.SUB_KND = "C"; + // //lizhuo + // td.SUB_RATE = 100; + // td.EFF_RATE = 1; + // prorder.ORD_LEN = prP_PLATE.LEN; + //} + + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + ).Count() == 0 + && prP_PLATE.PROC_CD == "XAC" + && prP_PLATE.WID == prorder.ORD_WID + ) { - //td.SUB_KND = "C"; - //lizhuo td.SUB_RATE = 100; td.EFF_RATE = 1; prorder.ORD_LEN = prP_PLATE.LEN; @@ -16792,24 +17308,39 @@ namespace ibk.IPD.Controller.IPD_PS //20240131改 if (prP_PLATE.PROC_CD == "XAC" && td.EFF_RATE == 1 && td.SUB_RATE == 100) { - if (ConverDataToString(prP_PLATE.SUB_LACK_CON) == String.Empty) + //if (ConverDataToString(prP_PLATE.SUB_LACK_CON) == String.Empty) + //{ + // td.SUB_KND = "C"; + //} + //else + //{ + // if (prP_PLATE.SUB_LACK_CON.Contains("物理")) + // { + // td.SUB_KND = "P"; + // } + // if (prP_PLATE.SUB_LACK_CON.Contains("化学")) + // { + // td.SUB_KND = "P"; + // } + // if (prP_PLATE.SUB_LACK_CON.Contains("标准")) + // { + // td.SUB_KND = "P"; + // } + //} + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM).Count() == 0) { td.SUB_KND = "C"; } - else + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + && (TPM.RETURN_RESULTS.Contains("取样") + || TPM.RETURN_RESULTS.Contains("物理") + || TPM.RETURN_RESULTS.Contains("化学"))).Count() > 0) { - if (prP_PLATE.SUB_LACK_CON.Contains("物理")) - { - td.SUB_KND = "P"; - } - if (prP_PLATE.SUB_LACK_CON.Contains("化学")) - { - td.SUB_KND = "P"; - } - if (prP_PLATE.SUB_LACK_CON.Contains("标准")) - { - td.SUB_KND = "P"; - } + td.SUB_KND = "P"; } } @@ -16963,10 +17494,24 @@ namespace ibk.IPD.Controller.IPD_PS td.HOISTING_WAREHOUSE = td.INV; td.HOISTING_COSTS = DecHOISTING_COSTS.ToString(); } - //20240122改 - if (prP_PLATE.SUB_LACK_CON != null) + ////20240122改 + //if (prP_PLATE.SUB_LACK_CON != null) + + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + ).Count() > 0) { - if (!prP_PLATE.SUB_LACK_CON.Contains("取样")) + //if (!prP_PLATE.SUB_LACK_CON.Contains("取样")) + //{ + // //cuttingcosts = 0;//切割给用费用 + // inspectcost = 0; + // transportcost += DecTRANSPORT_COSTS; + //} + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + && TPM.RETURN_RESULTS.Contains("取样")).Count() == 0) { //cuttingcosts = 0;//切割给用费用 inspectcost = 0; @@ -17185,7 +17730,14 @@ namespace ibk.IPD.Controller.IPD_PS { iswid = false; } - if (!prP_PLATE.SUB_LACK_CON.Contains("取样")) + //if (!prP_PLATE.SUB_LACK_CON.Contains("取样")) + //{ + // smp_len = "0"; + //} + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + && TPM.RETURN_RESULTS.Contains("取样")).Count() == 0) { smp_len = "0"; } @@ -17663,7 +18215,11 @@ namespace ibk.IPD.Controller.IPD_PS } //是否缺失物理特性 20240122判断协议替代SUB_LACK_CON为空 - if (prP_PLATE.SUB_LACK_CON != null) + //if (prP_PLATE.SUB_LACK_CON != null) + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + ).Count() > 0) { if (prP_PLATE.SUB_LACK_CON.Contains("取样")) { @@ -17750,12 +18306,27 @@ namespace ibk.IPD.Controller.IPD_PS //{ // //decLen = ConverDataToDecimal(prorder.ORD_LEN_MIN); //} - //是否缺失物理特性 - if (prP_PLATE.SUB_LACK_CON == null) + ////是否缺失物理特性 + //if (prP_PLATE.SUB_LACK_CON == null) + //{ + // prP_PLATE.SUB_LACK_CON = ""; + //} + + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + ).Count() == 0) { prP_PLATE.SUB_LACK_CON = ""; } - if (prP_PLATE.SUB_LACK_CON.Contains("物理")) + + //if (prP_PLATE.SUB_LACK_CON.Contains("物理")) + + if (gTPM.Where(TPM => TPM.PLATE_NO == prP_PLATE.PLATE_NO + && TPM.ORD_NO == prorder.ORD_NO + && TPM.ORD_ITEM == prorder.ORD_ITEM + && TPM.RETURN_RESULTS.Contains("物理") + ).Count() > 0) { decimal decSMPLen = 100; if (ltMain.Count > 0) diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe index d805087..2e08120 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 18a54fa..e91a334 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.csproj.AssemblyReference.cache b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache index 5dd845e..6eb26ca 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe index d805087..2e08120 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 18a54fa..e91a334 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb differ