diff --git a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo b/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo index 4ba9b53..e05a63b 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 5dbf61b..374eb2e 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs @@ -5105,6 +5105,8 @@ namespace ibk.IPD.Controller.IPD_PS lenSMP = ConverDataToDecimal(ltMain[0].SMP_LEN); } + TD.USE_FLG = "1";//不满足取样长度的,标记被使用 + logger.InfoFormat("取样长度二次验证,钢板号:{0},订单号:{1}-{2} 取样长度不足:{3}", TD.PLATE_NO, TD.ORD_NO, TD.ORD_ITEM, lenSMP); continue; @@ -10908,10 +10910,13 @@ namespace ibk.IPD.Controller.IPD_PS 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) { //int intSMP = 1;//T:头部 B:尾部 Y:头尾 头尾要*2 decimal decLen = (ConverDataToDecimal(prorder.ORD_LEN)); + logger.InfoFormat("取样长度记录:{0}-{1}-{2}", prorder.ORD_NO, prorder.ORD_ITEM, ltMain[0].SMP_LEN);//记录取样长度 if (prorder.SIZE_KND == "02" && ConverDataToDecimal(prorder.ORD_LEN_MIN) != 0) { decLen = ConverDataToDecimal(prorder.ORD_LEN_MIN); @@ -10944,6 +10949,7 @@ namespace ibk.IPD.Controller.IPD_PS else { decimal decLen = (ConverDataToDecimal(prorder.ORD_LEN)); + logger.InfoFormat("取样长度记录(记录不存在默认100):{0}-{1}-{2}", prorder.ORD_NO, prorder.ORD_ITEM, 100);//记录取样长度 if (prorder.SIZE_KND == "02" && ConverDataToDecimal(prorder.ORD_LEN_MIN) != 0) { decLen = ConverDataToDecimal(prorder.ORD_LEN_MIN); diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe index a1eeea0..366a586 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 41b56e1..f8b8a4c 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 a1eeea0..366a586 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 41b56e1..f8b8a4c 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb differ