diff --git a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo b/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo index 71d108e..e9b9e2f 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 d994505..8dc7902 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs @@ -8591,6 +8591,11 @@ namespace ibk.IPD.Controller.IPD_PS //船板验证 if (gYCTD_WHs.Where(p => p.TD_STANDARD_NO == prorde.STDSPEC && p.STANDARD_NO == prP_PLATE.APLY_STDSPEC && p.FCB_TD =="是").ToList().Count > 0) { + //2025-02-07 针对XAC正品余材及(表面等级和产品等级都为1的材)不应受缺陷约束 + if (prP_PLATE.PROC_CD == "XAC" && prP_PLATE.PROD_GRD == "1" && prP_PLATE.SURF_GRD == "1") + { + return true; + } //-对非船板替代的标准(标准表维护输入值为“是”) //-厚度规格≤40mm; //-碳当量(CEQ)≤0.44 diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubServiceTest.cs b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubServiceTest.cs index 09748cb..f6ab739 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 = "24310104410101";//24101846070122 + private static string glstrPlateNo = "25300426380201";//24101846070122 - private static string glstrOrdNo = "OMK24120078"; + private static string glstrOrdNo = "0M725020062"; - private static string glstrOrdItem = "011"; + private static string glstrOrdItem = "041"; #region 获取存储数据 diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe index a350175..f736826 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 a309e44..8a8912b 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 a350175..f736826 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 a309e44..8a8912b 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb differ