chenxy пре 5 година
родитељ
комит
f148272758
1 измењених фајлова са 28 додато и 21 уклоњено
  1. 28 21
      DK.Service/ReportModuleLogic/ReportModuleLogic.cs

+ 28 - 21
DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -3289,12 +3289,14 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
             selSql.Append(sqlString);
             if (se.CreateTimeStart.HasValue)
             {
-                selSql.Append("    AND pd.checktime >= :checktimeStart\n");
+                //selSql.Append("    AND pd.checktime >= :checktimeStart\n");
+                selSql.Append("    AND pd.createtime >= :checktimeStart\n");
                 parameters.Add(new OracleParameter(":checktimeStart", OracleDbType.Date, se.CreateTimeStart.Value, ParameterDirection.Input));
             }
             if (se.CreateTimeEnd.HasValue)
             {
-                selSql.Append("    AND pd.checktime < :checktimeEnd\n");
+                //selSql.Append("    AND pd.checktime < :checktimeEnd\n");
+                selSql.Append("    AND pd.createtime < :checktimeEnd\n");
                 parameters.Add(new OracleParameter(":checktimeEnd", OracleDbType.Date, se.CreateTimeEnd.Value, ParameterDirection.Input));
             }
             if (!string.IsNullOrEmpty(se.GoodsIDS))
@@ -3749,12 +3751,14 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
             selSql.Append(sqlString);
             if (se.CreateTimeStart.HasValue)
             {
-                selSql.Append("    AND pd.checktime >= :checktimeStart\n");
+                //selSql.Append("    AND pd.checktime >= :checktimeStart\n");
+                selSql.Append("    AND pd.createtime >= :checktimeStart\n");
                 parameters.Add(new OracleParameter(":checktimeStart", OracleDbType.Date, se.CreateTimeStart.Value, ParameterDirection.Input));
             }
             if (se.CreateTimeEnd.HasValue)
             {
-                selSql.Append("    AND pd.checktime < :checktimeEnd\n");
+                //selSql.Append("    AND pd.checktime < :checktimeEnd\n");
+                selSql.Append("    AND pd.createtime < :checktimeEnd\n");
                 parameters.Add(new OracleParameter(":checktimeEnd", OracleDbType.Date, se.CreateTimeEnd.Value, ParameterDirection.Input));
             }
             if (!string.IsNullOrEmpty(se.GoodsIDS))
@@ -4242,12 +4246,14 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
             selSql.Append(sqlString);
             if (se.CreateTimeStart.HasValue)
             {
-                selSql.Append("    AND pd.checktime >= :checktimeStart\n");
+                //selSql.Append("    AND pd.checktime >= :checktimeStart\n");
+                selSql.Append("    AND pd.createtime >= :checktimeStart\n");
                 parameters.Add(new OracleParameter(":checktimeStart", OracleDbType.Date, se.CreateTimeStart.Value, ParameterDirection.Input));
             }
             if (se.CreateTimeEnd.HasValue)
             {
-                selSql.Append("    AND pd.checktime < :checktimeEnd\n");
+                //selSql.Append("    AND pd.checktime < :checktimeEnd\n");
+                selSql.Append("    AND pd.createtime < :checktimeEnd\n");
                 parameters.Add(new OracleParameter(":checktimeEnd", OracleDbType.Date, se.CreateTimeEnd.Value, ParameterDirection.Input));
             }
             if (!string.IsNullOrEmpty(se.GoodsIDS))
@@ -9904,12 +9910,13 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				parameters.Add(new OracleParameter(":CheckUserCodeS2D", OracleDbType.NVarchar2, se.CheckUserCodeS2D, ParameterDirection.Input));
 			}
 
-			if (se.CreateTimeStart.HasValue)
+            // 登记时间(缺陷)
+            if (se.CreateTimeStart.HasValue)
 			{
 				selSql = selSql + "  AND pmd.CreateTime>= :CreateTimeStart  ";
 				parameters.Add(new OracleParameter(":CreateTimeStart", OracleDbType.Date, se.CreateTimeStart.Value, ParameterDirection.Input));
-			}
-			if (se.CreateTimeEnd.HasValue)
+            }
+            if (se.CreateTimeEnd.HasValue)
 			{
 				selSql = selSql + "  AND pmd.CreateTime<= :CreateTimeEnd  ";
 				parameters.Add(new OracleParameter(":CreateTimeEnd", OracleDbType.Date, se.CreateTimeEnd.Value, ParameterDirection.Input));
@@ -10225,18 +10232,18 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				parameters.Add(new OracleParameter(":CheckUserCodeS2D", OracleDbType.NVarchar2, se.CheckUserCodeS2D, ParameterDirection.Input));
 			}
 
-			//if (se.CreateTimeStart.HasValue)
-			//{
-			//    selSql = selSql + "  AND pmd.CreateTime>= :CreateTimeStart  ";
-			//    parameters.Add(new OracleParameter(":CreateTimeStart", OracleDbType.Date, se.CreateTimeStart.Value, ParameterDirection.Input));
-			//}
-			//if (se.CreateTimeEnd.HasValue)
-			//{
-			//    selSql = selSql + "  AND pmd.CreateTime<= :CreateTimeEnd  ";
-			//    parameters.Add(new OracleParameter(":CreateTimeEnd", OracleDbType.Date, se.CreateTimeEnd.Value, ParameterDirection.Input));
-			//}
-			// 成检登记时间
-			if (se.CreateTimeStart.HasValue)
+            //if (se.CreateTimeStart.HasValue)
+            //{
+            //    selSql = selSql + "  AND pmd.CreateTime>= :CreateTimeStart  ";
+            //    parameters.Add(new OracleParameter(":CreateTimeStart", OracleDbType.Date, se.CreateTimeStart.Value, ParameterDirection.Input));
+            //}
+            //if (se.CreateTimeEnd.HasValue)
+            //{
+            //    selSql = selSql + "  AND pmd.CreateTime<= :CreateTimeEnd  ";
+            //    parameters.Add(new OracleParameter(":CreateTimeEnd", OracleDbType.Date, se.CreateTimeEnd.Value, ParameterDirection.Input));
+            //}
+            // 登记时间(第一次成检)
+            if (se.CreateTimeStart.HasValue)
 			{
 				selSql = selSql + "  AND pd.checktime>= :CreateTimeStart  ";
 				parameters.Add(new OracleParameter(":CreateTimeStart", OracleDbType.Date, se.CreateTimeStart.Value, ParameterDirection.Input));