From e9046aea8de84c7b82167f4c05d82d2702203195 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 17 九月 2025 22:04:28 +0800
Subject: [PATCH] 数据采集优化，三坐标轮廓仪增加日志，过站增加生产质量汇报单日志
---
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCoordinateExcelFrom.cs | 80 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 5 deletions(-)
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCoordinateExcelFrom.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCoordinateExcelFrom.cs
index e0c69a0..b8efcd2 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCoordinateExcelFrom.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCoordinateExcelFrom.cs
@@ -8,6 +8,7 @@
using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Drawing;
+using Newtonsoft.Json;
namespace WFormReadData_SMR
{
@@ -63,8 +64,8 @@
string selectedFolderPath = folderBrowserDialog.SelectedPath;
// 浣跨敤 selectedFolderPath 杩涜鍚庣画鎿嶄綔锛屼緥濡傛樉绀哄湪鏂囨湰妗嗕腑
this.txtLj.Text = selectedFolderPath;
- GetCSV_Read(selectedFolderPath);
- //GetExcel_Read(selectedFolderPath);
+ //GetCSV_Read(selectedFolderPath);//杞粨浠�
+ GetExcel_Read(selectedFolderPath);//涓夊潗鏍�
}
}
}
@@ -480,9 +481,18 @@
for (int i = 0; i < dataTable.Rows.Count; i++)
{
+
+ CustomWriteLog("1 绗� '" + i + "' 娆� '" + dataTable.Rows[i]["Characteristic"].ToString() + "'", DateTime.Now.ToString("yyyy-MM-dd"));
+ CustomWriteLog("1 绗� '" + i + "' 娆� '" + Double.Parse(dataTable.Rows[i]["HUpLimit"].ToString()) + "'", DateTime.Now.ToString("yyyy-MM-dd"));
+ CustomWriteLog("1 绗� '" + i + "' 娆� '" + Double.Parse(dataTable.Rows[i]["HQCStd"].ToString()) + "'", DateTime.Now.ToString("yyyy-MM-dd"));
double HUpLimits = Double.Parse(dataTable.Rows[i]["HUpLimit"].ToString()) + Double.Parse(dataTable.Rows[i]["HQCStd"].ToString());
+ CustomWriteLog("2 绗� '" + i + "' 娆� '"+ Double.Parse(dataTable.Rows[i]["HDownLimit"].ToString()) + "'", DateTime.Now.ToString("yyyy-MM-dd"));
+ CustomWriteLog("2 绗� '" + i + "' 娆� '" + Double.Parse(dataTable.Rows[i]["HQCStd"].ToString()) + "'", DateTime.Now.ToString("yyyy-MM-dd"));
double HDownLimits = Double.Parse(dataTable.Rows[i]["HDownLimit"].ToString()) + Double.Parse(dataTable.Rows[i]["HQCStd"].ToString());
+ CustomWriteLog("3 绗� '" + i + "' 娆� '" + Double.Parse(dataTable.Rows[i]["Actual"].ToString()) + "'", DateTime.Now.ToString("yyyy-MM-dd"));
+ CustomWriteLog("3 绗� '" + i + "' 娆� '" + Double.Parse(dataTable.Rows[i]["HDownLimit"].ToString()) + "'", DateTime.Now.ToString("yyyy-MM-dd"));
int HLastResult = (Double.Parse(dataTable.Rows[i]["Actual"].ToString()) > HUpLimits || HDownLimits < Double.Parse(dataTable.Rows[i]["HDownLimit"].ToString())) ? 0 : 1;
+ CustomWriteLog("4 绗� '" + i + "' 娆� '" + HLastResult + "'", DateTime.Now.ToString("yyyy-MM-dd"));
if (HLastResult == 1 && HLastResults != 0)
{
@@ -492,7 +502,22 @@
{
HLastResults = 0;
}
-
+ string sql = "Insert into QC_FirstPieceCheckBillSub " +
+ " (HInterID,HBillNo_bak,HEntryID,HCloseMan" +
+ ",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
+ ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HQCCheckItemID,HQCStd,HUnit,HQCNote,HResult" +
+ ",HMax,HMin,HAvg,HSampleSchemeID,HSampleQty,HSampleDamageQty,HAcceptQty" +
+ ",HRejectQty,HSampleUnRightQty,HStatus,HUnitID,HInspectVal,HTargetVal" +
+ ",HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
+ ") values("
+ + HInterID + ",'" + HBillNo + "'," + (i + 1) + ",''" +
+ ",getdate(),0,''," + HProcExchInterID +
+ "," + HProcExchEntryID + ",'" + HProcExchBillNo + "','',0,0" +
+ "," + dataTable.Rows[i]["CharacteristicID"].ToString() + ",'" + dataTable.Rows[i]["HQCStd"].ToString() + "','','" + dataTable.Rows[i]["HQCStd"].ToString() + "','" + HLastResult + "'" +
+ ",'" + dataTable.Rows[i]["HUpLimit"].ToString() + "','" + dataTable.Rows[i]["HDownLimit"].ToString() + "',''" + ",0,0,0,0,0,0,'',0,'" + dataTable.Rows[i]["Actual"].ToString() + "','" + dataTable.Rows[i]["HQCStd"].ToString() + "','" + dataTable.Rows[i]["HUpLimit"].ToString() + "','" + dataTable.Rows[i]["HDownLimit"].ToString() + "','','',0,'2'," + dataTable.Rows[i]["HInspectInstruMentID"].ToString() + ",'" + HLastResult + "'" +
+ ") ";
+ CustomWriteLog("棣栦欢淇濆瓨鍓� 绗� '" +i+ "' '"+ dataTable.Rows[i]["Characteristic"].ToString() + "' 娆★細'" + sql + "'", DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RunProc("Insert into QC_FirstPieceCheckBillSub " +
" (HInterID,HBillNo_bak,HEntryID,HCloseMan" +
",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
@@ -508,6 +533,7 @@
"," + dataTable.Rows[i]["CharacteristicID"].ToString() + ",'" + dataTable.Rows[i]["HQCStd"].ToString() + "','','"+ dataTable.Rows[i]["HQCStd"].ToString() + "','" + HLastResult + "'" +
",'" + dataTable.Rows[i]["HUpLimit"].ToString() + "','" + dataTable.Rows[i]["HDownLimit"].ToString() + "',''" + ",0,0,0,0,0,0,'',0,'" + dataTable.Rows[i]["Actual"].ToString() + "','" + dataTable.Rows[i]["HQCStd"].ToString() + "','" + dataTable.Rows[i]["HUpLimit"].ToString() + "','" + dataTable.Rows[i]["HDownLimit"].ToString() + "','','',0,'2'," + dataTable.Rows[i]["HInspectInstruMentID"].ToString() + ",'" + HLastResult + "'" +
") ");
+ CustomWriteLog("棣栦欢淇濆瓨鍚� 绗� '" + i + "' 娆�", DateTime.Now.ToString("yyyy-MM-dd"));
}
DataSet SetData = oCN.RunProcReturn("select HMakeDate from QC_TakeSampleCheckBillMain where HInterID =" + this.HTakeSampleCheckBillID.Text, "QC_TakeSampleCheckBillMain");
@@ -602,7 +628,7 @@
{
HLastResults = 0;
}
-
+
oCN.RunProc("Insert into QC_PatrolProcCheckOtherBillSub " +
" (HInterID,HBillNo_bak,HEntryID,HCloseMan" +
",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
@@ -679,7 +705,7 @@
string HICMOEntryID = ds.Tables[0].Rows[0]["HICMOEntryID"].ToString();
string HICMOBillNo = ds.Tables[0].Rows[0]["HICMOBillNo"].ToString();
string HPlanQty = ds.Tables[0].Rows[0]["HPlanQty"].ToString();
- string HProcExchInterID = ds.Tables[0].Rows[0]["HProcExchInterID"].ToString();
+ string HProcExchInterID = ds.Tables[0].Rows[0]["HProcExchInterID"].ToString();
string HProcExchEntryID = ds.Tables[0].Rows[0]["HProcExchEntryID"].ToString();
string HProcExchBillNo = ds.Tables[0].Rows[0]["HProcExchBillNo"].ToString();
string HQty = ds.Tables[0].Rows[0]["HQty"].ToString();
@@ -918,5 +944,49 @@
MessageBox.Show(this, e.Message, "鎻愮ず");
}
}
+
+
+ private static readonly object lockObj = new object();
+ //鍐欐棩蹇�
+ public static void CustomWriteLog(object obj, string FileName, string filePath = "Vlog", bool isAppend = true)
+ {
+ try
+ {
+ lock (lockObj)
+ {
+ filePath = $@"{filePath}\{FileName}.txt";
+
+ filePath = AppDomain.CurrentDomain.BaseDirectory + filePath;
+
+ if (!System.IO.Directory.Exists(Path.GetDirectoryName(filePath)))
+ {
+ System.IO.Directory.CreateDirectory(Path.GetDirectoryName(filePath));
+ }
+
+ bool fileExists = System.IO.File.Exists(filePath);
+ //涓嶅瓨鍦� 鍒欏垱寤鸿鏂囦欢
+ if (!fileExists)
+ {
+ System.IO.File.Create(filePath).Close();
+ }
+
+ using (StreamWriter writer = new StreamWriter(filePath, isAppend))
+ {
+ //瀛樺湪鐨勬椂鍊欐墠鍐欎竴琛�
+ if (fileExists && isAppend)
+ {
+ writer.WriteLine();
+ }
+
+ var content = obj is string ? obj : JsonConvert.SerializeObject(obj);
+ writer.WriteLine($"{DateTime.Now} {content}");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ }
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1