From a88c2dbb327d3a3a0b9a9bcc91ce4f31450159ba Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 05 一月 2024 16:58:23 +0800
Subject: [PATCH] 自动同步 定时保存 优化
---
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.resx | 2
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.GenerateResource.cache | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.FileListAbsolute.txt | 1
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.pdb | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.exe | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.pdb | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.Designer.cs | 2
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe.manifest | 2
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.FileListAbsolute.txt | 2
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/app.publish/WFormSynchronizeData_SMR.exe | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/DBHelper.cs | 14 ++--
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.pdb | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.exe | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.application | 2
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug.rar | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.Designer.cs | 5 +
WFormSynchronizeData_SMR/WFormReadData_SMR/WFormReadData_SMR.csproj | 2
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.application | 2
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.pdb | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.AssemblyReference.cache | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.GenerateResource.cache | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe.manifest | 2
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs | 67 ++++++++++++++++++----
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.Designer.cs | 2
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs | 68 +++++++++++-----------
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.AssemblyReference.cache | 0
31 files changed, 108 insertions(+), 65 deletions(-)
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/DBHelper.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/DBHelper.cs
index 606667f..eb04b0d 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/DBHelper.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/DBHelper.cs
@@ -38,15 +38,15 @@
}
public DBHelper()
{
- sServer = "47.96.97.237,15127";
- sDataBase = "HX_LMESsys";
- sUser = "HX_USER";
- sPassword = "lc@841022";
- //鏂帿灏�
- //sServer = "10.11.18.195";
- //sDataBase = "HX_LMESsys_test";
+ //sServer = "47.96.97.237,15127";
+ //sDataBase = "HX_LMESsys";
//sUser = "HX_USER";
//sPassword = "lc@841022";
+ //鏂帿灏�
+ sServer = "10.11.18.195";
+ sDataBase = "HX_LMESsys_test";
+ sUser = "HX_USER";
+ sPassword = "lc@841022";
}
private bool CnOpen()//OPEN鏁版嵁搴撹繛鎺�
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.Designer.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.Designer.cs
index fbfbdfb..fd76f32 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.Designer.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.Designer.cs
@@ -112,12 +112,12 @@
//
// timer1
//
- this.timer1.Interval = 3000;
+ this.timer1.Interval = 15000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// txtHBath
//
- this.txtHBath.Location = new System.Drawing.Point(604, 141);
+ this.txtHBath.Location = new System.Drawing.Point(604, 140);
this.txtHBath.Name = "txtHBath";
this.txtHBath.ReadOnly = true;
this.txtHBath.Size = new System.Drawing.Size(82, 28);
@@ -164,6 +164,7 @@
this.HSouce.Name = "HSouce";
this.HSouce.Size = new System.Drawing.Size(118, 28);
this.HSouce.TabIndex = 24;
+ this.HSouce.KeyDown += new System.Windows.Forms.KeyEventHandler(this.HSouce_KeyDown);
//
// label2
//
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs
index 48f0d5d..6d2cd80 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs
@@ -45,7 +45,7 @@
else
{
string HProjectNum = ds.Tables[0].Rows[0]["HProjectNum"].ToString();
- this.txtHBath.Text = HProjectNum;
+ this.txtHBath.Text = HProjectNum.Split('-')[0];
this.txtHBardCode.ReadOnly = true;
}
}
@@ -115,22 +115,26 @@
private void btnReadData_Click(object sender, EventArgs e)
{
- if (this.HEmpCode.Text == "" || this.txtHBath.Text == "")
+ if (this.HEmpCode.Text == "" || this.txtHBath.Text == ""|| this.HSouceName.Text == "")
{
- MessageBox.Show("璇疯緭鍏ュ憳宸ョ紪鐮佹垨鑰呮潯褰㈢爜!");
+ MessageBox.Show("璇疯緭鍏ョ敓浜ц祫婧�,鍛樺伐缂栫爜,鑰呮潯褰㈢爜!");
}
else {
if (num == 0)
{
this.btnReadData.Text = "鏆傚仠";
this.timer1.Enabled = true;
+ this.btnGH.Enabled = false;
+ this.btnSelect.Enabled = false;
num = 1;
}
else if (num == 1)
{
this.btnReadData.Text = "鍚姩";
this.timer1.Enabled = false;
+ this.btnGH.Enabled = true;
+ this.btnSelect.Enabled = true;
num = 0;
}
}
@@ -140,8 +144,7 @@
{
if (this.HEmpCode.Text == ""|| this.txtHBath.Text == "")
{
-
- MessageBox.Show("璇疯緭鍏ュ憳宸ョ紪鐮佹垨鑰呮潯褰㈢爜!");
+ MessageBox.Show("璇疯緭鍏ュ憳宸ョ紪鐮佹垨鑰呮祦杞崱!");
}
else
{
@@ -152,9 +155,15 @@
//璇诲彇csv鏍煎紡鏂囦欢
private void ReadCsv()
{
+ string Date = DateTime.Now.ToString("yyMMdd");
string HBath = this.txtHBath.Text;
- string csv_file_path = $@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123.csv";
- //string csv_file_path = $@"D:\THLCR_Data\{HBath}\20231123.csv";
+
+ //娉�:鏂帿灏旂粍瑁�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璺緞
+
bool flag = File.Exists(csv_file_path);
if (flag)
@@ -189,7 +198,7 @@
parser.Close();
//鑾峰彇褰撳墠鏃堕棿
- DateTime ActionTime = DateTime.Parse(DateTime.Now.AddMinutes(-100).ToString("yyyy-MM-dd HH:mm:ss"));
+ DateTime ActionTime = DateTime.Parse(DateTime.Now.AddMinutes(-1).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)
@@ -197,16 +206,16 @@
DateTime NowTime = DateTime.Parse(item["娴嬭瘯鏃堕棿"].ToString());
string HBadCodeSN = item["搴忓彿"].ToString();
- if (NowTime >= ActionTime && NowTime < EndTime && HBadCodeSN != "")
+ if (((NowTime >= ActionTime && NowTime < EndTime) || dt.Rows.Count <= 20) && HBadCodeSN != "")
{
- string HSourceCode = "9994";//璁惧缂栧彿 缁勮1 9994 缁勮2 9995 缁勮3 9996
+ 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 = "105";
+ string HProcNumber = "005";
int HFlag = 0;
//string HEmpCode = "";
if (HBadCodeSN != "")
@@ -227,7 +236,7 @@
for (int i = 0; i < dt.Columns.Count; i++)
{
- if (dt.Columns[i].ColumnName.Contains("Ls"))
+ if (dt.Columns[i].ColumnName.Contains("Hz"))
{
string HType = dt.Columns[i].ColumnName;
string HCount = item[HType].ToString();
@@ -247,5 +256,39 @@
}
}
}
+
+ //鐢熶骇璧勬簮鍥炶溅
+ private void HSouce_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ SelectHSouc(this.HSouce.Text);
+ }
+ }
+
+ //鏌ヨ鐢熶骇璧勬簮
+ public void SelectHSouc(string HNumber)
+ {
+ try
+ {
+ DataSet ds = oCN.RunProcReturn("select * from Gy_Source where HNumber='" + HNumber + "' ", "Gy_Source");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鏌ユ棤鏁版嵁!");
+ }
+ else
+ {
+ string HSouceName = ds.Tables[0].Rows[0]["HName"].ToString();
+ string HSouceNumber = ds.Tables[0].Rows[0]["HNumber"].ToString();
+ this.HSouceName.Text = HSouceName;
+ this.HSouce.Text = HSouceNumber;
+ this.HSouce.ReadOnly = true;
+ }
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show(this, e.Message, "鎻愮ず");
+ }
+ }
}
}
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.Designer.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.Designer.cs
index 13be016..78d6713 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.Designer.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.Designer.cs
@@ -108,7 +108,7 @@
//
// timer1
//
- this.timer1.Interval = 3000;
+ this.timer1.Interval = 15000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// HSouceName
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.resx b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.resx
index 1f666f2..3298079 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.resx
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.resx
@@ -118,6 +118,6 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
+ <value>19, 21</value>
</metadata>
</root>
\ No newline at end of file
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/WFormReadData_SMR.csproj b/WFormSynchronizeData_SMR/WFormReadData_SMR/WFormReadData_SMR.csproj
index a0febe3..45e0c54 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/WFormReadData_SMR.csproj
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/WFormReadData_SMR.csproj
@@ -11,6 +11,7 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -23,7 +24,6 @@
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug.rar b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug.rar
index 18d1320..84a7805 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug.rar
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug.rar
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.exe b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.exe
index 0abb33d..014470f 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 0fffa27..11420c2 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/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index 5436835..1078187 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 715a6bb..586b64f 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
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
index f5e894a..5caa27c 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.AssemblyReference.cache
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.AssemblyReference.cache
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 2f0b6f1..2214a03 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
@@ -7,10 +7,10 @@
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\Newtonsoft.Json.xml
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.csproj.AssemblyReference.cache
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.Properties.Resources.resources
+E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.ReadCSV.resources
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.ReadyDataForm.resources
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.csproj.GenerateResource.cache
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.csproj.CoreCompileInputs.cache
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.csproj.CopyComplete
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.exe
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.pdb
-E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.ReadCSV.resources
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.GenerateResource.cache b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.GenerateResource.cache
index 295530e..06478ab 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.GenerateResource.cache
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.GenerateResource.cache
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.exe b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.exe
index 0abb33d..014470f 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 0fffa27..11420c2 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.Designer.cs b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.Designer.cs
index 069a580..ee91830 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.Designer.cs
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.Designer.cs
@@ -38,7 +38,7 @@
// timer1
//
timer1.Enabled = true;
- timer1.Interval = 5000;
+ timer1.Interval = 15000;
timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// btnReadData
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
index e896c25..a9d2443 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
@@ -104,9 +104,9 @@
}
catch (Exception e)
{
+ oCN.RollBack();
string HBadCodeSN = dic["HBarCode"].ToString();
CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",閿欒鍘熷洜:" + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
- oCN.RollBack();
return false;
}
}
@@ -121,7 +121,7 @@
HBadCodeSN = TM_ZH(HBadCodeSN);
num = SNHBardCodeList(HBadCodeSN);
- if (num == 0)
+ if (num == 0 || num == 1)
{
flag = getOutBillAdd(dic, HBadCodeSN, "NG");
@@ -133,13 +133,6 @@
oCN.RunProc("update Gy_BarCodeBill set HStatus='涓嶈壇',HRemark='" + dic["HType"].ToString() + "' where HBarCode='" + HBadCodeSN + "'");
}
}
- else if (num == 1)
- {
- //鏉＄爜瀛樺湪 鐢熸垚涓嶈壇姹囨姤鍗�
- flag = getBadBillAdd(dic);
- //鍙嶅啓鏉＄爜鐘舵��
- oCN.RunProc("update Gy_BarCodeBill set HStatus='涓嶈壇',HRemark='" + dic["HType"].ToString() + "' where HBarCode='" + HBadCodeSN + "'");
- }
else if (num == 2)
{
flag = false;
@@ -148,10 +141,10 @@
}
catch (Exception e)
{
- string HBadCodeSN = dic["HBarCode"].ToString();
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",閿欒鍘熷洜:"+e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
//鍥炴粴浜嬪姟
oCN.RollBack();
+ string HBadCodeSN = dic["HBarCode"].ToString();
+ CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",閿欒鍘熷洜:"+e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
}
@@ -333,20 +326,21 @@
}
else
{
- CustomWriteLog("缁撴灉涓嶄负OK鎴朜G!", DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("缁撴灉涓嶄负OK鎴朜G!", DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
bool flag = false;
- //flag = AddXt_XtRoutBill(HInterID, HBillNo, HBadCodeSN);
+ flag = AddXt_XtRoutBill(HInterID, HBillNo, HBadCodeSN);
- //if (!flag) {
- // CustomWriteLog("绯荤粺鍙傛暟淇濆瓨澶辫触,鏉＄爜:" + HBadCodeSN , DateTime.Now.ToString("yyyy-MM-dd"));
- // oCN.RollBack();
- // return false;
- //}
+ if (!flag)
+ {
+ oCN.RollBack();
+ CustomWriteLog("绯荤粺鍙傛暟淇濆瓨澶辫触,鏉＄爜:" + HBadCodeSN, DateTime.Now.ToString("yyyy-MM-dd"));
+ return false;
+ }
//澧炲姞浜х嚎缁勮杩芥函鍗�
DataSet dataSet = oCN.RunProcReturn("exec h_p_Gy_BarCodeBillBomList '" + HProcExchBillNo + "'," + HProcID, "h_p_Gy_BarCodeBillBomList");
@@ -359,8 +353,8 @@
double SYHQty = double.Parse(dataSet.Tables[0].Rows[i]["閰嶄欢鏁伴噺"].ToString());
string HMaterNamePJ = dataSet.Tables[0].Rows[i]["閰嶄欢浠ｇ爜"].ToString();
if (SYHQty == 0) {
- CustomWriteLog("閰嶄欢浠ｇ爜:" + HMaterNamePJ + ",鏁伴噺涓�0!", DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("閰嶄欢浠ｇ爜:" + HMaterNamePJ + ",鏁伴噺涓�0!", DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
}
@@ -406,8 +400,8 @@
}
catch (Exception e)
{
- CustomWriteLog(e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog(e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
}
@@ -492,8 +486,8 @@
if (ds.Tables[0].Rows.Count == 0)
{
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",鏃犺繑淇褰�", DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",鏃犺繑淇褰�", DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
@@ -523,8 +517,8 @@
}
else
{
- CustomWriteLog("缁撴灉涓嶄负OK!", DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("缁撴灉涓嶄负OK!", DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
@@ -532,14 +526,15 @@
}
catch (Exception e)
{
- CustomWriteLog(e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog(e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
}
//淇濆瓨绯荤粺鍙傛暟鍒板嚭绔欏崟
public bool AddXt_XtRoutBill(long HInterID, string HBillNo,string HBadCodeSN) {
+ string sql = "";
try
{
@@ -550,9 +545,10 @@
string HProcExchBillNo = ds.Tables[0].Rows[0]["HProcExchBillNo"].ToString();
ds = oCN.RunProcReturn(@"select s.HItemID HMouldID,t.HItemID HTechParamID,HCount,HCreateTime from Sb_EquipMentCollectionTechParam_SN a WITH(NOLOCK)
-left join Gy_Source s WITH(NOLOCK) on a.HSourceCode=s.HNumber
-left join Gy_TechnologyParameter t WITH(NOLOCK) on a.HType=t.HNumber
+inner join Gy_Source s WITH(NOLOCK) on a.HSourceCode=s.HNumber
+inner join Gy_TechnologyParameter t WITH(NOLOCK) on a.HType=t.HName
where a.HFlag=0 and a.HBarCode='" + HBadCodeSN + "'", "Sb_EquipMentCollectionTechParam_SN");
+ //娉�:褰撳墠鍙湁涓�閬撳伐搴忔湁鍙傛暟 濡傛灉鏈夊閬撳伐搴忕殑璇� 闇�瑕佸鍔� 宸ュ簭鐨勮繃婊�
if (ds.Tables[0].Rows.Count != 0) {
@@ -563,20 +559,22 @@
string HCount = ds.Tables[0].Rows[i]["HCount"].ToString();
string HGetTime = ds.Tables[0].Rows[i]["HCreateTime"].ToString();
- DataSet dataSet = oCN.RunProcReturn("select * from Sc_StationOutBillSub_TechParam WITH(NOLOCK) where HInterID=" + HInterID + " and HBillNo_bak='" + HBillNo + "' and HBarCode='" + HBadCodeSN + "'", "Sc_StationOutBillSub_TechParam");
+ DataSet dataSet = oCN.RunProcReturn("select * from Sc_StationOutBillSub_TechParam WITH(NOLOCK) where HInterID=" + HInterID + " and HBillNo_bak='" + HBillNo + "'", "Sc_StationOutBillSub_TechParam");
- oCN.RunProc("insert into Sc_StationOutBillSub_TechParam(HInterID,HBillNo_bak,HEntryID ,HSourceInterID,HSourceEntryID,HSourceBillNo,HTechParamID,HRelValue,HGetTime,HBarCode,HMouldID)" +
- $"values({HInterID},'{HBillNo}',{(dataSet.Tables[0].Rows.Count + 1)},{HProcExchInterID},{HProcExchEntryID},'{HProcExchBillNo}',{HTechParamID},{HCount},'{HGetTime}','{HBadCodeSN}',{HMouldID})");
+ sql = "insert into Sc_StationOutBillSub_TechParam(HInterID,HBillNo_bak,HEntryID ,HSourceInterID,HSourceEntryID,HSourceBillNo,HTechParamID,HRelValue,HGetTime,HBarCode,HMouldID)" +
+ $"values({HInterID},'{HBillNo}',{(dataSet.Tables[0].Rows.Count + 1)},{HProcExchInterID},{HProcExchEntryID},'{HProcExchBillNo}',{HTechParamID},{HCount},'{HGetTime}','{HBadCodeSN}',{HMouldID})";
+ oCN.RunProc(sql);
}
+ oCN.RunProc("update Sb_EquipMentCollectionTechParam_SN set HFlag=1 where HBarCode='" + HBadCodeSN + "'");
}
return true;
}
catch (Exception e)
{
- CustomWriteLog("宸ヨ壓鍙傛暟淇濆瓨:" + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("宸ヨ壓鍙傛暟淇濆瓨:" + sql + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
}
@@ -603,15 +601,15 @@
}
else
{
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",娴佽浆鍗′笉瀛樺湪!", DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",娴佽浆鍗′笉瀛樺湪!", DateTime.Now.ToString("yyyy-MM-dd"));
return 2;
}
}
else
{
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",闀垮害涓嶇瓑浜�29浣�!", DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",闀垮害涓嶇瓑浜�29浣�!", DateTime.Now.ToString("yyyy-MM-dd"));
return 2;
}
}
@@ -623,8 +621,8 @@
}
catch (Exception e)
{
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + "," + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("鏉＄爜:" + HBadCodeSN + "," + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
return 2;
}
}
@@ -645,8 +643,8 @@
//鍒ゆ柇娴佽浆鍗′笉鑳戒负绌�
if (HBarCode.Trim() == "")
{
- CustomWriteLog("鏉＄爜:" + HBarCode + ",娴佽浆鍗′笉鑳戒负绌�!", DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("鏉＄爜:" + HBarCode + ",娴佽浆鍗′笉鑳戒负绌�!", DateTime.Now.ToString("yyyy-MM-dd"));
}
//鏃ユ湡鑾峰彇鏂瑰紡
@@ -715,8 +713,8 @@
}
catch (Exception e)
{
- CustomWriteLog("鏉＄爜:" + HBarCode + "," + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("鏉＄爜:" + HBarCode + "," + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
}
}
@@ -872,8 +870,8 @@
}
catch (Exception e)
{
- CustomWriteLog("鎶ラ敊鍘熷洜:" + e.Message + "!", DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("鎶ラ敊鍘熷洜:" + e.Message + "!", DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
}
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.application b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.application
index 162d41a..a610ffd 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.application
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.application
@@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
- <dsig:DigestValue>/nKAflmBh/TRO+mFhW9m+xlCiEDVi/+bphJ3aFsdPw4=</dsig:DigestValue>
+ <dsig:DigestValue>8Sj2fUCF+DPzvNwSEG0+LaAme+iSIjx9lyYGCAvdvuA=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe
index ab20893..b6d44b9 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe.manifest b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe.manifest
index 244658f..05dcfec 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe.manifest
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe.manifest
@@ -61,7 +61,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
- <dsig:DigestValue>2RHbf73sp2HcWRLN55JZdxxZ1PQWFHWnJO7hbFaX44w=</dsig:DigestValue>
+ <dsig:DigestValue>kSXIZlMRzQeIw+fo2ApCn4XExHBfk9fvo7IO6cPRYKQ=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.pdb b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.pdb
index bef56e6..a92efd6 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.pdb
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.pdb
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/app.publish/WFormSynchronizeData_SMR.exe b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/app.publish/WFormSynchronizeData_SMR.exe
index d910683..36c4673 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/app.publish/WFormSynchronizeData_SMR.exe
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/app.publish/WFormSynchronizeData_SMR.exe
Binary files differ
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
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.application b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.application
index 162d41a..a610ffd 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.application
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.application
@@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
- <dsig:DigestValue>/nKAflmBh/TRO+mFhW9m+xlCiEDVi/+bphJ3aFsdPw4=</dsig:DigestValue>
+ <dsig:DigestValue>8Sj2fUCF+DPzvNwSEG0+LaAme+iSIjx9lyYGCAvdvuA=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.AssemblyReference.cache b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..b00b3cc
--- /dev/null
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.AssemblyReference.cache
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.FileListAbsolute.txt b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.FileListAbsolute.txt
index a780e72..0a87822 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.FileListAbsolute.txt
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.FileListAbsolute.txt
@@ -21,6 +21,7 @@
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\bin\Debug\WFormSynchronizeData_SMR.pdb
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\bin\Debug\Newtonsoft.Json.dll
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\bin\Debug\Newtonsoft.Json.xml
+E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.csproj.AssemblyReference.cache
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.Form1.resources
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.Properties.Resources.resources
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.csproj.GenerateResource.cache
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.GenerateResource.cache b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.GenerateResource.cache
index 914f415..64afab1 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.GenerateResource.cache
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.GenerateResource.cache
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe
index ab20893..b6d44b9 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe.manifest b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe.manifest
index 244658f..05dcfec 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe.manifest
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe.manifest
@@ -61,7 +61,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
- <dsig:DigestValue>2RHbf73sp2HcWRLN55JZdxxZ1PQWFHWnJO7hbFaX44w=</dsig:DigestValue>
+ <dsig:DigestValue>kSXIZlMRzQeIw+fo2ApCn4XExHBfk9fvo7IO6cPRYKQ=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.pdb b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.pdb
index bef56e6..a92efd6 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.pdb
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.pdb
Binary files differ
--
Gitblit v1.9.1