shim 7 жил өмнө
parent
commit
22554bc22a

+ 3 - 22
UAS_CheckWork/Form1.cs

@@ -1,15 +1,10 @@
-using System;
+using Check.DataOperate;
+using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
-using System.Drawing;
-using System.Linq;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using System.Windows.Forms;
-using UAS_MES.DataOperate;
-using UAS_MES.PublicForm;
 
 namespace UAS_CheckWork
 {
@@ -140,7 +135,7 @@ namespace UAS_CheckWork
             //点击保存数据
             string lastTime = dh.getFieldDataByCondition("cardlog", "TO_CHAR(max(wl_indate),'yyyy-MM-dd hh24:mi:ss')","").ToString();
             //筛选数据
-            DataTable fd =  filterDataTable((DataTable)allData.DataSource, "cl_time > '"+lastTime+"'");
+            DataTable fd =  dh.filterDataTable((DataTable)allData.DataSource, "cl_time > '"+lastTime+"'");
             //插入数据库
             //新增的数据
             List<string> cl_emcode = new List<string>();
@@ -155,19 +150,5 @@ namespace UAS_CheckWork
             sql.Append("insert into cardlog (cl_id,cl_emcode,cl_time) values (cardlog_seq.nextval,:cl_emcode,:cl_time)");
             dh.BatchInsert(sql.ToString(), new string[] { "cl_emcode", "cl_time"}, cl_emcode.ToArray(), cl_time.ToArray());
         }
-
-        private DataTable filterDataTable(DataTable dt, String condition)
-        {
-            if (dt == null)
-                return new DataTable();
-            //获取筛选条件中的列名,值
-            DataRow[] dataRows = dt.Select(condition);
-            DataTable ndt = dt.Clone();
-            for (int i = 0; i < dataRows.Length; i++)
-            {
-                ndt.Rows.Add(dataRows[i].ItemArray);
-            }
-            return ndt;
-        }
     }
 }

+ 2 - 2
UAS_CheckWork/DataHelper.cs → UAS_CheckWork/Tools/DataHelper.cs

@@ -6,7 +6,7 @@ using System.Configuration;
 using System.Data;
 using System.Text;
 
-namespace UAS_MES.DataOperate
+namespace Check.DataOperate
 {
     class DataHelper
     {
@@ -1132,7 +1132,7 @@ namespace UAS_MES.DataOperate
         /// <param name="dt"></param>
         /// <param name="condition"></param>
         /// <returns></returns>
-        private DataTable filterDataTable(DataTable dt, String condition)
+        public DataTable filterDataTable(DataTable dt, String condition)
         {
             if (dt == null)
                 return new DataTable();