From 871fa09fa6b84be39f7d060eb25a7159e0a2ca40 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 12 十一月 2024 16:50:28 +0800
Subject: [PATCH] 1
---
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs | 163 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 125 insertions(+), 38 deletions(-)
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs
index 19b73e0..2ceb1f3 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs
@@ -128,6 +128,7 @@
this.btnGH.Enabled = false;
this.btnSelect.Enabled = false;
num = 1;
+ //ReadCsv();
}
else if (num == 1)
{
@@ -158,20 +159,36 @@
string Date = DateTime.Now.ToString("yyMMdd");
string HBath = this.txtHBath.Text;
+ string Year = DateTime.Now.Year.ToString();
+ Year = Year.Substring(Year.Length - 2, 2);
+ string Month = DateTime.Now.Month.ToString();
+ Month = Month.Length > 1 ? Month : "0" + Month;
+ string Day = DateTime.Now.Day.ToString();
+ Day = Day.Length > 1 ? Day : "0" + Day;
+
//娉�:鏂帿灏旂粍瑁�3 鍦‥鐩� _332009
//鍏朵綑鍦―鐩� _C332001_2M
//string csv_file_path = $@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123.csv";
//string csv_file_path = $@"D:\THLCR_Data\{HBath}\{HBath}_{Date}_C332001_2M.csv"; //缁勮1 缁勮2璺緞
string csv_file_path = $@"E:\THLCR_Data\{HBath}\{HBath}_{Date}_332009.csv"; //缁勮3璺緞
+ //15杞﹂棿缂哄皯璺緞 D:\DATA SAVE\骞碶骞存湀\骞存湀鏃鎵规鍙穃鏁版嵁淇濆瓨.csv
+ //string csv_file_path = $@"D:\DATA SAVE\{Year}\{Year + Month}\{Year + Month + Day}\{HBath}\鏁版嵁淇濆瓨.csv";
+
bool flag = File.Exists(csv_file_path);
if (flag)
{
DataTable dt = new DataTable();
+ //string HTypeName = "鏃犲皹";
//string csv_file_path_Read = @"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123_1.csv";
//string csv_file_path_Read = $@"D:\THLCR_Data\{HBath}\{HBath}_{Date}_C332001_2M_Read.csv"; //缁勮1 缁勮2璺緞
- string csv_file_path_Read = $@"E:\THLCR_Data\{HBath}\{HBath}_{Date}_332009_Read.csv"; //缁勮3璺緞
+ //string csv_file_path_Read = $@"E:\THLCR_Data\{HBath}\{HBath}_{Date}_332009_Read.csv"; //缁勮3璺緞
+ string HTypeName = "15";
+ //15杞﹂棿缂哄皯璺緞 D:\DATA SAVE\骞碶骞存湀\骞存湀鏃鎵规鍙穃鏁版嵁淇濆瓨.csv
+ //string csv_file_path_Read = $@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\DATA SAVE\鏁版嵁淇濆瓨_MES璇诲彇.csv";
+
+ string csv_file_path_Read = $@"D:\DATA SAVE\{Year}\{Year + Month}\{Year + Month + Day}\{HBath}\鏁版嵁淇濆瓨_MES璇诲彇.csv";
File.Copy(csv_file_path, csv_file_path_Read, true);
@@ -203,61 +220,131 @@
parser.Close();
//鑾峰彇褰撳墠鏃堕棿
- DateTime ActionTime = DateTime.Parse(DateTime.Now.AddMinutes(-1).ToString("yyyy-MM-dd HH:mm:ss"));
+ DateTime ActionTime = DateTime.Parse(DateTime.Now.AddMinutes(-2).ToString("yyyy-MM-dd HH:mm:ss"));
DateTime EndTime = DateTime.Parse(DateTime.Now.AddMinutes(1).ToString("yyyy-MM-dd HH:mm:00"));
foreach (DataRow item in dt.Rows)
{
- DateTime NowTime = DateTime.Parse(item["娴嬭瘯鏃堕棿"].ToString());
- string HBadCodeSN = item["搴忓彿"].ToString();
-
- if (((NowTime >= ActionTime && NowTime < EndTime) || dt.Rows.Count <= 20) && HBadCodeSN != "")
+ if (HTypeName == "鏃犲皹")
{
+ DateTime NowTime = DateTime.Parse(item["娴嬭瘯鏃堕棿"].ToString());
+ string HBadCodeSN = item["搴忓彿"].ToString();
- string HSourceCode = this.HSouce.Text; //璁惧缂栧彿 缁勮1 9994 缁勮2 9995 缁勮3 9996
- string HEmpCode = this.HEmpCode.Text;
- string HBarCode = item["搴忓彿"].ToString();
- string HCreateTime = item["娴嬭瘯鏃堕棿"].ToString();
- string HDate = DateTime.Parse(item["娴嬭瘯鏃堕棿"].ToString()).ToString("yyyy-MM-dd");
- string HResult = item["鍒嗛��"].ToString() == "PASS" ? "OK" : "NG";
- string HProcNumber = "005";
- int HFlag = 0;
- //string HEmpCode = "";
- if (HBadCodeSN != "")
+ if (((NowTime >= ActionTime && NowTime < EndTime) || dt.Rows.Count <= 20) && HBadCodeSN != "")
{
- string HType = "";
- int HCount = 1;
- DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollection_SN where HBarCode='" + HBarCode + "' and HCreateTime='" + HCreateTime + "'", "Sb_EquipMentCollection_SN");
-
- if (ds.Tables[0].Rows.Count == 0)
+ string HSourceCode = this.HSouce.Text; //璁惧缂栧彿 缁勮1 9994 缁勮2 9995 缁勮3 9996
+ string HEmpCode = this.HEmpCode.Text;
+ string HBarCode = item["搴忓彿"].ToString();
+ string HCreateTime = item["娴嬭瘯鏃堕棿"].ToString();
+ string HDate = DateTime.Parse(item["娴嬭瘯鏃堕棿"].ToString()).ToString("yyyy-MM-dd");
+ string HResult = item["鍒嗛��"].ToString() == "PASS" ? "OK" : "NG";
+ string HProcNumber = "005";
+ int HFlag = 0;
+ //string HEmpCode = "";
+ if (HBadCodeSN != "")
{
- string sql = $@"insert into Sb_EquipMentCollection_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
- values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}','{HDate}','{HResult}','{HProcNumber}','{HFlag}')";
- oCN.RunProc(sql);
- ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
- }
- }
+ string HType = "";
+ int HCount = 1;
- for (int i = 0; i < dt.Columns.Count; i++)
- {
- if (dt.Columns[i].ColumnName.Contains("Hz"))
- {
- string HType = dt.Columns[i].ColumnName;
- string HCount = item[HType].ToString();
-
- DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollectionTechParam_SN where HBarCode='" + HBarCode + "' and HType='" + HType + "'", "Sb_EquipMentCollectionTechParam_SN");
+ DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollection_SN where HBarCode='" + HBarCode + "' and HCreateTime='" + HCreateTime + "'", "Sb_EquipMentCollection_SN");
if (ds.Tables[0].Rows.Count == 0)
{
- string sql = $@"insert into Sb_EquipMentCollectionTechParam_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
-values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}','{HDate}','{HResult}','{HProcNumber}','{HFlag}')";
+ string sql = $@"insert into Sb_EquipMentCollection_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
+ values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}','{HDate}','{HResult}','{HProcNumber}','{HFlag}')";
oCN.RunProc(sql);
- //ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
+ ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
+ }
+ }
+
+ for (int i = 0; i < dt.Columns.Count; i++)
+ {
+ if (dt.Columns[i].ColumnName.Contains("Hz"))
+ {
+ string HType = dt.Columns[i].ColumnName;
+ string HCount = item[HType].ToString();
+
+ DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollectionTechParam_SN where HBarCode='" + HBarCode + "' and HType='" + HType + "'", "Sb_EquipMentCollectionTechParam_SN");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ string sql = $@"insert into Sb_EquipMentCollectionTechParam_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
+values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}','{HDate}','{HResult}','{HProcNumber}','{HFlag}')";
+ oCN.RunProc(sql);
+ //ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
+ }
}
}
}
}
+
+ if (HTypeName == "15")
+ {
+ DateTime NowTime = DateTime.Parse(item["CS_鏃堕棿"].ToString());
+ string HBadCodeSN = item["CS_DM鐮�"].ToString();
+
+ if (((NowTime >= ActionTime && NowTime < EndTime) || dt.Rows.Count <= 20) && HBadCodeSN != "")
+ {
+
+ string HSourceCode = this.HSouce.Text; //璁惧缂栧彿 缁勮1 9994 缁勮2 9995 缁勮3 9996
+ string HEmpCode = this.HEmpCode.Text;
+ string HBarCode = item["CS_DM鐮�"].ToString();
+ string HCreateTime = item["CS_鏃堕棿"].ToString();
+ string HDate = DateTime.Parse(item["CS_鏃堕棿"].ToString()).ToString("yyyy-MM-dd");
+ string HResult = item["CS_鎬荤粨鏋�"].ToString();
+ string HProcNumber = "005";
+ int HFlag = 0;
+
+ if (HResult != "") {
+ if (HBadCodeSN != "")
+ {
+ string HType = "";
+ int HCount = 1;
+
+ DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollection_SN where HBarCode='" + HBarCode + "' and HCreateTime='" + HCreateTime + "'", "Sb_EquipMentCollection_SN");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ string sql = $@"insert into Sb_EquipMentCollection_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
+ values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}','{HDate}','{HResult}','{HProcNumber}','{HFlag}')";
+ oCN.RunProc(sql);
+ ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
+ }
+ }
+
+ for (int i = 0; i < dt.Columns.Count; i++)
+ {
+ if (dt.Columns[i].ColumnName.Contains("CS_"))
+ {
+ string HType = dt.Columns[i].ColumnName;
+ string HCount = item[HType].ToString();
+ string HResult_TechParam = "";
+ if (HType != "CS_鏃堕棿" && HType != "CS_DM鐮�" && HType != "CS_鎬荤粨鏋�")
+ {
+ HResult_TechParam = HCount;
+ double number = 0;
+ if (!Double.TryParse(HCount, out number))
+ {
+ HCount = "0";
+ }
+
+ DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollectionTechParam_SN where HBarCode='" + HBarCode + "' and HType='" + HType + "'", "Sb_EquipMentCollectionTechParam_SN");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ string sql = $@"insert into Sb_EquipMentCollectionTechParam_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
+values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{(HCount == "" ? " 0" : HCount)}','{HCreateTime}','{HDate}','{HResult_TechParam}','{HProcNumber}','{HFlag}')";
+ oCN.RunProc(sql);
+ //ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
}
}
}
--
Gitblit v1.9.1