From 572702f6f763e47a26c807264e7dee573375b6de Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期一, 24 十一月 2025 08:59:07 +0800
Subject: [PATCH] 优化斯莫尔 数采 接口循环调用失败
---
WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug/EquipmentCollectionForm.exe | 0
WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo | 0
WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.cs | 2 +
WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.pdb | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/点胶称重Debug.zip | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.pdb | 0
WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.exe | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/Program.cs | 4 +-
WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug/EquipmentCollectionForm.pdb | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.exe | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.pdb | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache | 0
/dev/null | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/ZZ_GlueWeigh.cs | 74 ++++++++++++++++++++++++++++++++++--
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.FileListAbsolute.txt | 1
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs | 2
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.exe | 0
17 files changed, 74 insertions(+), 9 deletions(-)
diff --git a/WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo b/WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo
index bd42e25..e4b9616 100644
--- a/WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo
+++ b/WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo
Binary files differ
diff --git a/WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.cs b/WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.cs
index bd525b7..549b2e0 100644
--- a/WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.cs
+++ b/WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.cs
@@ -1025,6 +1025,8 @@
JsonEquipmentData data = await FindDevicePropCalc(Url, token, jsonEquipment.data[i].deviceNo, TimeDate, time);
+ await Task.Delay(200);
+
for (int j = 0; j < data.data.Count; j++)
{
//鍚堟牸鏁�
diff --git a/WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug/EquipmentCollectionForm.exe b/WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug/EquipmentCollectionForm.exe
index a62c185..a3378e1 100644
--- a/WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug/EquipmentCollectionForm.exe
+++ b/WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug/EquipmentCollectionForm.exe
Binary files differ
diff --git a/WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug/EquipmentCollectionForm.pdb b/WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug/EquipmentCollectionForm.pdb
index ece3ada..f799e93 100644
--- a/WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug/EquipmentCollectionForm.pdb
+++ b/WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug/EquipmentCollectionForm.pdb
Binary files differ
diff --git a/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.exe b/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.exe
index a62c185..a3378e1 100644
--- a/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.exe
+++ b/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.exe
Binary files differ
diff --git a/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.pdb b/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.pdb
index ece3ada..f799e93 100644
--- a/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.pdb
+++ b/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.pdb
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/Program.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/Program.cs
index fd18736..b2013dd 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/Program.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/Program.cs
@@ -17,8 +17,8 @@
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
//Application.Run(new ReadCoordinateExcelFrom());
- //Application.Run(new ZZ_GlueWeigh());//鐐硅兌绉伴噸
- Application.Run(new ReadCoordinateExcelFrom());//涓夊潗鏍囥�佽疆寤撲华
+ Application.Run(new ZZ_GlueWeigh());//鐐硅兌绉伴噸
+ //Application.Run(new ReadCoordinateExcelFrom());//涓夊潗鏍囥�佽疆寤撲华
}
}
}
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ZZ_GlueWeigh.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ZZ_GlueWeigh.cs
index 711ceb2..a53fb63 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/ZZ_GlueWeigh.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ZZ_GlueWeigh.cs
@@ -1,8 +1,10 @@
-锘縰sing System;
+锘縰sing Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
+using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -158,7 +160,16 @@
MessageBox.Show("璁惧閿欒!");
break;
}
-
+ var sql = @"select top 1 HTechParamName,HResult,HCreateTime from Sb_EquipMentCollectionTechParam_Temp
+ where HSourceCode = '" + HNumber + @"' and HTechParamName = '椤堕儴鐐硅兌閲嶉噺' and HCreateTime in(
+ select max(HCreateTime) from Sb_EquipMentCollectionTechParam_Temp
+ where HSourceCode = '" + HNumber + @"' and HTechParamName = '椤堕儴鐐硅兌閲嶉噺')
+ union
+ select top 1 HTechParamName,HResult,HCreateTime from Sb_EquipMentCollectionTechParam_Temp
+ where HSourceCode = '" + HNumber + @"' and HTechParamName = '搴曢儴鐐硅兌閲嶉噺' and HCreateTime in(
+ select max(HCreateTime) from Sb_EquipMentCollectionTechParam_Temp
+ where HSourceCode = '" + HNumber + @"' and HTechParamName = '搴曢儴鐐硅兌閲嶉噺')";
+ CustomWriteLog("鏌ヨ"+ sql, DateTime.Now.ToString("yyyy-MM-dd"));
//鏌ヨ 椤堕儴鐐硅兌閲嶉噺 鍜� 搴曢儴鐐硅兌閲嶉噺 褰撳墠鏈�澶х殑鏁版嵁
DataSet ds = oCN.RunProcReturn(@"select top 1 HTechParamName,HResult,HCreateTime from Sb_EquipMentCollectionTechParam_Temp
where HSourceCode = '" + HNumber + @"' and HTechParamName = '椤堕儴鐐硅兌閲嶉噺' and HCreateTime in(
@@ -179,6 +190,8 @@
if (ds.Tables[0].Rows.Count > 0)
{
+ CustomWriteLog("鏌ヨ鍒版暟鎹�", DateTime.Now.ToString("yyyy-MM-dd"));
+ //鏌ヨ 椤堕儴鐐硅兌閲嶉噺 鍜� 搴曢儴鐐硅兌閲嶉噺 褰撳墠鏈�澶х殑鏁版嵁
//鑾峰彇 椤堕儴鐐硅兌閲嶉噺 鍜� 搴曢儴鐐硅兌閲嶉噺
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
@@ -189,7 +202,7 @@
{
string HResult = ds.Tables[0].Rows[i]["HResult"].ToString();
dataTable.Rows[j]["Actual"] = HResult;
-
+ CustomWriteLog("鏌ヨ鍒版暟鎹�1", DateTime.Now.ToString("yyyy-MM-dd"));
switch (HTechParamName)
{
case "椤堕儴鐐硅兌閲嶉噺":
@@ -202,7 +215,7 @@
MessageBox.Show("璁惧閿欒!");
break;
}
-
+ CustomWriteLog("鏌ヨ鍒版暟鎹�2" + this.BeforeWeigh.Text + this.AfterWeigh.Text, DateTime.Now.ToString("yyyy-MM-dd"));
//switch (HTechParamName)
//{
// case "铻虹墮妫�娴嬫暟鎹�":
@@ -288,7 +301,15 @@
dataTable.Columns.Add("HInspectInstruMentID");
dataTable.Columns.Add("HQCCheckItemHName");
-
+ var sql = @"select b.HInspectInstruMentID,a.HInterID HQCSchemeID,b.HQCCheckItemID, ch.HNumber HQCCheckItemNumber,ch.HName HQCCheckItemHName,m.HNumber,HUpLimit,HDownLimit,HTargetVal
+from Sc_ProcessExchangeBillMain pr with(nolock)
+inner join Gy_QCCheckProjectMain a with(nolock) on pr.HMaterID=a.HMaterID
+inner join Gy_QCCheckProjectSub b with(nolock) on a.HInterID=b.HInterID
+inner join Gy_InspectInstruMent men with(nolock) on b.HInspectInstruMentID=men.HItemID and men.HNumber='" + HNumber + @"'
+left join Gy_Material m with(nolock) on a.HMaterID=m.HItemID
+left join Gy_QCCheckItem ch with(nolock) on b.HQCCheckItemID=ch.HItemID
+where pr.HBillNo='" + this.txtLzk.Text + "'";
+ CustomWriteLog("鏌ヨ"+ sql, DateTime.Now.ToString("yyyy-MM-dd"));
//淇敼鏄湪鍝釜璁惧涓婅繘琛岀殑鏁版嵁閲囬泦 b.HInspectInstruMentID=1 涓夊潗鏍�1 杞粨浠�2
DataSet dataSet = oCN.RunProcReturn(@"select b.HInspectInstruMentID,a.HInterID HQCSchemeID,b.HQCCheckItemID, ch.HNumber HQCCheckItemNumber,ch.HName HQCCheckItemHName,m.HNumber,HUpLimit,HDownLimit,HTargetVal
from Sc_ProcessExchangeBillMain pr with(nolock)
@@ -673,5 +694,48 @@
//鍏夋爣閫変腑鍒跺崟浜�
this.txtHMaker.Focus();
}
+
+ 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)
+ {
+ }
+ }
+
}
}
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.exe b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.exe
index 337cecc..b2db632 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.exe
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.exe
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.pdb b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.pdb
index 0be4563..9e7f046 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.pdb
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.pdb
Binary files differ
diff --git "a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/\347\202\271\350\203\266\347\247\260\351\207\215Debug.zip" "b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/\347\202\271\350\203\266\347\247\260\351\207\215Debug.zip"
new file mode 100644
index 0000000..9341b8e
--- /dev/null
+++ "b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/\347\202\271\350\203\266\347\247\260\351\207\215Debug.zip"
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.AssemblyReference.cache b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.AssemblyReference.cache
deleted file mode 100644
index 987d201..0000000
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.FileListAbsolute.txt b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.FileListAbsolute.txt
index bfd41ad..49b851a 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.FileListAbsolute.txt
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.FileListAbsolute.txt
@@ -117,4 +117,3 @@
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鍗曞搧杩囩珯鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.csproj.CopyComplete
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鍗曞搧杩囩珯鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.exe
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鍗曞搧杩囩珯鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.pdb
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鍗曞搧杩囩珯鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.csproj.AssemblyReference.cache
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.exe b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.exe
index 337cecc..b2db632 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.exe
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.exe
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.pdb b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.pdb
index 0be4563..9e7f046 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.pdb
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.pdb
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
index 67bd3e3..6e41bf8 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
@@ -1029,7 +1029,7 @@
long HICMOEntryID = 0;
string HICMOBillNo = "";
- CustomWriteLog("鏂板涓嶈壇姹囨姤1.3:"+ dic["HBarCode"].ToString()+ dic["HProcNumber"].ToString() , DateTime.Now.ToString("yyyy-MM-dd"));
+ CustomWriteLog("鏂板涓嶈壇姹囨姤1.3:"+ dic["HBarCode"].ToString() + dic["HProcNumber"].ToString() , DateTime.Now.ToString("yyyy-MM-dd"));
//鏍规嵁 鏉＄爜+宸ュ簭 鏌ヨ娴佽浆鍗′俊鎭�
ds = oCN.RunProcReturn(@"select b.HProcID, HMaterID,HUnitID,a.HICMOInterID,a.HICMOEntryID,a.HICMOBillNo,HBillNo,a.HInterID,b.HEntryID,a.HBillNo from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
inner join Sc_ProcessExchangeBillSub b WITH(NOLOCK) on a.HInterID=b.HInterID
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index 1078187..f5e894a 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
--
Gitblit v1.9.1