1

余材替代程序/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs

@@ -95,7 +95,6 @@ namespace ibk.IPD.Controller.IPD_PS
 
         private static IList<ZP_CD> gltDZBWar = new List<ZP_CD>();
 
-
         private static IList<ZP_CD> gltRCLLW = new List<ZP_CD>();
 
         private static IList<THK_TOLER_INTER> gltGCJJ = new List<THK_TOLER_INTER>();
@@ -125,7 +124,6 @@ namespace ibk.IPD.Controller.IPD_PS
         //可用订单集合
         private static IList<BP_ORDER_ITEM> orderEntitie = new List<BP_ORDER_ITEM>();
 
-
         //可用余材集合
         private static IList<GP_PLATE> gP_PLATEs = new List<GP_PLATE>();
 
@@ -167,7 +165,6 @@ namespace ibk.IPD.Controller.IPD_PS
         //未成功数据
         private static IList<SUPERSEDE_HISTORY> gUnS_SUPERSEDE_HISTORY = new List<SUPERSEDE_HISTORY>();
 
-
         //待确认订单明细
         private static IList<SUPERSEDE_ORDER> gSUPERSEDE_ORDER = new List<SUPERSEDE_ORDER>();
 
@@ -204,7 +201,6 @@ namespace ibk.IPD.Controller.IPD_PS
         //获取新发订单
         private static IList<TB_NEW_ORD> gTB_NEW_ORD = new List<TB_NEW_ORD>();
 
-
         private static IList<BASEPRICE1> gBASEPRICE = new List<BASEPRICE1>();
 
 
@@ -928,7 +924,7 @@ namespace ibk.IPD.Controller.IPD_PS
                 if (intPLATE_DAYS_DIFF != 0)
                 {
                     //测试test指定
-                    //strWHerePlate += " AND GP.PLATE_NO in ('24134075050406')";
+                    //strWHerePlate += " AND GP.PLATE_NO in ('25101286010101')";
 
                     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')))";
 
@@ -936,7 +932,7 @@ namespace ibk.IPD.Controller.IPD_PS
                 //余材自动替代周期
                 if (intORD_DAYS_DIFF != 0)
                 {                    //测试test指定
-                    //strWHereOrd += " AND boi.ORD_NO='OM725020125' AND boi.ORD_ITEM='003'";
+                    //strWHereOrd += " AND boi.ORD_NO='OMB22110001' AND boi.ORD_ITEM='038'";
 
                     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'))) ";
                 }
@@ -1626,6 +1622,9 @@ namespace ibk.IPD.Controller.IPD_PS
                                     //}
                                     continue;
                                 }
+                               
+                                
+
 
                                 //进程代码
                                 if (itemGP_PLATE.PROC_CD == "XAC")
@@ -1634,7 +1633,17 @@ namespace ibk.IPD.Controller.IPD_PS
                                 }
                                 else
                                 {
+                                    //标注缺陷的协议的D状态钢板都不要替代吧，如果是X状态的钢板就可以替代。 陈萌 2025-03-17
                                     itemGP_PLATE.SUB_FULL = "P";
+                                    if ((itemGP_PLATE.WOO_RSN == "DBB"
+                                      || itemGP_PLATE.WOO_RSN == "DBC"
+                                      || itemGP_PLATE.WOO_RSN == "DBD"
+                                      || itemGP_PLATE.WOO_RSN == "DBE"
+                                      || itemGP_PLATE.WOO_RSN == "DBF"
+                                      || itemGP_PLATE.WOO_RSN == "DBG"))
+                                    {
+                                        continue;
+                                    }
                                 }
 
                                 //标准