From 65bbe0e6e6378008c7554104b2d228485f9078b1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 13 十二月 2023 15:18:24 +0800
Subject: [PATCH] 1
---
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.GenerateResource.cache | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.pdb | 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 | 3
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe.manifest | 4
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.FileListAbsolute.txt | 1
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/.vs/WFormSynchronizeData_SMR/v16/.suo | 0
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/Form1.resx | 3
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs | 223 +++++++---
/dev/null | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe.manifest | 4
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.Designer.cs | 16
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs | 830 ++++++++++++++++++++++++++++++------------
28 files changed, 761 insertions(+), 341 deletions(-)
diff --git a/WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo b/WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo
index e3e9b9e..b9995a6 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/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/ReadyDataForm.Designer.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.Designer.cs
index c3084e3..6d65d87 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.Designer.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.Designer.cs
@@ -108,8 +108,7 @@
//
// timer1
//
- this.timer1.Enabled = true;
- this.timer1.Interval = 10000;
+ this.timer1.Interval = 30000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// HSouceName
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs
index 4f91b32..16d2f9b 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs
@@ -38,80 +38,84 @@
-// if (this.HEmpCode.Text == "") {
+ //if (this.HEmpCode.Text == "")
+ //{
-// MessageBox.Show("璇疯緭鍏ュ憳宸ョ紪鐮�");
-// }
-// else
-// {
-// int year = DateTime.Now.Year;
-// string month = DateTime.Now.Month.ToString();
-// string day = DateTime.Now.Day.ToString();
+ // MessageBox.Show("璇疯緭鍏ュ憳宸ョ紪鐮�");
+ //}
+ //else
+ //{
+ // int year = DateTime.Now.Year;
+ // string month = DateTime.Now.Month.ToString();
+ // string day = DateTime.Now.Day.ToString();
-// string dataTime = DateTime.Now.ToString("yyyyMMdd");
-// ////鍒ゆ柇鏄惁鏈夎繖涓枃浠�
-// //bool flag = File.Exists($@"D:\{year}\{month}\{day}\{dataTime}.txt");
-// bool flag = File.Exists($@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123.txt");
+ // string dataTime = DateTime.Now.ToString("yyyyMMdd");
+ // ////鍒ゆ柇鏄惁鏈夎繖涓枃浠�
+ // //bool flag = File.Exists($@"D:\{year}\{month}\{day}\{dataTime}.txt");
+ // bool flag = File.Exists($@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123.txt");
-// if (flag)
-// {
-// //StreamReader stream = new StreamReader($@"D:\{year}\{month}\{day}\{dataTime}.txt", Encoding.GetEncoding("gb2312"));
-// StreamReader stream = new StreamReader($@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123.txt", Encoding.GetEncoding("gb2312"));
+ // if (flag)
+ // {
+ // //StreamReader stream = new StreamReader($@"D:\{year}\{month}\{day}\{dataTime}.txt", Encoding.GetEncoding("gb2312"));
+ // StreamReader stream = new StreamReader($@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123.txt", Encoding.GetEncoding("gb2312"));
-// string FileData = stream.ReadToEnd();
-// stream.Close();
-// FileData = FileData.Substring(0, FileData.Length - 1);
-// FileData = "[" + FileData + "]";
-// //JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
-// List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
-// List<object> DataList = JsonConvert.DeserializeObject<List<object>>(FileData);
-// foreach (JObject item in DataList)
-// {
-// Dictionary<string, string> dic = new Dictionary<string, string>();
-// foreach (var itm in item.Properties())
-// {
-// dic.Add(itm.Name, itm.Value.ToString());
-// }
-// list.Add(dic);
-// }
-// //鑾峰彇褰撳墠鏃堕棿
-// 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"));
-// //寰幆闆嗗悎
-// for (int i = 0; i < list.Count; i++)
-// {
-// DateTime NowTime = DateTime.Parse(list[i]["HDate"].ToString());
-// if (NowTime >= ActionTime && NowTime < EndTime)
-// {
-// string HSourceCode = list[i]["HSouceNumber"].ToString();
-// string HEmpCode = this.HEmpCode.Text;
-// //string HEmpCode = "";
-// string HType = list[i]["HBadReason"].ToString();
-// string HBarCode = list[i]["HBadCodeSN"].ToString();
-// int HCount = 1;
-// string HCreateTime = list[i]["HDate"].ToString();
-// string HDate = DateTime.Parse(list[i]["HDate"].ToString()).ToString("yyyy-MM-dd");
-// string HResult = list[i]["HResult"].ToString();
-// string HProcNumber = list[i]["HProcNumber"].ToString();
-// int HFlag = 0;
+ // string FileData = stream.ReadToEnd();
+ // stream.Close();
+ // FileData = FileData.Substring(0, FileData.Length - 1);
+ // FileData = "[" + FileData + "]";
+ // //JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
+ // List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+ // List<object> DataList = JsonConvert.DeserializeObject<List<object>>(FileData);
+ // foreach (JObject item in DataList)
+ // {
+ // Dictionary<string, string> dic = new Dictionary<string, string>();
+ // foreach (var itm in item.Properties())
+ // {
+ // dic.Add(itm.Name, itm.Value.ToString());
+ // }
+ // list.Add(dic);
+ // }
+ // //鑾峰彇褰撳墠鏃堕棿
+ // 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"));
-// DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollection_SN where HBarCode='" + HBarCode + "' and HCreateTime='" + HCreateTime + "'", "Sb_EquipMentCollection_SN");
+ // Xt_Gy_RoutBill();
-// 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);
-// }
-// }
-// else
-// {
-// //CustomWriteLog("鏃堕棿涓嶅湪淇濆瓨鑼冨洿鍐�", DateTime.Now.ToString("yyyy-MM-dd"));
-// }
-// }
-// }
-// }
+ // //寰幆闆嗗悎
+ // for (int i = 0; i < list.Count; i++)
+ // {
+ // DateTime NowTime = DateTime.Parse(list[i]["HDate"].ToString());
+ // if (NowTime >= ActionTime && NowTime < EndTime)
+ // {
+ // string HSourceCode = list[i]["HSouceNumber"].ToString();
+ // string HEmpCode = this.HEmpCode.Text;
+ // //string HEmpCode = "";
+ // string HType = list[i]["HBadReason"].ToString();
+ // string HBarCode = list[i]["HBadCodeSN"].ToString();
+ // int HCount = 1;
+ // string HCreateTime = list[i]["HDate"].ToString();
+ // string HDate = DateTime.Parse(list[i]["HDate"].ToString()).ToString("yyyy-MM-dd");
+ // string HResult = list[i]["HResult"].ToString();
+ // string HProcNumber = list[i]["HProcNumber"].ToString();
+ // int HFlag = 0;
+
+ // 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);
+ // }
+ // }
+ // else
+ // {
+ // //CustomWriteLog("鏃堕棿涓嶅湪淇濆瓨鑼冨洿鍐�", DateTime.Now.ToString("yyyy-MM-dd"));
+ // }
+ // }
+ // }
+ //}
}
//鍛樺伐缂栫爜鍥炶溅
@@ -176,13 +180,13 @@
string dataTime = DateTime.Now.ToString("yyyyMMdd");
////鍒ゆ柇鏄惁鏈夎繖涓枃浠�
- //bool flag = File.Exists($@"D:\{year}\{month}\{day}\{dataTime}.txt");
- bool flag = File.Exists($@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123.txt");
+ bool flag = File.Exists($@"D:\{year}\{month}\{day}\{dataTime}.txt");
+ //bool flag = File.Exists($@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123.txt");
if (flag)
{
- //StreamReader stream = new StreamReader($@"D:\{year}\{month}\{day}\{dataTime}.txt", Encoding.GetEncoding("gb2312"));
- StreamReader stream = new StreamReader($@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123.txt", Encoding.GetEncoding("gb2312"));
+ StreamReader stream = new StreamReader($@"D:\{year}\{month}\{day}\{dataTime}.txt", Encoding.GetEncoding("gb2312"));
+ //StreamReader stream = new StreamReader($@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123.txt", Encoding.GetEncoding("gb2312"));
string FileData = stream.ReadToEnd();
stream.Close();
@@ -203,6 +207,10 @@
//鑾峰彇褰撳墠鏃堕棿
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"));
+
+ //鑾峰彇绯荤粺鍙傛暟
+ Xt_Gy_RoutBill();
+
//寰幆闆嗗悎
for (int i = 0; i < list.Count; i++)
{
@@ -273,5 +281,76 @@
MessageBox.Show(this, e.Message, "鎻愮ず");
}
}
+
+ //璇诲彇绯荤粺鍙傛暟
+ public void Xt_Gy_RoutBill() {
+ int year = DateTime.Now.Year;
+ string month = DateTime.Now.Month.ToString();
+ string day = DateTime.Now.Day.ToString();
+
+ string dataTime = DateTime.Now.ToString("yyyyMMdd");
+ ////鍒ゆ柇鏄惁鏈夎繖涓枃浠�
+ bool flag = File.Exists($@"D:\{year}\{month}\{day}\{dataTime}.txt");
+ //bool flag = File.Exists($@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123.txt");
+
+ if (flag)
+ {
+ StreamReader stream = new StreamReader($@"D:\{year}\{month}\{day}\{dataTime}.txt", Encoding.GetEncoding("gb2312"));
+ //StreamReader stream = new StreamReader($@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123.txt", Encoding.GetEncoding("gb2312"));
+
+ string FileData = stream.ReadToEnd();
+ stream.Close();
+ FileData = FileData.Substring(0, FileData.Length - 1);
+ FileData = "[" + FileData + "]";
+ //JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+ List<object> DataList = JsonConvert.DeserializeObject<List<object>>(FileData);
+ foreach (JObject item in DataList)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+ //鑾峰彇褰撳墠鏃堕棿
+ 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"));
+ //寰幆闆嗗悎
+ for (int i = 0; i < list.Count; i++)
+ {
+ DateTime NowTime = DateTime.Parse(list[i]["HDate"].ToString());
+ if (NowTime >= ActionTime && NowTime < EndTime)
+ {
+ string HSourceCode = list[i]["HSouceNumber"].ToString();
+ string HEmpCode = this.HEmpCode.Text;
+ //string HEmpCode = "";
+ string HType = list[i]["HBadReason"].ToString();
+ string HBarCode = list[i]["HBadCodeSN"].ToString();
+ int HCount = 1;
+ string HCreateTime = list[i]["HDate"].ToString();
+ string HDate = DateTime.Parse(list[i]["HDate"].ToString()).ToString("yyyy-MM-dd");
+ string HResult = list[i]["HResult"].ToString();
+ string HProcNumber = list[i]["HProcNumber"].ToString();
+ int HFlag = 0;
+
+ DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollectionTechParam_SN where HBarCode='" + HBarCode + "' and HCreateTime='" + HCreateTime + "'", "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);
+ }
+ }
+ else
+ {
+ //CustomWriteLog("鏃堕棿涓嶅湪淇濆瓨鑼冨洿鍐�", DateTime.Now.ToString("yyyy-MM-dd"));
+ }
+ }
+ }
+ }
}
}
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug.rar b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug.rar
similarity index 83%
rename from WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug.rar
rename to WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug.rar
index 383747a..ce24354 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_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 811514a..7294b49 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 2b5d621..2b00b63 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
new file mode 100644
index 0000000..1078187
--- /dev/null
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.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
deleted file mode 100644
index f5e894a..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 68282c2..5ed4f83 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
@@ -10,4 +10,3 @@
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.csproj.AssemblyReference.cache
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 db5c7ba..8463d93 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 811514a..7294b49 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 2b5d621..2b00b63 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 4486394..1d9f3ed 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.Designer.cs
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.Designer.cs
@@ -30,9 +30,16 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
+ System.Windows.Forms.Timer timer1;
this.btnReadData = new System.Windows.Forms.Button();
- this.timer1 = new System.Windows.Forms.Timer(this.components);
+ timer1 = new System.Windows.Forms.Timer(this.components);
this.SuspendLayout();
+ //
+ // timer1
+ //
+ timer1.Enabled = true;
+ timer1.Interval = 3000;
+ timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// btnReadData
//
@@ -43,12 +50,6 @@
this.btnReadData.Text = "璇诲彇鏁版嵁";
this.btnReadData.UseVisualStyleBackColor = true;
this.btnReadData.Click += new System.EventHandler(this.btnReadData_Click);
- //
- // timer1
- //
- this.timer1.Enabled = true;
- this.timer1.Interval = 60000;
- this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// Form1
//
@@ -65,7 +66,6 @@
#endregion
private System.Windows.Forms.Button btnReadData;
- private System.Windows.Forms.Timer timer1;
}
}
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
index b67db5d..76107a0 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
@@ -15,145 +15,136 @@
{
public partial class Form1 : Form
{
- public DBHelper oCN = new DBHelper();
+ public DBHelper oCN = new DBHelper();
public Form1()
{
InitializeComponent();
}
//璇诲彇鏁版嵁
- private void btnReadData_Click(object sender, EventArgs e)
+ private void btnReadData_Click(object sender, EventArgs e)
{
- int year = DateTime.Now.Year;
- string month = DateTime.Now.Month.ToString();
- string day = DateTime.Now.Day.ToString();
-
- //if (month.Length < 2) {
- // month = "0" + month;
- //}
- //if (day.Length < 2)
- //{
- // day = "0" + day;
- //}
-
- string dataTime = DateTime.Now.ToString("yyyyMMdd");
- //CustomWriteLog("1:" + dataTime, DateTime.Now.ToString("yyyy-MM-dd"));
- ////鍒ゆ柇鏄惁鏈夎繖涓枃浠�
- bool flag = File.Exists($@"D:\{year}\{month}\{day}\{dataTime}.txt");
- //bool flag = File.Exists($@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123.txt");
- //CustomWriteLog("2:" + flag, DateTime.Now.ToString("yyyy-MM-dd"));
- if (flag)
+ DataTable list = oCN.RunProcReturn("select * from Sb_EquipMentCollection_SN where HFlag=0 order by HCreateTime", "Sb_EquipMentCollection_SN").Tables[0];
+
+ //寰幆闆嗗悎
+ for (int i = 0; i < list.Rows.Count; i++)
{
- StreamReader stream = new StreamReader($@"D:\{year}\{month}\{day}\{dataTime}.txt", Encoding.GetEncoding("gb2312"));
- //CustomWriteLog("3:"+ $@"D:\{year}\{month}\{day}\{dataTime}.txt", DateTime.Now.ToString("yyyy-MM-dd"));
- //StreamReader stream = new StreamReader($@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123.txt",Encoding.GetEncoding("gb2312"));
- string FileData = stream.ReadToEnd();
- stream.Close();
- FileData = FileData.Substring(0, FileData.Length - 1);
- FileData = "[" + FileData + "]";
- //CustomWriteLog("4:" + FileData, DateTime.Now.ToString("yyyy-MM-dd"));
- //JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
- List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
- List<object> DataList = JsonConvert.DeserializeObject<List<object>>(FileData);
- foreach (JObject item in DataList)
+ bool flag = false;
+ string HResult = list.Rows[i]["HResult"].ToString();
+ string HBadCodeSN = list.Rows[i]["HBarCode"].ToString();
+ //寮�濮嬩簨鍔�
+ oCN.BeginTran();
+
+ if (HResult == "OK")
{
- Dictionary<string, string> dic = new Dictionary<string, string>();
- foreach (var itm in item.Properties())
- {
- dic.Add(itm.Name, itm.Value.ToString());
- }
- list.Add(dic);
+ flag=HResultOK(list.Rows[i]);
}
- //CustomWriteLog("5:" + list.Count, DateTime.Now.ToString("yyyy-MM-dd"));
- //鑾峰彇褰撳墠鏃堕棿
- 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"));
- //寰幆闆嗗悎
- for (int i = 0; i < list.Count; i++)
+ else if (HResult == "NG")
{
- DateTime NowTime = DateTime.Parse(list[i]["HDate"].ToString());
- if (NowTime >= ActionTime && NowTime < EndTime)
- {
- string HResult = list[i]["HResult"].ToString();
-
- //CustomWriteLog("6:" + HResult, DateTime.Now.ToString("yyyy-MM-dd"));
- if (HResult == "OK")
- {
- HResultOK(list[i]);
- }
- else if (HResult == "NG")
- {
- HResultNG(list[i]);
- }
- }
- else
- {
- //CustomWriteLog("鏃堕棿涓嶅湪淇濆瓨鑼冨洿鍐�", DateTime.Now.ToString("yyyy-MM-dd"));
- }
+ flag = HResultNG(list.Rows[i]);
}
- }
- }
- public void HResultOK(Dictionary<string, string> dic)
- {
- try
- {
- string HBadCodeSN = dic["HBadCodeSN"].ToString();
- HBadCodeSN = TM_ZH(HBadCodeSN);
- bool flag = SNHBardCodeList(HBadCodeSN);
-
- if (flag)
- {
- getAdd(dic, HBadCodeSN, "OK");
- }
-
- }
- catch (Exception e)
- {
- oCN.RollBack();
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- //objJsonResult.data = null;
- //return objJsonResult;
- }
- }
-
- public void HResultNG(Dictionary<string, string> dic)
- {
- try
- {
- string HBadCodeSN = dic["HBadCodeSN"].ToString();
- HBadCodeSN = TM_ZH(HBadCodeSN);
- bool flag = SNHBardCodeList(HBadCodeSN);
-
- if (flag)
- {
- getAdd(dic, HBadCodeSN, "NG");
- //寮�濮嬩簨鍔�
- oCN.BeginTran();
-
- //鍙嶅啓鏉＄爜鐘舵��
- oCN.RunProc("update Gy_BarCodeBill set HStatus='涓嶈壇',HRemark='"+dic["HBadReason"].ToString()+"' where HBarCode='" + HBadCodeSN + "'");
-
+ if (flag) {
+ oCN.RunProc("update Sb_EquipMentCollection_SN set HFlag=1 where HBarCode='" + HBadCodeSN + "'");
//缁撴潫浜嬪姟
oCN.Commit();
}
- }
- catch (Exception e)
- {
- //鍥炴粴浜嬪姟
- oCN.RollBack();
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- //objJsonResult.data = null;
- //return objJsonResult;
+
}
}
- public bool getAdd(Dictionary<string, string> dic,string HBadCodeSN,string HResult) {
+ public bool HResultOK(DataRow dic)
+ {
+ try
+ {
+ bool flag = false;
+ string HBadCodeSN = dic["HBarCode"].ToString();
+ HBadCodeSN = TM_ZH(HBadCodeSN);
+ int num = SNHBardCodeList(HBadCodeSN);
+
+ if (num == 0)
+ {
+ flag = getOutBillAdd(dic, HBadCodeSN, "OK");
+ }
+ else if (num == 1)
+ {
+ //鍒ゆ柇杩欎釜鏉＄爜涔嬪墠鐨勭姸鎬佹槸鍚︿负NG
+ DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollection_SN where HBarCode='" + HBadCodeSN + "' and HCreateTime<'" + dic["HCreateTime"].ToString() + "' and HResult='NG'", "Gy_BarCodeBill");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ flag = getOKOutBillAdd(dic, HBadCodeSN, "OK");
+ }
+ else
+ {
+ flag = false;
+ oCN.RollBack();
+ }
+ }
+ else if (num == 2)
+ {
+ flag = false;
+ }
+ return flag;
+
+ }
+ catch (Exception e)
+ {
+ string HBadCodeSN = dic["HBarCode"].ToString();
+ CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",閿欒鍘熷洜:" + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
+ oCN.RollBack();
+ return false;
+ }
+ }
+
+ public bool HResultNG(DataRow dic)
+ {
+ try
+ {
+ bool flag = false;
+ int num = 0;
+ string HBadCodeSN = dic["HBarCode"].ToString();
+ HBadCodeSN = TM_ZH(HBadCodeSN);
+ num = SNHBardCodeList(HBadCodeSN);
+
+ if (num == 0)
+ {
+ flag = getOutBillAdd(dic, HBadCodeSN, "NG");
+
+ if (flag)
+ {
+ //鏂板涓嶈壇姹囨姤
+ flag = getBadBillAdd(dic);
+ //鍙嶅啓鏉＄爜鐘舵��
+ 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;
+ }
+ return flag;
+ }
+ catch (Exception e)
+ {
+ string HBadCodeSN = dic["HBarCode"].ToString();
+ CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",閿欒鍘熷洜:"+e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
+ //鍥炴粴浜嬪姟
+ oCN.RollBack();
+ return false;
+ }
+ }
+
+ //鏂板鍑虹珯姹囨姤鍗�
+ public bool getOutBillAdd(DataRow dic, string HBadCodeSN, string HResult)
+ {
try
{
//鑾峰彇缁戝畾娴佽浆鍗�
@@ -161,18 +152,40 @@
string HProcExchBillNo = ds.Tables[0].Rows[0]["HSourceBillNo"].ToString();
string HProcNumber = dic["HProcNumber"].ToString();
- ds = oCN.RunProcReturn("select * from Gy_Source where HNumber='" + dic["HSouceNumber"].ToString() + "' ", "Gy_Source");
+ ds = oCN.RunProcReturn("select * from Gy_Source where HNumber='" + dic["HSourceCode"].ToString() + "' ", "Gy_Source");
long HSourceID = 0;
- if (ds.Tables[0].Rows.Count != 0) {
+ if (ds.Tables[0].Rows.Count != 0)
+ {
HSourceID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());//鐢熶骇璧勬簮ID
}
- ds = oCN.RunProcReturn("select * from Gy_Department where HNumber='" + dic["HDeptNumber"].ToString() + "' ", "Gy_Department");
- long HDeptID = 0;
+ //鏌ヨ鑱屽憳
+ ds = oCN.RunProcReturn("select * from Gy_Employee where HNumber='" + dic["HEmpCode"].ToString() + "' ", "Gy_Employee");
+ long HEmpIDs = 0;
if (ds.Tables[0].Rows.Count != 0)
{
- HDeptID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());//鐢熶骇閮ㄩ棬
+ HEmpIDs = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());//鑱屽憳ID
}
+
+ long HDeptID = 0;
+ long HPRDOrgIDs = 0;
+ string sReturn = "";
+ if (GetSingleSystemParameter("WMS_CampanyName", ref sReturn) == "鏉窞鏂帿灏�")
+ {
+ HDeptID = 389499;
+ HPRDOrgIDs = 100199;
+ }
+ else {
+ //ds = oCN.RunProcReturn("select * from Gy_Department where HNumber='" + dic["HDeptNumber"].ToString() + "' ", "Gy_Department");
+
+ //if (ds.Tables[0].Rows.Count != 0)
+ //{
+ // HDeptID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());//鐢熶骇閮ㄩ棬
+ //}
+ HDeptID = 0;
+ }
+
+
ds = oCN.RunProcReturn(@"select b.HProcNo,b.HProcID,a.HMaterID,a.HQty,a.HInterID,HEntryID,a.HICMOInterID,a.HICMOEntryID,a.HICMOBillNo from Sc_ProcessExchangeBillMain a
inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID
@@ -183,7 +196,7 @@
long HMainInterID = 0;
string BillType = "3791";
string HBillSubType = "3791";
-
+
int HBillStatus = 1;
string HMaker = "";//鍒跺崟浜�
string HMouldNum = "";//妯＄┐鍙�
@@ -212,7 +225,7 @@
long HPayProcID = 0;//鏍哥畻宸ュ簭ID
long HGroupID = 22;//鐝粍ID 鐧界彮
- long HEmpID = 0;//鎿嶄綔鍛業D
+ long HEmpID = HEmpIDs;//鎿嶄綔鍛業D
long HEmpID2 = 0;////鎿嶄綔鍛�2ID
string HBarCode = HProcExchBillNo;//鏉″舰鐮�
string HAddr = "";
@@ -240,26 +253,25 @@
double HPriceRate = 0;//绯绘暟
double HWorkTimes = 0;//宸ユ椂
long HQCCheckID = 0;//妫�楠屽憳ID
- long HPRDOrgID = 100199;//缁勭粐ID
+ long HPRDOrgID = HPRDOrgIDs;//缁勭粐ID
double HmaterOutqty = 0;//鐧藉澂鍙戝竷
double HProcPriceRate = 0;//宸ヤ环绯绘暟
int HTemporaryAreaID = 0;//鏆傛斁鍖�
long HInterID = 0;
string HBillNo = "";
- oCN.BeginTran();
//鍒ゆ柇褰撳墠娴佽浆鍗＄殑鍑虹珯鍗� 鏄惁鏈夋暟鎹�
ds = oCN.RunProcReturn(@"select * from Sc_StationOutBillMain a
left join Gy_Process p on a.HProcID=p.HItemID
-where HProcExchBillNo='" + HProcExchBillNo + "' and p.HNumber='" + HProcNumber + "'", "Sc_StationOutBillMain");
+where HProcExchBillNo='" + HProcExchBillNo + "' and p.HNumber='" + HProcNumber + "' and CONVERT(varchar(10),HDate,20) ='" + DateTime.Now.ToString("yyyy-MM-dd") + "'", "Sc_StationOutBillMain");
if (ds.Tables[0].Rows.Count != 0)
{
HInterID = long.Parse(ds.Tables[0].Rows[0]["HInterID"].ToString());
HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();//閫掑叆type寰楀埌鐨勫崟鎹彿
}
-
+
if (ds.Tables[0].Rows.Count == 0)
{
HInterID = CreateBillID("3791", ref sExeReturnInfo);//閫掑叆type寰楀埌鐨勫崟鎹甀D
@@ -293,35 +305,270 @@
{
ds = oCN.RunProcReturn("select * from Sc_StationOutBillSub_SN where HInterID='" + HInterID + "' order by HEntryID desc", "Sc_StationOutBillSub_SN");
+ string HMakeTime = dic["HCreateTime"].ToString();
oCN.RunProc($@"insert into Sc_StationOutBillSub_SN(HInterID,HBillNo_bak,HEntryID,HBarCode,HBarCodeQty,HMakeTime,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney)
-values({ HInterID}, '{ HBillNo}', {(ds.Tables[0].Rows.Count == 0 ? 1 : int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1)}, '{HBadCodeSN}', 1, GETDATE(), '', " + HProcExchInterID + "," + HProcExchEntryID + ", '" + HProcExchBillNo + "', '', 0, 0)");
+values({ HInterID}, '{ HBillNo}', {(ds.Tables[0].Rows.Count == 0 ? 1 : int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1)}, '{HBadCodeSN}', 1, '"+ HMakeTime + "', '', " + HProcExchInterID + "," + HProcExchEntryID + ", '" + HProcExchBillNo + "', '', 0, 0)");
//鍙嶅啓宸ュ簭鍑虹珯鍗曠殑鍚堟牸鏁伴噺
- oCN.RunProc("update Sc_StationOutBillMain set HQty+=1 where HProcExchInterID='" + HProcExchInterID + "' and HProcExchEntryID=" + HProcExchEntryID);
+ oCN.RunProc("update Sc_StationOutBillMain set HQty+=1 where HInterID='" + HInterID + "'");
}
else if (HResult == "NG")
{
//鍙嶅啓宸ュ簭鍑虹珯鍗曠殑涓嶈壇鏁伴噺
- oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1 where HProcExchInterID='" + HProcExchInterID + "' and HProcExchEntryID=" + HProcExchEntryID);
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1 where HInterID='" + HInterID + "'");
}
else
{
CustomWriteLog("缁撴灉涓嶄负OK鎴朜G!", DateTime.Now.ToString("yyyy-MM-dd"));
+ oCN.RollBack();
return false;
}
- oCN.Commit();
+
+ bool flag = false;
+
+ //flag = AddXt_XtRoutBill(HInterID, HBillNo, HBadCodeSN);
+
+ //if (!flag) {
+ // CustomWriteLog("绯荤粺鍙傛暟淇濆瓨澶辫触,鏉＄爜:" + HBadCodeSN , DateTime.Now.ToString("yyyy-MM-dd"));
+ // oCN.RollBack();
+ // return false;
+ //}
+
+ //澧炲姞浜х嚎缁勮杩芥函鍗�
+ DataSet dataSet = oCN.RunProcReturn("exec h_p_Gy_BarCodeBillBomList '" + HProcExchBillNo + "'," + HProcID, "h_p_Gy_BarCodeBillBomList");
+
+ if (dataSet.Tables[0].Rows.Count > 0)
+ {
+ //鍒ら厤浠舵暟閲忔槸鍚︾瓑浜�0
+ for (int i = 0; i < dataSet.Tables[0].Rows.Count; i++)
+ {
+ 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();
+ return false;
+ }
+ }
+
+
+ //鏌ヨ鑱屽憳
+ ds = oCN.RunProcReturn("select * from Gy_Employee where HNumber='" + dic["HEmpCode"].ToString() + "' ", "Gy_Employee");
+ string HMakers = "";
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ HEmpIDs = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());//鑱屽憳ID
+ HMakers = ds.Tables[0].Rows[0]["HName"].ToString();
+ }
+
+ Int64 HInterID1 = CreateBillID("3727", ref sExeReturnInfo);
+ string HBillNo1 = CreateBillCode_Prod("3727", ref sExeReturnInfo, true);
+
+ //淇濆瓨鐢熶骇缁勮鍗曚富琛�
+ string sql = $@"Insert Into Sc_AssemblyBillMain(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate
+,HBillNo,HBillStatus,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo
+,HICMOInterID,HICMOBillNo,HBarCode_P,HMaterID,HUnitID,HAssemblyStatus,HProdOrgID)
+values('{DateTime.Now.Year}','{DateTime.Now.Month}','3727','3727',{HInterID1},getdate()
+,'{HBillNo1}','1','{HMakers}',getdate(),{HProcExchInterID},{HProcExchEntryID},'{HProcExchBillNo}'
+,{HICMOInterID},'{HICMOBillNo}','{HBadCodeSN}',{HMaterID},0,'姹囨姤',{HPRDOrgIDs})";
+ oCN.RunProc(sql);
+
+ for (int i = 0; i < dataSet.Tables[0].Rows.Count; i++)
+ {
+ string HMaterIDs = dataSet.Tables[0].Rows[i]["HMaterID"].ToString();
+ string HBarCodes = dataSet.Tables[0].Rows[i]["HBarCode"].ToString();
+ //瀛愯〃瀛樺偍
+ string sq2 = $@"Insert Into Sc_AssemblyBillSub(HInterID,HBillNo_bak,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo
+ ,HSourceBillType,HMaterID,HSourceID,HEquipID,HUnitID,HQty
+ ,HGroupID,HWorkerID,HScanDate,HBarCode,HBarCode_P,HSNNumber)
+ values({HInterID1},'{HBillNo1}',{(i + 1)},0,0,''
+ ,'',{ HMaterIDs},0,0,0,1
+ ,0,0,getdate(),'{HBarCodes}','{HBadCodeSN}','') ";
+ oCN.RunProc(sq2);
+ }
+ }
return true;
}
catch (Exception e)
{
CustomWriteLog(e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
+ oCN.RollBack();
+ return false;
+ }
+ }
+
+ //鏂板杩斾慨OK鍑虹珯姹囨姤鍗�
+ public bool getOKOutBillAdd(DataRow dic, string HBadCodeSN, string HResult)
+ {
+ try
+ {
+ //鑾峰彇缁戝畾娴佽浆鍗�
+ DataSet ds = oCN.RunProcReturn(@"select * from Gy_BarCodeBill where HBarCode='" + HBadCodeSN + "'", "Gy_BarCodeBill");
+ string HProcExchBillNo = ds.Tables[0].Rows[0]["HSourceBillNo"].ToString();
+ string HProcNumber = dic["HProcNumber"].ToString();
+
+ ds = oCN.RunProcReturn("select * from Gy_Source where HNumber='" + dic["HSourceCode"].ToString() + "' ", "Gy_Source");
+ long HSourceID = 0;
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ HSourceID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());//鐢熶骇璧勬簮ID
+ }
+
+ //鏌ヨ鑱屽憳
+ ds = oCN.RunProcReturn("select * from Gy_Employee where HNumber='" + dic["HEmpCode"].ToString() + "' ", "Gy_Employee");
+ long HEmpIDs = 0;
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ HEmpIDs = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());//鑱屽憳ID
+ }
+
+ long HDeptID = 0;
+ long HPRDOrgIDs = 0;
+ string sReturn = "";
+ if (GetSingleSystemParameter("WMS_CampanyName", ref sReturn) == "鏉窞鏂帿灏�")
+ {
+ HDeptID = 389499;
+ HPRDOrgIDs = 100199;
+ }
+ else
+ {
+ //ds = oCN.RunProcReturn("select * from Gy_Department where HNumber='" + dic["HDeptNumber"].ToString() + "' ", "Gy_Department");
+
+ //if (ds.Tables[0].Rows.Count != 0)
+ //{
+ // HDeptID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());//鐢熶骇閮ㄩ棬
+ //}
+ HDeptID = 0;
+ }
+
+ ds = oCN.RunProcReturn(@"select b.HProcNo,b.HProcID,a.HMaterID,a.HQty,a.HInterID,HEntryID,a.HICMOInterID,a.HICMOEntryID,a.HICMOBillNo
+ from Sc_ProcessExchangeBillMain a
+ inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID
+ left join Gy_Process p on b.HProcID=p.HItemID
+ where a.HBillNo='" + HProcExchBillNo + "' and p.HNumber='" + HProcNumber + "'", "Sc_ProcessExchangeBillMain");
+
+ long HICMOInterID = long.Parse(ds.Tables[0].Rows[0]["HICMOInterID"].ToString());//浠诲姟鍗旾D
+ long HICMOEntryID = long.Parse(ds.Tables[0].Rows[0]["HICMOEntryID"].ToString());//浠诲姟鍗旾D
+ string HICMOBillNo = ds.Tables[0].Rows[0]["HICMOBillNo"].ToString();//浠诲姟鍗�
+ long HProcExchInterID = long.Parse(ds.Tables[0].Rows[0]["HInterID"].ToString());
+ long HProcExchEntryID = long.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString());
+ long HMaterID = long.Parse(ds.Tables[0].Rows[0]["HMaterID"].ToString());//浜у搧ID
+ long HProcID = long.Parse(ds.Tables[0].Rows[0]["HProcID"].ToString());//褰撳墠宸ュ簭ID
+ long HInterID = 0;
+ string HBillNo = "";
+
+ ds = oCN.RunProcReturn("select * from Sc_AssemblyBillMain where HMainSourceInterID=" + HProcExchInterID + " and HMainSourceEntryID=" + HProcExchEntryID, "Sc_AssemblyBillMain");
+ DateTime HDate=DateTime.Now;
+ //褰撲骇鍝佹病鏈夐厤浠剁殑鏃跺�� 鏌ヨ 涓嶈壇璁板綍
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ ds = oCN.RunProcReturn("select * from Sc_QualityReportBillSub where HProcExchInterID=" + HProcExchInterID + " and HProcExchEntryID=" + HProcExchEntryID, "Sc_AssemblyBillMain");
+ HDate = DateTime.Parse(ds.Tables[0].Rows[0]["HMakeDate"].ToString());
+ }
+ else {
+ HDate = DateTime.Parse(ds.Tables[0].Rows[0]["HDate"].ToString());
+ }
+
+ //鏌ヨ鏄惁鏈夎繑淇褰�
+ ds = oCN.RunProcReturn(@"select a.HBarCode,a.HProcess,b.HSourceInterID,b.HSourceEntryID,b.HRepairResult from Sc_SourceLineRepairBillMain a
+inner join Sc_SourceLineRepairBillSub b on a.HInterID = b.HInterID
+where a.HBarCode = '"+ HBadCodeSN + "' and a.HProcess ="+ HProcID + " and b.HSourceInterID ="+ HProcExchInterID + " " +
+"and b.HSourceEntryID="+ HProcExchEntryID + " and b.HRepairResult = 'OK'", "Sc_SourceLineRepairBillMain");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",鏃犺繑淇褰�", DateTime.Now.ToString("yyyy-MM-dd"));
+ oCN.RollBack();
+ return false;
+ }
+
+ //鍒ゆ柇褰撳墠娴佽浆鍗＄殑鍑虹珯鍗� 鏄惁鏈夋暟鎹�
+ ds = oCN.RunProcReturn(@"select * from Sc_StationOutBillMain a
+left join Gy_Process p on a.HProcID=p.HItemID
+where HProcExchBillNo='" + HProcExchBillNo + "' and p.HNumber='" + HProcNumber + "' and CONVERT(varchar(10),HDate,20) ='" + HDate.ToString("yyyy-MM-dd") + "'", "Sc_StationOutBillMain");
+
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ HInterID = long.Parse(ds.Tables[0].Rows[0]["HInterID"].ToString());
+ HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();//閫掑叆type寰楀埌鐨勫崟鎹彿
+ }
+
+ if (HResult == "OK")
+ {
+ ds = oCN.RunProcReturn("select * from Sc_StationOutBillSub_SN where HInterID='" + HInterID + "' order by HEntryID desc", "Sc_StationOutBillSub_SN");
+
+ string HMakeTime = dic["HCreateTime"].ToString();
+ oCN.RunProc($@"insert into Sc_StationOutBillSub_SN(HInterID,HBillNo_bak,HEntryID,HBarCode,HBarCodeQty,HMakeTime,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney)
+values({ HInterID}, '{ HBillNo}', {(ds.Tables[0].Rows.Count == 0 ? 1 : int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1)}, '{HBadCodeSN}', 1, '" + HMakeTime + "', '', " + HProcExchInterID + "," + HProcExchEntryID + ", '" + HProcExchBillNo + "', '', 0, 0)");
+
+ //鍙嶅啓宸ュ簭鍑虹珯鍗曠殑鍚堟牸鏁伴噺
+ oCN.RunProc("update Sc_StationOutBillMain set HQty+=1,HBadCount-=1 where HInterID='" + HInterID + "'");
+ //鍙嶅啓鏉＄爜鐘舵��
+ oCN.RunProc("update Gy_BarCodeBill set HStatus='' where HBarCode='" + HBadCodeSN + "'");
+ }
+ else
+ {
+ CustomWriteLog("缁撴灉涓嶄负OK!", DateTime.Now.ToString("yyyy-MM-dd"));
+ oCN.RollBack();
+ return false;
+ }
+
+ return true;
+ }
+ catch (Exception e)
+ {
+ CustomWriteLog(e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
+ oCN.RollBack();
+ return false;
+ }
+ }
+
+ //淇濆瓨绯荤粺鍙傛暟鍒板嚭绔欏崟
+ public bool AddXt_XtRoutBill(long HInterID, string HBillNo,string HBadCodeSN) {
+ try
+ {
+
+
+ DataSet ds = oCN.RunProcReturn("select * from Sc_StationOutBillMain where HInterID=" + HInterID + " and HBillNo='" + HBillNo + "'", "Sc_StationOutBillMain");
+ 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();
+
+ ds = oCN.RunProcReturn(@"select s.HItemID HMouldID,t.HItemID HTechParamID,HCount,HCreateTime from Sb_EquipMentCollectionTechParam_SN a
+left join Gy_Source s on a.HSourceCode=s.HNumber
+left join Gy_TechnologyParameter t on a.HType=t.HName
+where a.HFlag=0 and a.HBarCode='" + HBadCodeSN + "'", "Sb_EquipMentCollectionTechParam_SN");
+
+ if (ds.Tables[0].Rows.Count != 0) {
+
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ string HMouldID = ds.Tables[0].Rows[i]["HMouldID"].ToString();
+ string HTechParamID = ds.Tables[0].Rows[i]["HTechParamID"].ToString();
+ 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 where HInterID=" + HInterID + " and HBillNo_bak='" + HBillNo + "' and HBarCode='" + HBadCodeSN + "'", "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})");
+
+ }
+ }
+
+ return true;
+ }
+ catch (Exception e)
+ {
+ CustomWriteLog("宸ヨ壓鍙傛暟淇濆瓨:" + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
+ oCN.RollBack();
return false;
}
}
//鏉＄爜瑙ｆ瀽
- public bool SNHBardCodeList(string HBadCodeSN)
+ public int SNHBardCodeList(string HBadCodeSN)
{
try
{
@@ -342,30 +589,33 @@
}
else
{
- CustomWriteLog("鏉＄爜:"+ HBadCodeSN + ",娴佽浆鍗′笉瀛樺湪!", DateTime.Now.ToString("yyyy-MM-dd"));
- return false;
+ CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",娴佽浆鍗′笉瀛樺湪!", DateTime.Now.ToString("yyyy-MM-dd"));
+ oCN.RollBack();
+ return 2;
}
}
- else {
+ else
+ {
CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",闀垮害涓嶇瓑浜�29浣�!", DateTime.Now.ToString("yyyy-MM-dd"));
- return false;
+ oCN.RollBack();
+ return 2;
}
}
else
{
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",鏉＄爜宸插瓨鍦ㄦ暟鎹簱!", DateTime.Now.ToString("yyyy-MM-dd"));
- return false;
+ return 1;
}
- return true;
+ return 0;
}
catch (Exception e)
{
CustomWriteLog("鏉＄爜:" + HBadCodeSN + "," + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
- return false;
+ oCN.RollBack();
+ return 2;
}
}
- //淇濆瓨鏉＄爜鏁版嵁
+ //鏂板鏉＄爜鏁版嵁
public void get_HBardBillSave(string HBarCode, string HProcExchBillNo)
{
try
@@ -377,20 +627,14 @@
left join Gy_Unit u on a.HUnitID=u.HItemID
where HBillNo='" + HProcExchBillNo + "'", "Sc_ProcessExchangeBillMain");
- string HMaterNumber = dataSet.Tables[0].Rows[0]["鐗╂枡浠ｇ爜"].ToString();
- string HOrgNumber = dataSet.Tables[0].Rows[0]["缁勭粐浠ｇ爜"].ToString();
//鍒ゆ柇娴佽浆鍗′笉鑳戒负绌�
if (HBarCode.Trim() == "")
{
CustomWriteLog("鏉＄爜:" + HBarCode + ",娴佽浆鍗′笉鑳戒负绌�!", DateTime.Now.ToString("yyyy-MM-dd"));
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉＄爜锛�";
- //return objJsonResult;
+ oCN.RollBack();
}
-
- oCN.BeginTran();
+
//鏃ユ湡鑾峰彇鏂瑰紡
string sDate = DateTime.Now.ToString();
string HWei = "0"; //灏炬暟
@@ -426,7 +670,7 @@
bool HGiveAwayFlag = false;
Int64 HEntryID = 1;
string sExeReturnInfo = "";
- Int64 HInterID = CreateBillID_Prod("85", ref sExeReturnInfo);
+ Int64 HInterID = CreateBillID_Prod("85", ref sExeReturnInfo);
int HOrgID = int.Parse(dataSet.Tables[0].Rows[0]["HPRDORGID"].ToString());
string HCoilNO2 = "";
string HFurnaceNO2 = "";
@@ -454,12 +698,198 @@
+ ", " + BoolToString(HGiveAwayFlag)
+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "','','')");
- oCN.Commit();
}
catch (Exception e)
{
CustomWriteLog("鏉＄爜:" + HBarCode + "," + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ }
+ }
+
+ //鏉＄爜琛ュ厖
+ public string TM_ZH(string HBadCodeSN)
+ {
+ try
+ {
+ //HBadCodeSN = "P1" + HBadCodeSN;
+ //HBadCodeSN = HBadCodeSN.Substring(0, 13) + ":" + HBadCodeSN.Substring(13, 15);
+ return HBadCodeSN;
+ }
+ catch (Exception e)
+ {
+ CustomWriteLog("鏉＄爜:" + HBadCodeSN + "," + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
+ return "";
+ }
+
+ }
+
+ //瀹氭椂璇诲彇鏁版嵁
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ DataTable list = oCN.RunProcReturn("select * from Sb_EquipMentCollection_SN where HFlag=0", "Sb_EquipMentCollection_SN").Tables[0];
+
+ //寰幆闆嗗悎
+ for (int i = 0; i < list.Rows.Count; i++)
+ {
+ bool flag = false;
+ string HResult = list.Rows[i]["HResult"].ToString();
+ string HBadCodeSN = list.Rows[i]["HBarCode"].ToString();
+ //寮�濮嬩簨鍔�
+ oCN.BeginTran();
+
+ if (HResult == "OK")
+ {
+ flag = HResultOK(list.Rows[i]);
+ }
+ else if (HResult == "NG")
+ {
+ flag = HResultNG(list.Rows[i]);
+ }
+
+ if (flag)
+ {
+ oCN.RunProc("update Sb_EquipMentCollection_SN set HFlag=1 where HBarCode='" + HBadCodeSN + "'");
+ //缁撴潫浜嬪姟
+ oCN.Commit();
+ }
+
+ }
+ }
+
+ //鏂板涓嶈壇姹囨姤鍗�
+ public bool getBadBillAdd(DataRow dic) {
+ try
+ {
+
+ //鏌ヨ鑱屽憳
+ DataSet ds = oCN.RunProcReturn("select * from Gy_Employee where HNumber='" + dic["HEmpCode"].ToString() + "' ", "Gy_Employee");
+ long HEmpIDs = 0;
+ string HMakers = "";
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ HEmpIDs = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());//鑱屽憳ID
+ HMakers = ds.Tables[0].Rows[0]["HName"].ToString();
+ }
+
+ long HDeptID = 0;//杞﹂棿
+ string sReturn = "";
+ if (GetSingleSystemParameter("WMS_CampanyName", ref sReturn) == "鏉窞鏂帿灏�")
+ {
+ HDeptID = 389499;
+ }
+ else
+ {
+ //ds = oCN.RunProcReturn("select * from Gy_Department where HNumber='" + dic["HDeptNumber"].ToString() + "' ", "Gy_Department");
+
+ //if (ds.Tables[0].Rows.Count != 0)
+ //{
+ // HDeptID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());//鐢熶骇閮ㄩ棬
+ //}
+ HDeptID = 0;
+ }
+
+ string HProcExchInterID = "0";
+ string HProcExchEntryID = "0";
+ string HProcExchBillNo = "";
+ long HMaterID = 0;
+ long HUnitID = 0;
+ long HICMOInterID = 0;
+ long HICMOEntryID = 0;
+ string HICMOBillNo = "";
+ ds = oCN.RunProcReturn(@"select HMaterID,HUnitID,a.HICMOInterID,a.HICMOEntryID,a.HICMOBillNo,HBillNo,a.HInterID,b.HEntryID,a.HBillNo from Sc_ProcessExchangeBillMain a
+inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID
+left join Gy_Process p on b.HProcID=p.HItemID
+where HBillNo=(select HSourceBillNo from Gy_BarCodeBill where HBarCode='" + dic["HBarCode"].ToString() + "') and p.HNumber='" + dic["HProcNumber"].ToString() + "' ", "Sc_ProcessExchangeBillMain");
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ HMaterID = int.Parse(ds.Tables[0].Rows[0]["HMaterID"].ToString());
+ HUnitID = int.Parse(ds.Tables[0].Rows[0]["HUnitID"].ToString());
+ HICMOInterID = int.Parse(ds.Tables[0].Rows[0]["HICMOInterID"].ToString());
+ HICMOEntryID = int.Parse(ds.Tables[0].Rows[0]["HICMOEntryID"].ToString());
+ HICMOBillNo = ds.Tables[0].Rows[0]["HICMOBillNo"].ToString();
+ HProcExchInterID = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ HProcExchEntryID = ds.Tables[0].Rows[0]["HEntryID"].ToString();
+ HProcExchBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
+ }
+
+
+ ds = oCN.RunProcReturn("select * from Gy_Source where HNumber='" + dic["HSourceCode"].ToString() + "' ", "Gy_Source");
+ long HSourceID = 0;
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ HSourceID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());//鐢熶骇璧勬簮ID
+ }
+
+ string sExeReturnInfo = "";
+ long HInterID = CreateBillID("3717", ref sExeReturnInfo);//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = CreateBillCode_Prod("3717", ref sExeReturnInfo, true);//閫掑叆type寰楀埌鐨勫崟鎹彿
+ DateTime HDate = DateTime.Parse(dic["HCreateTime"].ToString());//鏃ユ湡
+ string HRemark = "";//澶囨敞
+ long HEmpID = HEmpIDs;//璐ㄦ鍛�
+ long HGroupID = 22;//鐝粍ID 鐧界彮
+ string HMaker = HMakers;//鍒跺崟浜�
+ long HMainSourceInterID = HICMOInterID;
+ long HMainSourceEntryID = HICMOEntryID;
+ string HMainSourceBillNo = HICMOBillNo;
+
+ //涓昏〃
+ oCN.RunProc(@"Insert Into Sc_QualityReportBillMain
+(HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate
+,HYear,HPeriod,HRemark,HMaker,HMakeDate
+,HEmpID,HGroupID,HDeptID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo)
+ values('3717','3717',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
+ ",'" + HEmpID + "'," + HGroupID + "," + HDeptID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "') ");
+
+
+ string HBarCode = dic["HBarCode"].ToString();
+ string HMakeDate = dic["HCreateTime"].ToString();
+ string HResult = dic["HResult"].ToString();
+ oCN.RunProc($@"Insert into Sc_QualityReportBillSub
+(HInterID,HENTRYID,HBillNo_bak,HEmpID,HBarCode,HBadReasonID,HAddr,HMaker,HMakeDate
+,HMaterID,HUnitID,HRemark,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HReportType
+,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
+,HQty,HResult,HProcExchInterID,HProcExchEntryID,HProcExchBillNo)
+values({HInterID},1,'{HBillNo}',{HEmpID},'{HBarCode}',0,'','{HMaker}','{HMakeDate}'
+,{HMaterID},{ HUnitID},'',{HSourceID},{ HICMOInterID},{ HICMOEntryID},'{HICMOBillNo}',0
+,0,0,'','',0,0
+,0,'{HResult}',{ HProcExchInterID},{ HProcExchEntryID},'{ HProcExchBillNo}')");
+
+ return true;
+ }
+ catch (Exception e)
+ {
+ CustomWriteLog("鎶ラ敊鍘熷洜:" + e.Message + "!", DateTime.Now.ToString("yyyy-MM-dd"));
+ oCN.RollBack();
+ return false;
+ }
+ }
+
+ #region 鍩虹鏂规硶
+
+ //鏌ヨ绯荤粺鍙傛暟
+ public string GetSingleSystemParameter(string sKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet DsSub;
+ //寰幆
+ DsSub = oCN.RunProcReturn("Select HValue from Xt_SystemParameter with(nolock) Where HKey='" + sKey + "' ", "Xt_SystemParameter");
+ if (DsSub == null || DsSub.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鎵句笉鍒拌鍙傛暟!";
+ return "";
+ }
+ else
+ {
+ return isStrNull(DsSub.Tables[0].Rows[0]["HValue"]);
+ }
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
}
}
@@ -491,23 +921,6 @@
return -2;
}
}
-
- //鏉＄爜琛ュ厖
- public string TM_ZH(string HBadCodeSN) {
- try
- {
- //HBadCodeSN = "P1" + HBadCodeSN;
- //HBadCodeSN = HBadCodeSN.Substring(0, 13) + ":" + HBadCodeSN.Substring(13, 15);
- return HBadCodeSN;
- }
- catch (Exception e)
- {
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + "," + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
- return "";
- }
-
- }
-
//鍒ゆ柇鏄惁鏄疘NT64
public static Int64 isLong(object message)
{
@@ -658,79 +1071,6 @@
{
}
}
-
- //瀹氭椂璇诲彇鏁版嵁
- private void timer1_Tick(object sender, EventArgs e)
- {
- int year = DateTime.Now.Year;
- string month = DateTime.Now.Month.ToString();
- string day = DateTime.Now.Day.ToString();
-
-
- //if (month.Length < 2) {
- // month = "0" + month;
- //}
- //if (day.Length < 2)
- //{
- // day = "0" + day;
- //}
-
- string dataTime = DateTime.Now.ToString("yyyyMMdd");
- //CustomWriteLog("1:" + dataTime, DateTime.Now.ToString("yyyy-MM-dd"));
- ////鍒ゆ柇鏄惁鏈夎繖涓枃浠�
- bool flag = File.Exists($@"D:\{year}\{month}\{day}\{dataTime}.txt");
- //bool flag = File.Exists($@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123.txt");
- //CustomWriteLog("2:" + flag, DateTime.Now.ToString("yyyy-MM-dd"));
- if (flag)
- {
- StreamReader stream = new StreamReader($@"D:\{year}\{month}\{day}\{dataTime}.txt", Encoding.GetEncoding("gb2312"));
- //CustomWriteLog("3:"+ $@"D:\{year}\{month}\{day}\{dataTime}.txt", DateTime.Now.ToString("yyyy-MM-dd"));
- //StreamReader stream = new StreamReader($@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123.txt",Encoding.GetEncoding("gb2312"));
- string FileData = stream.ReadToEnd();
- stream.Close();
- FileData = FileData.Substring(0, FileData.Length - 1);
- FileData = "[" + FileData + "]";
- //CustomWriteLog("4:" + FileData, DateTime.Now.ToString("yyyy-MM-dd"));
- //JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
- List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
- List<object> DataList = JsonConvert.DeserializeObject<List<object>>(FileData);
- foreach (JObject item in DataList)
- {
- Dictionary<string, string> dic = new Dictionary<string, string>();
- foreach (var itm in item.Properties())
- {
- dic.Add(itm.Name, itm.Value.ToString());
- }
- list.Add(dic);
- }
- //CustomWriteLog("5:" + list.Count, DateTime.Now.ToString("yyyy-MM-dd"));
- //鑾峰彇褰撳墠鏃堕棿
- 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"));
- //寰幆闆嗗悎
- for (int i = 0; i < list.Count; i++)
- {
- DateTime NowTime = DateTime.Parse(list[i]["HDate"].ToString());
- if (NowTime >= ActionTime && NowTime < EndTime)
- {
- string HResult = list[i]["HResult"].ToString();
-
- //CustomWriteLog("6:" + HResult, DateTime.Now.ToString("yyyy-MM-dd"));
- if (HResult == "OK")
- {
- HResultOK(list[i]);
- }
- else if (HResult == "NG")
- {
- HResultNG(list[i]);
- }
- }
- else
- {
- //CustomWriteLog("鏃堕棿涓嶅湪淇濆瓨鑼冨洿鍐�", DateTime.Now.ToString("yyyy-MM-dd"));
- }
- }
- }
- }
+ #endregion
}
}
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.resx b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.resx
index 1f666f2..415c086 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.resx
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.resx
@@ -117,6 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="timer1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </metadata>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.application b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.application
index c926fda..bc102b7 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>6Ozw/ggHd9/wd4Zabhtbzo+CeMK+UG9XwMXV7FIz6TA=</dsig:DigestValue>
+ <dsig:DigestValue>4salRRLutbYVEwBIld53KdgMzG4RXfLlDgOP78cOjNQ=</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 bb13632..641cbb1 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 8072027..9b66343 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe.manifest
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe.manifest
@@ -54,14 +54,14 @@
</dependentAssembly>
</dependency>
<dependency>
- <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WFormSynchronizeData_SMR.exe" size="30640">
+ <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WFormSynchronizeData_SMR.exe" size="42928">
<assemblyIdentity name="WFormSynchronizeData_SMR" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
- <dsig:DigestValue>H17qo3w/+fnJNc17W8kSLA8gtPPAG7bmuYM3ML2iCfo=</dsig:DigestValue>
+ <dsig:DigestValue>ZQvh+XZwVQ8IYRD15oMvUM4C2RMjfiUDMLMdK3p9EAA=</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 779b85e..fb9725b 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 583b591..f4ce054 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 1e25d28..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 c926fda..bc102b7 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>6Ozw/ggHd9/wd4Zabhtbzo+CeMK+UG9XwMXV7FIz6TA=</dsig:DigestValue>
+ <dsig:DigestValue>4salRRLutbYVEwBIld53KdgMzG4RXfLlDgOP78cOjNQ=</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
index 25174d5..b00b3cc 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.AssemblyReference.cache
+++ 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.GenerateResource.cache b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.GenerateResource.cache
index fd3a1a5..a0fe7b3 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 bb13632..641cbb1 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 8072027..9b66343 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe.manifest
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe.manifest
@@ -54,14 +54,14 @@
</dependentAssembly>
</dependency>
<dependency>
- <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WFormSynchronizeData_SMR.exe" size="30640">
+ <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WFormSynchronizeData_SMR.exe" size="42928">
<assemblyIdentity name="WFormSynchronizeData_SMR" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
- <dsig:DigestValue>H17qo3w/+fnJNc17W8kSLA8gtPPAG7bmuYM3ML2iCfo=</dsig:DigestValue>
+ <dsig:DigestValue>ZQvh+XZwVQ8IYRD15oMvUM4C2RMjfiUDMLMdK3p9EAA=</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 779b85e..fb9725b 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