1

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

@@ -927,14 +927,16 @@ namespace ibk.IPD.Controller.IPD_PS
                 //钢铁最早产出日期偏移量
                 if (intPLATE_DAYS_DIFF != 0)
                 {
-                    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')))";
                     //测试test指定
-                    //strWHerePlate += " AND GP.PLATE_NO in ('24105918350201')";
+                    //strWHerePlate += " AND GP.PLATE_NO in ('24105657140201')";
+
+                    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')))";
+
                 }
                 //余材自动替代周期
                 if (intORD_DAYS_DIFF != 0)
                 {                    //测试test指定
-                    //strWHereOrd += " AND boi.ORD_NO='OMB22110001' AND boi.ORD_ITEM='020'";
+                    //strWHereOrd += " AND boi.ORD_NO='OMB22110001' AND boi.ORD_ITEM='023'";
 
                     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'))) ";
                 }
@@ -5040,8 +5042,8 @@ namespace ibk.IPD.Controller.IPD_PS
                         TEMP_DATA Fir_TD = gTEMP_DATA.Where(p => p.PLATE_NO == TD.PLATE_NO
                   && p.USE_FLG != "1" && p.IS_REPLACE != "1"
                   && p.DEF_NUM > 0
-                   && (p.EFF_RATE * 100 >= DecSUB_RATE || p.PROFIT >= 0)
+                   && (((p.EFF_RATE * 100 >= DecSUB_RATE || p.PROFIT >= 0)
-                  && p.Scientific_substitution == "1").
+                  && p.Scientific_substitution == "1") || p.EFF_RATE * 100 >= 85)).
                       //&& p.SUB_RATE >= DecSUB_RATE).
                       OrderByDescending(p => p.PROFIT).ThenBy(p => p.CUST_DEL_TO_DATE).
                       FirstOrDefault();
@@ -10502,12 +10504,12 @@ namespace ibk.IPD.Controller.IPD_PS
                 }
 
             }
-            //标记为1，部分替代不取样，同时电文标记1
+            ////标记为1，部分替代不取样，同时电文标记1
-            if (IsSMPLen == 1)
+            //if (IsSMPLen == 1)
-            {
+            //{
-                IsSMPLen = 0;
+            //    IsSMPLen = 0;
-                return true;
+            //    return true;
-            }
+            //}
 
             List<QP_QLTY_MATR_MAIN> ltMain = gQP_QLTY_MATR_MAIN.Where(p => p.ORD_NO == prorder.ORD_NO && p.ORD_ITEM == prorder.ORD_ITEM).ToList();
 

余材替代程序/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 = "24105918350201";//24101846070122
+        private static string glstrPlateNo = "24105657140201";//24101846070122
 
         private static string glstrOrdNo = "OMB22110001";
 
-        private static string glstrOrdItem = "020";
+        private static string glstrOrdItem = "023";
 
 
         #region 获取存储数据