diff --git a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo b/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo index fc4eb88..0b923ac 100644 Binary files a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo and b/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo differ diff --git a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/HierarchyCache.v1.txt b/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/HierarchyCache.v1.txt index dca126b..c899f6d 100644 Binary files a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/HierarchyCache.v1.txt and b/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/HierarchyCache.v1.txt differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs index d0eceda..32dfeaa 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs @@ -8617,6 +8617,14 @@ namespace ibk.IPD.Controller.IPD_PS || prP_PLATE.WOO_RSN == "QZE" || prP_PLATE.WOO_RSN == "QAF" || prP_PLATE.WOO_RSN == "ABA" + || prP_PLATE.WOO_RSN == "DAA" + || prP_PLATE.WOO_RSN == "DBA" + || prP_PLATE.WOO_RSN == "DBB" + || prP_PLATE.WOO_RSN == "DBC" + || prP_PLATE.WOO_RSN == "DBD" + || prP_PLATE.WOO_RSN == "DBE" + || prP_PLATE.WOO_RSN == "DBF" + || prP_PLATE.WOO_RSN == "DBG" || prP_PLATE.WOO_RSN == "DAA") { return false; diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubService.cs b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubService.cs index 5248b2d..1c23883 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubService.cs +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubService.cs @@ -2781,7 +2781,7 @@ namespace ibk.IPD.Service.IPD_PS { if (!string.IsNullOrEmpty(prsup.SUB_LACK_CON)) { - if (prsup.SUB_LACK_CON.Contains("取样")) + if (prsup.SUB_LACK_CON.Contains("取样") || prsup.SUB_LACK_CON.Contains("物理") || prsup.SUB_LACK_CON.Contains("标准")) { strData.Append("1"); // 取样: VARCHAR2(1) b = true; @@ -2873,7 +2873,8 @@ namespace ibk.IPD.Service.IPD_PS { if (!string.IsNullOrEmpty(prsup.SUB_LACK_CON)) { - if (prsup.SUB_LACK_CON.Contains("取样")) + //if (prsup.SUB_LACK_CON.Contains("取样")) + if (prsup.SUB_LACK_CON.Contains("取样") || prsup.SUB_LACK_CON.Contains("物理") || prsup.SUB_LACK_CON.Contains("标准")) { strData.Append("1"); // 取样: VARCHAR2(1) b = true; diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubServiceTest.cs b/余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubServiceTest.cs index 3314448..879b131 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 = "24105657140201";//24101846070122 + private static string glstrPlateNo = "24207171010101";//24101846070122 - private static string glstrOrdNo = "OMB22110001"; + private static string glstrOrdNo = "OMG24080136"; - private static string glstrOrdItem = "023"; + private static string glstrOrdItem = "001"; #region 获取存储数据 diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe index 498625a..5069153 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 52446ca..50e77e8 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 498625a..5069153 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 52446ca..50e77e8 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb differ