From 7bfb447cbba9524639300a74b0b0a86b40176e63 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 11 四月 2025 14:35:06 +0800
Subject: [PATCH] 注释优化
---
WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo | 0
WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.cs | 56 +++++++++++++++---
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.pdb | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/Program.cs | 2
WFormSynchronizeData_SMR/WFormReadData_SMR/JZ_ReadDate.cs | 5 +
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCoordinateExcelFrom.cs | 7 ++
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.cs | 26 +++++++-
WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/DesignTimeResolveAssemblyReferences.cache | 0
WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.FileListAbsolute.txt | 1
WFormSynchronizeData_SMR/WFormReadData_SMR/ZZ_GlueWeigh.cs | 18 ++++--
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs | 18 ++++++
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.FileListAbsolute.txt | 1
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs | 36 ++++++++++-
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.exe | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug.rar | 0
WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.AssemblyReference.cache | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.AssemblyReference.cache | 0
19 files changed, 144 insertions(+), 26 deletions(-)
diff --git a/WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo b/WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo
index e1d9dc0..d446481 100644
--- a/WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo
+++ b/WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo
Binary files differ
diff --git a/WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.cs b/WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.cs
index d659723..2e335ad 100644
--- a/WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.cs
+++ b/WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.cs
@@ -265,6 +265,7 @@
if (dr == DialogResult.Yes) {
string Url = DBHelper.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "Config/SQLAPI.config", "sUrl");
+ //閫氳繃鎺ュ彛 鑾峰彇token
JsonResult jsonResult = await FindAccessToken(Url);
string EquipFile = this.cmbEquipFile.Text;
@@ -290,6 +291,7 @@
try
{
+ //鑾峰彇鎵�鏈夎澶囨暟鎹�
JsonEquipmentData jsonResult =await FindDeviceList(url, token);
if (jsonResult.code != "0")
@@ -300,7 +302,7 @@
else
{
string nos = "";
- //鑾峰彇鍘昏澶囩紪鐮�
+ //鑾峰彇璁惧缂栫爜
for (int i = 0; i < jsonResult.data.Count; i++)
{
if (jsonResult.data[i].no == this.cmbEquipFile.SelectedValue.ToString())
@@ -308,8 +310,11 @@
nos = jsonResult.data[i].no;
}
}
+ //寮�濮嬫椂闂�
string HBegin = this.txtBegin.Text;
+ //缁撴潫鏃堕棿
string HEnd = this.txtEnd.Text;
+ //鑾峰彇涓嶈壇鏁帮紝鍚堟暟鏁帮紝鍙枒鏁� 鎬绘暟
jsonResult = await FindDevicePropCalc(url, token, nos, HBegin, HEnd);
if (jsonResult.code != "0")
{
@@ -405,9 +410,12 @@
decimal HUpLimit = 0;
decimal HDownLimit = 0;
+ //鍒嗘瀽鏂规硶 涓哄畾閲忓垎鏋�
if (HAnalysisMethod == "2")
{
+ //鑾峰彇涓婇檺
HUpLimit = decimal.Parse(dataSet.Tables[0].Rows[i]["HTargetVal"].ToString()) + decimal.Parse(dataSet.Tables[0].Rows[i]["HUpLimit"].ToString());
+ //鑾峰彇涓嬮檺
HDownLimit = decimal.Parse(dataSet.Tables[0].Rows[i]["HTargetVal"].ToString()) + decimal.Parse(dataSet.Tables[0].Rows[i]["HDownLimit"].ToString());
}
@@ -429,16 +437,19 @@
break;
}
//SRM@101.2@VEN00005@CGDD000167@1.02.002.002@20231129@1000
+ //鍒ゆ柇妫�楠岄」鐩殑浠ｇ爜 璺熷垪鍚嶆槸鍚︿竴鑷�
if (dataSet.Tables[0].Rows[i]["HQCCheckItemNumber"].ToString().Contains(HQCCheckItemName))
{
for (int k = 0; k < dt.Rows.Count; k++)
{
-
+ //鍙彇鏃堕棿鑼冨洿鍐呯殑鏁版嵁
if (DateTime.Parse(dt.Rows[k]["HDate"].ToString()) >= DateTime.Parse(HBegin) && DateTime.Parse(dt.Rows[k]["HDate"].ToString()) <= DateTime.Parse(HEnd))
{
+ //鑾峰彇妫�楠屽��
decimal HInSpectValue = decimal.Parse(dt.Rows[k][dt.Columns[j].ColumnName].ToString());
-
+ //榛樿鍊肩粨璁轰负鍚堟牸
int HInSpectResult = 1;
+ //瀹氶噺鍒嗘瀽 杩涜鍒ゆ柇鏄惁婊¤冻涓婁笅闄�
if (HAnalysisMethod == "2")
{
HInSpectResult = (HInSpectValue > HUpLimit || HDownLimit > HInSpectValue) ? 0 : 1;
@@ -448,7 +459,7 @@
HInSpectResult = int.Parse(HInSpectValue.ToString());
}
-
+ //濡傛灉褰撳墠缁撹涓哄悎鏍� 骞朵笖鍘嗗彶缁撹涔熸槸鍚堟牸 鍒欑户缁繚鎸佸悎鏍�
if (HInSpectResult == 1 && HLastResult != 0)
{
HLastResult = 1;
@@ -486,7 +497,7 @@
",0,0,'',0,'','" + dataSet.Tables[0].Rows[i]["HTargetVal"].ToString() + "'" +
",'" + dataSet.Tables[0].Rows[i]["HUpLimit"].ToString() + "','" + dataSet.Tables[0].Rows[i]["HDownLimit"].ToString() + "','','',0,'" + HAnalysisMethod + "'," + dataSet.Tables[0].Rows[i]["HInspectInstruMentID"].ToString() + ",'" + HLastResult + "'" +
") ");
-
+ //濡傛灉褰撳墠缁撹涓哄悎鏍� 骞朵笖鍘嗗彶缁撹涔熸槸鍚堟牸 鍒欑户缁繚鎸佸悎鏍�
if (HLastResult == 1 && HLastResults != 0)
{
HLastResults = 1;
@@ -924,6 +935,7 @@
//TimeDate = "2025-02-10 13:10:50";
//time = "2025-02-10 13:11:50";
+ //鑾峰彇鎵�鏈夎澶囨暟鎹�
JsonEquipmentData jsonResult = await FindDeviceList(Url, token);
if (jsonResult.code != "0")
{
@@ -932,7 +944,7 @@
else {
string nos = "";
- //鑾峰彇鍘昏澶囩紪鐮�
+ //鑾峰彇璁惧缂栫爜
for (int i = 0; i < jsonResult.data.Count; i++)
{
nos += jsonResult.data[i].no + ",";
@@ -946,21 +958,32 @@
//}
}
nos = nos.Substring(0, nos.Length - 1);
+ //鑾峰彇鍙傛暟 鑾峰彇姣忎釜璁惧瀵瑰簲鐨勬墍鏈夊弬鏁�
JsonEquipmentData jsonEquipment = await FindAllDevicePropsDetailByTimeRange(Url, token, nos, TimeDate, time);
var JsonData = "{\"data\":[";
CustomWriteLog("01" , DateTime.Now.ToString("yyyy-MM-dd"));
+ //閫氳繃姣忎釜璁惧杩涜寰幆璧嬪��
for (int i = 0; i < jsonEquipment.data.Count; i++)
{
+ //鑾峰彇璁惧瀵瑰簲鐨勭紪鐮� 鍒ゆ柇缂栫爜鏄惁婊¤冻涓鸿灪姣嶅帇瑁呰澶�
if (jsonEquipment.data[i].deviceNo.Contains("CMR-ZZ-SE-"))
{
+ //寰幆 铻烘瘝鍘嬭璁惧瀵瑰簲鐨勬墍鏈夊伐鑹哄弬鏁�
for (int j = 0; j < jsonEquipment.data[i].props.Count; j++)
{
+ //寰幆 姣忎釜鍙傛暟瀵瑰簲鐨勬墍鏈夋暟鎹�
for (int k = 0; k < jsonEquipment.data[i].props[j].datas.Count; k++)
{
+ //鏃ュ織
CustomWriteLog("1-" + k + ":" + jsonEquipment.data[i].props[j].datas[k].value, DateTime.Now.ToString("yyyy-MM-dd"));
+
+ //鑾峰彇鍙傛暟鐨勭被鍨�
valueData value = JsonConvert.DeserializeObject<valueData>(jsonEquipment.data[i].props[j].datas[k].value);
+
+ //鏃ュ織
CustomWriteLog("2", DateTime.Now.ToString("yyyy-MM-dd"));
+
if (value.type == "鑹搧")
{
JsonData += "{\"HDate\":\"" + jsonEquipment.data[i].props[j].datas[k].createTime + "\",\"HTechParamName\":\"铻烘瘝鏄惁鍑稿嚭\",\"HResult\":\"OK\",\"HCount\":1,\"HSourceCode\":\"" + jsonEquipment.data[i].deviceNo + "\"},";
@@ -990,14 +1013,17 @@
}
}
else {
+ //寰幆 铻烘瘝鍘嬭璁惧瀵瑰簲鐨勬墍鏈夊伐鑹哄弬鏁�
for (int j = 0; j < jsonEquipment.data[i].props.Count; j++)
{
+ //寰幆 姣忎釜鍙傛暟瀵瑰簲鐨勬墍鏈夋暟鎹�
for (int k = 0; k < jsonEquipment.data[i].props[j].datas.Count; k++)
{
JsonData += "{\"HDate\":\"" + jsonEquipment.data[i].props[j].datas[k].createTime + "\",\"HTechParamName\":\"" + jsonEquipment.data[i].props[j].propName + "\",\"HResult\":\""+ jsonEquipment.data[i].props[j].datas[k].value + "\",\"HCount\":1,\"HSourceCode\":\"" + jsonEquipment.data[i].deviceNo + "\"},";
}
}
+ //鑾峰彇璁惧鏃堕棿娈典骇閲�
JsonEquipmentData data = await FindProdByNosAndTime(Url, token, jsonEquipment.data[i].deviceNo, TimeDate, time);
for (int j = 0; j < data.data.Count; j++)
@@ -1009,7 +1035,9 @@
}
CustomWriteLog("02", DateTime.Now.ToString("yyyy-MM-dd"));
- var EquipmentStaus = await FindDeviceStatusByNos(Url, token, nos);
+
+ //鑾峰彇璁惧杩愯鐘舵��
+ var EquipmentStaus = await FindDeviceStatusByNos(Url, token, nos);
for (int i = 0; i < EquipmentStaus.data.Count; i++)
{
@@ -1078,7 +1106,7 @@
}
}
-
+ //鏌ヨ褰撳墠寮�宸ョ殑璁惧 鑾峰彇瀵瑰簲鐨勭墿鏂欎俊鎭�
DataSet datable = oCN.RunProcReturn(@"select m.HNumber,eq.HEquipFileNo from Sc_ICMOBillStatus_Tmp a
inner join Gy_EquipFileBillMain eq on a.HSourceID = eq.HSourceID
inner join Gy_Material m on a.HMaterID = m.HItemID
@@ -1096,8 +1124,11 @@
}
CustomWriteLog("03", DateTime.Now.ToString("yyyy-MM-dd"));
+
JsonData = JsonData.Substring(0, JsonData.Length - 1);
JsonData += "]}";
+
+ //淇濆瓨鏁版嵁
DataSave(JsonData);
if (TimeDate != "")
{
@@ -1139,6 +1170,8 @@
JsonResult jsonResult = await getUrl(urls, formData);
string time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
string token = jsonResult.data.token;
+
+ //鑾峰彇鎵�鏈夌殑璁惧鏁版嵁
JsonEquipmentData jsonEquipment = await FindDeviceList(Url, token);
if (jsonEquipment.code != "0")
@@ -1164,10 +1197,12 @@
//this.Time_CLHB.Enabled = false;
+ //鏌ヨ寮�宸ョ殑璁惧淇℃伅 浠ュ強 鏌ヨ褰撳ぉ璁惧瀵瑰簲鐨勫紑宸ユ椂闂� 鍜屽畬宸ユ椂闂�
DataSet ds = oCN.RunProcReturn("exec h_p_Sc_TimeICMOReporList '" + nos + "'", "h_p_Sc_TimeICMOReporList");
if (ds.Tables[0].Rows.Count > 0)
{
+ //鏍规嵁褰撳ぉ鍙紑宸ユ病鏈夊畬宸ュ搴旂殑浜ч噺鏁版嵁 鐢熸垚浜ч噺姹囨姤鍗�
DataTable dt = ds.Tables[0];
for (int i = 0; i < dt.Rows.Count; i++)
{
@@ -1177,12 +1212,14 @@
string HEndDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
jsonEquipment = await FindProdByNosAndTime(Url, token, nos, HBegDate, HEndDate);
if (decimal.Parse(jsonEquipment.data[0].prod) > 0) {
+ //鐢熸垚浜ч噺姹囨姤鍗�
oCN.RunProc("exec h_p_Sc_AddTimeICMORepor " + HICMInterID + "," + jsonEquipment.data[0].prod+",'"+ HEndDate + "'");
}
}
}
if (ds.Tables[1].Rows.Count > 0)
- {
+ {
+ //鏍规嵁褰撳ぉ寮�宸ュ苟涓斿畬宸ュ搴旂殑浜ч噺鏁版嵁 鐢熸垚浜ч噺姹囨姤鍗�
DataTable dt = ds.Tables[1];
for (int i = 0; i < dt.Rows.Count; i++)
{
@@ -1193,6 +1230,7 @@
jsonEquipment = await FindProdByNosAndTime(Url, token, nos, HBegDate, HEndDate);
if (decimal.Parse(jsonEquipment.data[0].prod) > 0)
{
+ //鐢熸垚浜ч噺姹囨姤鍗�
oCN.RunProc("exec h_p_Sc_AddTimeICMORepor " + HICMInterID + "," + jsonEquipment.data[0].prod + ",'" + HEndDate + "'");
}
}
diff --git a/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index 92a29bb..89c2202 100644
--- a/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
diff --git a/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.AssemblyReference.cache b/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..6ff0f40
--- /dev/null
+++ b/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.AssemblyReference.cache
Binary files differ
diff --git a/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.FileListAbsolute.txt b/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.FileListAbsolute.txt
index 7b0d11b..e9a5f1c 100644
--- a/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.FileListAbsolute.txt
+++ b/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.FileListAbsolute.txt
@@ -10,3 +10,4 @@
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\EquipmentCollectionForm\obj\Debug\EquipmentCollectionForm.csproj.CopyComplete
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\EquipmentCollectionForm\obj\Debug\EquipmentCollectionForm.exe
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\EquipmentCollectionForm\obj\Debug\EquipmentCollectionForm.pdb
+E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\EquipmentCollectionForm\obj\Debug\EquipmentCollectionForm.csproj.AssemblyReference.cache
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/JZ_ReadDate.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/JZ_ReadDate.cs
index 36f2a2a..dcbadcf 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/JZ_ReadDate.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/JZ_ReadDate.cs
@@ -208,6 +208,7 @@
dataTable.Columns.Clear();
dataTable.Rows.Clear();
+ //鎶婅幏鍙栫殑鏁版嵁 杩涜鏁版嵁鏁寸悊 鍗曚綅涓嶄竴鏍风殑杩涜鎹㈢畻
for (int i = 0; i < ds.Tables.Count; i++)
{
DataTable dt = ds.Tables[i];
@@ -226,6 +227,7 @@
}
}
+ //瀛樺偍鏁版嵁鍒� dataTable
string[] str = { "Ls(uH)_10kHz", "Ls(uH)_100kHz", "Z(惟)_600kHz", "Ls(uH)_1MHz", "Ls(uH)_2MHz", "Z(惟)_2MHz", "Z(惟)_1MHz", "Z(惟)_10MHz", "Z(惟)_100kHz" };
for (int o = 0; o < str.Length; o++)
{
@@ -306,6 +308,7 @@
{
string HProcID = this.cmbPro.SelectedValue.ToString();
//淇敼鏄湪鍝釜璁惧涓婅繘琛岀殑鏁版嵁閲囬泦 men.HNumber CMR-E-026 LMJC 娴告笉 閾佽姱妫�娴� 璁惧
+ //鏌ヨ褰撳墠娴佽浆鍗� 褰撳墠宸ュ簭 鏈夋病鏈夊搴旂殑妫�楠屾柟妗�
DataSet dataSet = oCN.RunProcReturn(@"select b.HAnalysisMethod,b.HInspectInstruMentID,a.HInterID HQCSchemeID,b.HQCCheckItemID, ch.HNumber HQCCheckItemNumber,m.HNumber,HUpLimit,HDownLimit,HTargetVal
from Sc_ProcessExchangeBillMain pr with(nolock)
inner join Gy_QCCheckProjectMain a with(nolock) on pr.HMaterID=a.HMaterID and a.HProcID="+ HProcID + @"
@@ -318,6 +321,7 @@
//淇濆瓨鏁版嵁
if (dataSet.Tables[0].Rows.Count > 0)
{
+ //鍒ゆ柇鏁版嵁鏈夋病鏈夋淳宸�
DataSet ds = oCN.RunProcReturn(@"select staus.HSourceID,a.HICMOInterID,a.HICMOEntryID,a.HICMOBillNo,a.HPlanQty,a.HInterID HProcExchInterID,
staus.HSourceEntryID HProcExchEntryID,a.HBillNo HProcExchBillNo,a.HQty,a.HMaterID,staus.HProcID
from Sc_ProcessExchangeBillMain a with(nolock)
@@ -414,6 +418,7 @@
HInSpectResult = (HInSpectValue > HUpLimit || HDownLimit > HInSpectValue) ? 2 : 1;
}
}
+ //鏃ュ織
DBHelper.CustomWriteLog("Insert into QC_ProcessCheckBillSub " +
" (HInterID,HBillNo_bak,HEntryID,HSNO,HCloseMan" +
",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/Program.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/Program.cs
index 3a9bbdf..ed1d2e9 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/Program.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/Program.cs
@@ -16,7 +16,7 @@
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- Application.Run(new ReadyDataForm());
+ Application.Run(new ReadCSV());
}
}
}
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs
index e6ca6c0..76d79ab 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs
@@ -200,6 +200,7 @@
//string csv_file_path_Read = $@"D:\DATA SAVE\{Year}\{Year + Month}\{Year + Month + Day}\{HBath}\鏁版嵁淇濆瓨_MES璇诲彇.csv";
+ //澶嶅埗涓�浠芥枃浠�
File.Copy(csv_file_path, csv_file_path_Read, true);
string contents = File.ReadAllText(csv_file_path_Read, Encoding.GetEncoding("gb2312"));
@@ -253,6 +254,7 @@
string HProcNumber = "005"; //005
int HFlag = 0;
//string HEmpCode = "";
+ //鍒ゆ柇鏉＄爜涓嶄负绌�
if (HBadCodeSN != "")
{
string HType = "";
@@ -270,6 +272,7 @@
ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",褰撳墠鏃ユ湡:" + DateTime.Now.ToString() + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
list.Add(HBarCode);
+ //鏂板宸ヨ壓鍙傛暟
for (int i = 0; i < dt.Columns.Count; i++)
{
if (dt.Columns[i].ColumnName.Contains("Hz"))
@@ -277,6 +280,7 @@
HType = dt.Columns[i].ColumnName;
string HCount_1 = item[HType].ToString();
+ //鏌ヨ褰撳ぉ鏉＄爜 瀵瑰簲鐨勫伐鑹哄弬鏁版湁娌℃湁鎻掑叆鍒伴噷闈� 濡傛灉娌℃湁鍒欐柊澧�
DataSet ds1 = oCN.RunProcReturn(@"select * from Sb_EquipMentCollectionTechParam_SN where HBarCode='" + HBarCode + "' and HType='" + HType + "'", "Sb_EquipMentCollectionTechParam_SN");
if (ds1.Tables[0].Rows.Count == 0)
@@ -409,6 +413,7 @@
}
else
{
+ //閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
time = DateTime.Now;
@@ -432,6 +437,7 @@
AllProcessExchangeHProcExchBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
}
else {
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
time = DateTime.Now;
@@ -449,6 +455,8 @@
HProcExchInterID = AllProcessExchangeHProcExchInterID;
DataSet ds1;
+
+ //绗竴娆℃祦杞崱+宸ュ簭鍜屽悗闈㈢殑鍋氬姣� 濡傛灉鏄悓涓�涓祦杞崱灏变笉杩涜鍒ゆ柇
if ((HProcExchBillNo + HProcNumber) != AllSNBarcodeProcCtrl) {
//鏌ヨ宸ュ簭
ds1 = oCN.RunProcReturn(@"SELECT HItemID,HName FROM Gy_Process WHERE HNumber='" + HProcNumber + "'", "Gy_Process");
@@ -470,12 +478,15 @@
string HProcID = AllHProcID;
string HProName = AllHProName;
+ //绗竴娆℃祦杞崱+宸ュ簭鍜屽悗闈㈢殑鍋氬姣� 濡傛灉鏄悓涓�涓祦杞崱灏变笉杩涜鍒ゆ柇
if ((HProcExchBillNo + HProcNumber) == AllSNBarcodeProcCtrl)
{
+ //鍒ゆ柇 褰撳墠宸ュ簭 鏉＄爜 鐨勪笂涓�閬撳伐搴忔湁娌℃湁杩囩珯
ds1 = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + HBarCode + "'," + HProcID, "h_v_Gy_QualifiedRecordsList");
if (ds1.Tables[0].Rows.Count == 0)
{
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
time = DateTime.Now;
@@ -488,6 +499,7 @@
}
else if (ds1.Tables[0].Rows[0]["HBack"].ToString() == "2")
{
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
time = DateTime.Now;
@@ -505,15 +517,19 @@
where ou.HProcExchInterID={HProcExchInterID} and ou.HProcID={AllHProcID}
group by ou.HProcExchInterID,ou.HProcExchEntryID,ou.HQty", "Sc_StationOutBillMain");
+ //鑾峰彇娴佽浆鍗℃暟閲�
double hqtyOut = AllHQty;
+ //娴佽浆鍗℃暟閲�-鍑虹珯鍗曟暟閲忓ぇ浜�0
if (ds1.Tables[0].Rows.Count > 0)
{
hqtyOut = double.Parse(ds1.Tables[0].Rows[0][0].ToString());
}
+ //濡傛灉鏁伴噺<0 鍒欎唬琛ㄥ嚭绔欏崟鏁伴噺瓒呭嚭娴佽浆鍗℃暟閲�
if (hqtyOut <= 0)
{
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
time = DateTime.Now;
@@ -527,6 +543,7 @@
//鎷嶇収宸ュ簭闄ゅ
if (HProcNumber != "013") {
//澧炲姞浜х嚎缁勮杩芥函鍗�
+ //鏌ヨ褰撳墠娴佽浆鍗″搴旂殑宸ュ簭鏈夋病鏈夐厤浠朵俊鎭�,濡傛灉鏈� 鍒欏垽鏂厤浠跺崟鐨勬暟閲忔槸鍚︿负0
DataSet dataSet = oCN.RunProcReturn("exec h_p_Gy_BarCodeBillBomList '" + HProcExchBillNo + "'," + HProcID, "h_p_Gy_BarCodeBillBomList");
if (dataSet.Tables[0].Rows.Count > 0)
{
@@ -538,6 +555,7 @@
string HMaterBarCode = dataSet.Tables[0].Rows[i]["HBarCode"].ToString();
if (SYHQty == 0)
{
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
time = DateTime.Now;
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCoordinateExcelFrom.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCoordinateExcelFrom.cs
index d6f430a..04a86cf 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCoordinateExcelFrom.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCoordinateExcelFrom.cs
@@ -350,7 +350,8 @@
for (int i = 0; i < ds.Tables.Count; i++)
{
- //淇敼鏄湪鍝釜璁惧涓婅繘琛岀殑鏁版嵁閲囬泦 b.HInspectInstruMentID=1 涓夊潗鏍�1 杞粨浠�2
+ //淇敼 鏄湪鍝釜璁惧涓婅繘琛岀殑鏁版嵁閲囬泦 b.HInspectInstruMentID=1 涓夊潗鏍�1 杞粨浠�2
+ //鏌ヨ褰撳墠娴佽浆鍗� 浠ュ強 宸ュ簭 瀵瑰簲鐨勬楠屾柟妗堟槸鍚﹀瓨鍦�
DataSet dataSet = oCN.RunProcReturn(@"select b.HInspectInstruMentID,a.HInterID HQCSchemeID,b.HQCCheckItemID, ch.HNumber HQCCheckItemNumber,m.HNumber,HUpLimit,HDownLimit,HTargetVal
from Sc_ProcessExchangeBillMain pr with(nolock)
inner join Gy_QCCheckProjectMain a with(nolock) on pr.HMaterID=a.HMaterID
@@ -450,6 +451,7 @@
long HInterID = oCN.CreateBillID_Prod(BillType, ref sExeReturnInfo);
string HBillNo = oCN.CreateBillCode(BillType, ref sExeReturnInfo, true);
+ //鍒ゆ柇褰撳墠娴佽浆鍗� 褰撳墠宸ュ簭 鏄惁宸茬粡娲捐繃宸�
DataSet ds = oCN.RunProcReturn(@"select staus.HSourceID,a.HICMOInterID,a.HICMOEntryID,a.HICMOBillNo,a.HPlanQty,a.HInterID HProcExchInterID,
staus.HSourceEntryID HProcExchEntryID,a.HBillNo HProcExchBillNo,a.HQty,a.HMaterID
from Sc_ProcessExchangeBillMain a with(nolock)
@@ -558,6 +560,7 @@
long HInterID = oCN.CreateBillID_Prod(BillType, ref sExeReturnInfo);
string HBillNo = oCN.CreateBillCode(BillType, ref sExeReturnInfo, true);
+ // 鍒ゆ柇褰撳墠娴佽浆鍗� 褰撳墠宸ュ簭 鏄惁宸茬粡娲捐繃宸�
DataSet ds = oCN.RunProcReturn(@"select staus.HSourceID,a.HICMOInterID,a.HICMOEntryID,a.HICMOBillNo,a.HPlanQty,a.HInterID HProcExchInterID,
staus.HSourceEntryID HProcExchEntryID,a.HBillNo HProcExchBillNo,a.HQty,a.HMaterID
from Sc_ProcessExchangeBillMain a with(nolock)
@@ -659,6 +662,7 @@
long HInterID = oCN.CreateBillID_Prod(BillType, ref sExeReturnInfo);
string HBillNo = oCN.CreateBillCode(BillType, ref sExeReturnInfo, true);
+ // 鍒ゆ柇褰撳墠娴佽浆鍗� 褰撳墠宸ュ簭 鏄惁宸茬粡娲捐繃宸�
DataSet ds = oCN.RunProcReturn(@"select staus.HSourceID,a.HICMOInterID,a.HICMOEntryID,a.HICMOBillNo,a.HPlanQty,a.HInterID HProcExchInterID,
staus.HSourceEntryID HProcExchEntryID,a.HBillNo HProcExchBillNo,a.HQty,a.HMaterID,staus.HProcID
from Sc_ProcessExchangeBillMain a with(nolock)
@@ -785,6 +789,7 @@
{
string cmbPro = this.cmbPro.SelectedValue.ToString();
+ //鏌ヨ鍙栨牱鍗曟暟鎹�
DataSet ds = oCN.RunProcReturn("select * from h_v_QC_TakeSampleCheckBillList where 鍗曟嵁鍙�='" + HBillNo + "' and HProcID='" + cmbPro + "'", "h_v_QC_TakeSampleCheckBillList");
if (ds.Tables[0].Rows.Count == 0)
{
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs
index 5b24226..c6d8d13 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs
@@ -195,6 +195,7 @@
public void Xt_ReadText(string FileData)
{
+ //鑾峰彇鏂囨湰鎵�鏈夋暟鎹�
FileData = FileData.Substring(0, FileData.Length - 1);
FileData = "[" + FileData + "]";
//JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
@@ -239,8 +240,10 @@
DataSet dataSet;
string HProjectNum = HBarCode.Substring(18, 8);
+ //閫氳繃鎴彇椤圭洰鍙� 濡傛灉绗竴鏉℃暟鎹殑椤圭洰鍙疯窡鍚庨潰鐨勪竴鏍� 灏变笉杩涜鍒ゆ柇
if (HBarCode.Contains(AllProcessExchange)==false) {
+ //鍒ゆ柇娴佽浆鍗℃槸鍚﹀瓨鍦�
dataSet = oCN.RunProcReturn("select HInterID,HBillNo from Sc_ProcessExchangeBillMain where HProjectNum='" + HProjectNum + "-1'", "Sc_ProcessExchangeBillMain");
if (dataSet.Tables[0].Rows.Count > 0) {
AllProcessExchangeHProcExchBillNo = dataSet.Tables[0].Rows[0]["HBillNo"].ToString();
@@ -248,10 +251,12 @@
AllProcessExchange = HProjectNum;
}
}
-
+ //鍒ゆ柇鎴彇鐨勯」鐩彿 璺熻祴鍊肩殑椤圭洰鍙锋槸鍚︿竴鏍� 闇�瑕佸厛婊¤冻涓婇潰鐨勬潯浠�
if (AllProcessExchange == HProjectNum)
{
+ //閫氳繃鎴彇椤圭洰鍙� 濡傛灉绗竴鏉℃暟鎹殑椤圭洰鍙疯窡鍚庨潰鐨勪竴鏍� 灏变笉杩涜鍒ゆ柇
if (HBarCode.Contains(AllBeginWork) == false) {
+ //鍒ゆ柇褰撳墠娴佽浆鍗″搴旂殑宸ュ簭鏁版嵁鏄惁寮�宸�
dataSet = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + AllProcessExchangeHProcExchBillNo + "' and HICMOStatus<>'0'", "Sc_ICMOBillStatus_Tmp");
if (dataSet.Tables[0].Rows.Count > 0)
@@ -260,10 +265,12 @@
}
}
+ //婊¤冻涓婅堪鏉′欢 骞朵笖椤圭洰鍙� 鍜岃祴鍊奸」鐩彿涓�鏍� 鍒欒繘琛屾柊澧�
if (AllBeginWork == HProjectNum)
{
if (Get_AllowLoadData(HBarCode, HProcNumber, flag_1, AllProcessExchangeHProcExchBillNo, AllProcessExchangeHProcExchInterID, out flag_2))
{
+ //鏂板鏉＄爜鏁版嵁
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);
@@ -369,6 +376,7 @@
//鏍规嵁鏉＄爜 鍒ゆ柇鏄惁淇濆瓨
public bool Get_AllowLoadData(string HBarCode, string HProcNumber, bool flag_1,string HProcExchBillNo,string HProcExchInterID, out bool flag_2)
{
+ //鍒ゆ柇鏉＄爜鐨勯暱搴�
if (HBarCode.Length != 29 && HBarCode.Length != 50)
{
flag_2 = false;
@@ -392,6 +400,7 @@
}
else
{
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
time = DateTime.Now;
@@ -404,7 +413,8 @@
}
}
DataSet ds1;
-
+
+ //绗竴娆℃祦杞崱+宸ュ簭鍜屽悗闈㈢殑鍋氬姣� 濡傛灉鏄悓涓�涓祦杞崱灏变笉杩涜鍒ゆ柇
if ((HProcExchBillNo + HProcNumber) != AllSNBarcodeProcCtrl) {
//鏌ヨ宸ュ簭
@@ -425,14 +435,16 @@
AllSNBarcodeProcCtrl = HProcExchBillNo + HProcNumber;
}
-
+ //绗竴娆℃祦杞崱+宸ュ簭鍜屽悗闈㈢殑鍋氬姣� 濡傛灉鏄悓涓�涓祦杞崱灏变笉杩涜鍒ゆ柇
if ((HProcExchBillNo + HProcNumber) == AllSNBarcodeProcCtrl)
{
//杩囩珯鎺у埗
+ //鍒ゆ柇褰撳墠宸ュ簭瀵瑰簲鐨勬潯鐮佹槸鍚︿笂閬撳伐搴忚繃绔�
ds1 = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + HBarCode + "'," + AllHProcID, "h_p_Sc_SNBarcodeProcCtrl_S");
if (ds1.Tables[0].Rows.Count == 0)
{
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
time = DateTime.Now;
@@ -445,6 +457,7 @@
}
else if (ds1.Tables[0].Rows[0]["HBack"].ToString() == "2")
{
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
time = DateTime.Now;
@@ -461,14 +474,17 @@
ds1 = oCN.RunProcReturn($@"select ({AllHQty}-sum(isnull(ou.HQty,0))-sum(isnull(ou.HBadCount,0))) HQty from Sc_StationOutBillMain ou WITH(NOLOCK)
where ou.HProcExchInterID={HProcExchInterID} and ou.HProcID={AllHProcID}
group by ou.HProcExchInterID,ou.HProcExchEntryID,ou.HQty", "Sc_StationOutBillMain");
+
+ //鑾峰彇娴佽浆鍗℃暟閲�
double hqtyOut = AllHQty;
if (ds1.Tables[0].Rows.Count > 0) {
hqtyOut = double.Parse(ds1.Tables[0].Rows[0][0].ToString());
}
-
+ //娴佽浆鍗℃暟閲�-鍑虹珯鍗曟暟閲忓ぇ浜�0
if (hqtyOut <= 0)
{
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
time = DateTime.Now;
@@ -483,6 +499,7 @@
if (HProcNumber != "013")
{
//澧炲姞浜х嚎缁勮杩芥函鍗�
+ //鏌ヨ褰撳墠娴佽浆鍗″搴旂殑宸ュ簭鏈夋病鏈夐厤浠朵俊鎭�,濡傛灉鏈� 鍒欏垽鏂厤浠跺崟鐨勬暟閲忔槸鍚︿负0
DataSet dataSet = oCN.RunProcReturn("exec h_p_Gy_BarCodeBillBomList '" + HProcExchBillNo + "'," + AllHProcID, "h_p_Gy_BarCodeBillBomList");
if (dataSet.Tables[0].Rows.Count > 0)
{
@@ -494,6 +511,7 @@
string HMaterBarCode = dataSet.Tables[0].Rows[i]["HBarCode"].ToString();
if (SYHQty == 0)
{
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
time = DateTime.Now;
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ZZ_GlueWeigh.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ZZ_GlueWeigh.cs
index 6fd4a85..fcaae0a 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/ZZ_GlueWeigh.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ZZ_GlueWeigh.cs
@@ -73,6 +73,7 @@
}
}
+ //鏉″舰鐮佸洖杞�
private void txtLzk_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Enter)
@@ -123,13 +124,13 @@
private void ZZ_GlueWeigh_Load(object sender, EventArgs e)
{
this.cmbEquip.SelectedIndex = 0;
- this.cmbEquip.DropDownStyle = ComboBoxStyle.DropDownList;
+ this.cmbEquip.DropDownStyle = ComboBoxStyle.DropDownList;//鍙
- this.cmbPro.DropDownStyle = ComboBoxStyle.DropDownList;
- this.cmbJYSelect.DropDownStyle = ComboBoxStyle.DropDownList;
+ this.cmbPro.DropDownStyle = ComboBoxStyle.DropDownList;//鍙
+ this.cmbJYSelect.DropDownStyle = ComboBoxStyle.DropDownList;//鍙
this.cmbJYSelect.SelectedIndex = 0;
- this.txtHMakerNumber.ReadOnly = true;
- this.txtPcm.ReadOnly = true;
+ this.txtHMakerNumber.ReadOnly = true;//鍙
+ this.txtPcm.ReadOnly = true;//鍙
}
//鏌ヨ绉伴噸鐨勯噸閲�
@@ -156,6 +157,7 @@
break;
}
+ //鏌ヨ 椤堕儴鐐硅兌閲嶉噺 鍜� 搴曢儴鐐硅兌閲嶉噺 褰撳墠鏈�澶х殑鏁版嵁
DataSet ds = oCN.RunProcReturn(@"select top 1 HTechParamName,HResult,HCreateTime from Sb_EquipMentCollectionTechParam_Temp
where HSourceCode = '" + HNumber + @"' and HTechParamName = '椤堕儴鐐硅兌閲嶉噺' and HCreateTime in(
select max(HCreateTime) from Sb_EquipMentCollectionTechParam_Temp
@@ -175,6 +177,7 @@
if (ds.Tables[0].Rows.Count > 0)
{
+ //鑾峰彇 椤堕儴鐐硅兌閲嶉噺 鍜� 搴曢儴鐐硅兌閲嶉噺
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
string HTechParamName = ds.Tables[0].Rows[i]["HTechParamName"].ToString();
@@ -332,6 +335,7 @@
long HInterID = oCN.CreateBillID_Prod(BillType, ref sExeReturnInfo);
string HBillNo = oCN.CreateBillCode(BillType, ref sExeReturnInfo, true);
+ //鍒ゆ柇褰撳墠娴佽浆鍗″搴旂殑宸ュ簭鏈夋病鏈夊紑宸�
DataSet ds = oCN.RunProcReturn(@"select staus.HSourceID,a.HICMOInterID,a.HICMOEntryID,a.HICMOBillNo,a.HPlanQty,a.HInterID HProcExchInterID,
staus.HSourceEntryID HProcExchEntryID,a.HBillNo HProcExchBillNo,a.HQty,a.HMaterID
from Sc_ProcessExchangeBillMain a with(nolock)
@@ -376,7 +380,7 @@
{
HLastResults = 0;
}
-
+ //鏂板瀛愯〃
oCN.RunProc("Insert into QC_FirstPieceCheckBillSub " +
" (HInterID,HBillNo_bak,HEntryID,HCloseMan" +
",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
@@ -439,6 +443,7 @@
long HInterID = oCN.CreateBillID_Prod(BillType, ref sExeReturnInfo);
string HBillNo = oCN.CreateBillCode(BillType, ref sExeReturnInfo, true);
+ //鍒ゆ柇褰撳墠娴佽浆鍗″搴旂殑宸ュ簭鏈夋病鏈夊紑宸�
DataSet ds = oCN.RunProcReturn(@"select staus.HSourceID,a.HICMOInterID,a.HICMOEntryID,a.HICMOBillNo,a.HPlanQty,a.HInterID HProcExchInterID,
staus.HSourceEntryID HProcExchEntryID,a.HBillNo HProcExchBillNo,a.HQty,a.HMaterID
from Sc_ProcessExchangeBillMain a with(nolock)
@@ -538,6 +543,7 @@
long HInterID = oCN.CreateBillID_Prod(BillType, ref sExeReturnInfo);
string HBillNo = oCN.CreateBillCode(BillType, ref sExeReturnInfo, true);
+ //鍒ゆ柇褰撳墠娴佽浆鍗″搴旂殑宸ュ簭鏈夋病鏈夊紑宸�
DataSet ds = oCN.RunProcReturn(@"select staus.HSourceID,a.HICMOInterID,a.HICMOEntryID,a.HICMOBillNo,a.HPlanQty,a.HInterID HProcExchInterID,
staus.HSourceEntryID HProcExchEntryID,a.HBillNo HProcExchBillNo,a.HQty,a.HMaterID,staus.HProcID
from Sc_ProcessExchangeBillMain a with(nolock)
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug.rar b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug.rar
index 2be120c..d23779a 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 1b3cb5e..a035b27 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 6bbe306..da77e50 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/WFormReadData_SMR.csproj.AssemblyReference.cache b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..5e1cc79
--- /dev/null
+++ 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 3cf4311..e9c379d 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
@@ -36,3 +36,4 @@
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.exe b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.exe
index 1b3cb5e..a035b27 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 6bbe306..da77e50 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.pdb
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.pdb
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
index 0e1a7c0..0ce1777 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
@@ -29,6 +29,8 @@
timer.Start();
CustomWriteLog("1.璁℃椂鍣ㄥ紑濮�:"+timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+
+ //鏍规嵁鏃堕棿姝ｅ簭鎺掑簭鑾峰彇鍓�150鏉℃暟鎹�
DataTable list = oCN.RunProcReturn("select top 150 * from Sb_EquipMentCollection_SN WITH(NOLOCK) where HFlag=0 order by HCreateTime", "Sb_EquipMentCollection_SN").Tables[0];
//寰幆闆嗗悎
@@ -74,6 +76,9 @@
bool flag = false;
string HBadCodeSN = dic["HBarCode"].ToString();
HBadCodeSN = TM_ZH(HBadCodeSN);
+ //鍒ゆ柇褰撳ぉ鏉＄爜鏈夋病鏈夊瓨鍌ㄥ湪鏉＄爜琛ㄩ噷 濡傛灉娌℃湁 鍒欎繚瀛樻暟鎹� 骞惰繑鍥�0
+ //濡傛灉宸插瓨鍦� 鍒欒繑鍥� 1
+ //濡傛灉鏉′欢涓嶆弧瓒崇殑 鍒欒繑鍥� 2
int num = SNHBardCodeList(HBadCodeSN);
CustomWriteLog("2.2.鏉＄爜鐢熸垚:" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
@@ -94,18 +99,21 @@
//left join Gy_Process p WITH(NOLOCK) on a.HProcID=p.HItemID
//where p.HNumber='" + dic["HProcNumber"].ToString() + "' and sn.HBarCode='" + HBadCodeSN + "'", "Sc_StationOutBillSub_SN");
+ //鏌ヨ杩欎釜宸ュ簭瀵瑰簲鐨勬潯鐮� 鍑虹珯鍗曟槸鍚﹀凡缁忓瓨鍦�
DataSet ds1 = oCN.RunProcReturn(@"select a.HProcID from Sc_StationOutBillMain a WITH(NOLOCK)
inner join Sc_StationOutBillSub_SN sn WITH(NOLOCK) on a.HInterID=sn.HInterID
left join Gy_Process p WITH(NOLOCK) on a.HProcID=p.HItemID
where p.HNumber='" + dic["HProcNumber"].ToString() + "' and sn.HBarCode='" + HBadCodeSN + "'", "Sc_StationOutBillSub_SN");
-
+ //鍒ゆ柇鏉＄爜涔嬪墠鏄惁涓篘G 鍚屾椂 鍒ゆ柇鍑虹珯鍗曠殑鏉＄爜鏁版嵁鏄笉瀛樺湪
if (ds.Tables[0].Rows.Count > 0 && ds1.Tables[0].Rows.Count == 0)
{
+ //杩斾慨濂界殑鏉＄爜杩涜閲嶆柊杩囩珯淇濆瓨
flag = getOKOutBillAdd(dic, HBadCodeSN, "OK");
}
else
{
+ //鍑虹珯鍗曠殑鏉＄爜鏁版嵁鏄笉瀛樺湪 鍒欐柊澧�
if (ds1.Tables[0].Rows.Count > 0)
{
flag = true;
@@ -144,6 +152,9 @@
int num = 0;
string HBadCodeSN = dic["HBarCode"].ToString();
HBadCodeSN = TM_ZH(HBadCodeSN);
+ //鍒ゆ柇褰撳ぉ鏉＄爜鏈夋病鏈夊瓨鍌ㄥ湪鏉＄爜琛ㄩ噷 濡傛灉娌℃湁 鍒欎繚瀛樻暟鎹� 骞惰繑鍥�0
+ //濡傛灉宸插瓨鍦� 鍒欒繑鍥� 1
+ //濡傛灉鏉′欢涓嶆弧瓒崇殑 鍒欒繑鍥� 2
num = SNHBardCodeList(HBadCodeSN);
if (num == 0 || num == 1)
@@ -189,6 +200,7 @@
CustomWriteLog("2.1.2.缁戝畾娴佽浆鍗�:"+ HProcNumber+"----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+ //鏌ヨ鐢熶骇璧勬簮
ds = oCN.RunProcReturn("select * from Gy_Source WITH(NOLOCK) where HNumber='" + dic["HSourceCode"].ToString() + "' ", "Gy_Source");
long HSourceID = 0;
if (ds.Tables[0].Rows.Count != 0)
@@ -231,7 +243,7 @@
CustomWriteLog("2.1.5.鑾峰彇瀹㈡埛淇℃伅:" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
-
+ //鏍规嵁娴佽浆鍗″拰宸ュ簭 鏌ヨ鍑虹珯鍗曢渶瑕佷繚瀛樼殑淇℃伅
ds = oCN.RunProcReturn(@"select a.HWorkShopID,b.HProcNo,b.HProcID,a.HMaterID,a.HQty,a.HInterID,HEntryID,a.HICMOInterID,a.HICMOEntryID,a.HICMOBillNo,b.HCenterID from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
inner join Sc_ProcessExchangeBillSub b WITH(NOLOCK) on a.HInterID=b.HInterID
left join Gy_Process p WITH(NOLOCK) on b.HProcID=p.HItemID
@@ -310,6 +322,7 @@
CustomWriteLog("2.1.7缁欏瓧娈佃祴鍊� :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+ //鑾峰彇鐝
DataSet set= oCN.RunProcReturn("exec h_p_Gy_GetWorkShiftInfo " + HWorkShopID + "," + HCenterID, "h_p_Gy_GetWorkShiftInfo");
if (set.Tables[0].Rows.Count > 0) {
HShiftsID = int.Parse(set.Tables[0].Rows[0]["HInterID"].ToString());
@@ -339,6 +352,7 @@
CustomWriteLog("2.1.9鑾峰彇鏄惁鏈夊嚭绔欏崟 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+ //濡傛灉娌℃湁鍑虹珯鍗曞垯鏂板鍑虹珯鍗�
if (ds.Tables[0].Rows.Count != 0)
{
HInterID = long.Parse(ds.Tables[0].Rows[0]["HInterID"].ToString());
@@ -379,6 +393,8 @@
if (HResult == "OK")
{
CustomWriteLog("2.1.11 鏉＄爜鍙嶅啓 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+
+ //鏌ヨ 鍑虹珯鍗曞瓙琛� 鏉＄爜琛ㄧ殑鏁版嵁
ds = oCN.RunProcReturn("select * from Sc_StationOutBillSub_SN WITH(NOLOCK) where HInterID='" + HInterID + "' order by HEntryID desc", "Sc_StationOutBillSub_SN");
string HMakeTime = dic["HCreateTime"].ToString();
@@ -393,16 +409,19 @@
else if (HResult == "NG")
{
CustomWriteLog("2.1.13 涓嶅悎鏍煎弽鍐� :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+ //閫氳繃鏉＄爜鏌ヨ鐢熶骇璐ㄩ噺姹囨姤鍗曟暟鎹�
ds = oCN.RunProcReturn("select * from Sc_QualityReportBillSub WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "' order by HMakeDate desc", "Sc_QualityReportBillSub");
if (ds.Tables[0].Rows.Count > 0) {
string HBadDate = ds.Tables[0].Rows[0]["HMakeDate"].ToString();
-
+ //閫氳繃鏉＄爜鏌ヨ杩斾慨璁板綍鍗曠殑鏁版嵁
ds = oCN.RunProcReturn("select * from Sc_SourceLineRepairBillMain WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "' order by HMakeDate desc", "Sc_SourceLineRepairBillMain");
if (ds.Tables[0].Rows.Count > 0) {
string HRepairDate = ds.Tables[0].Rows[0]["HMakeDate"].ToString();
-
+ //鍒ゆ柇 鐢熶骇璐ㄩ噺姹囨姤鍗曠殑鍒涘缓鏃堕棿 鏄惁 灏忎簬 杩斾慨璁板綍鐨勫垱寤烘椂闂�
+ //姝ｅ父鎯呭喌鏄� 鍏堢敓鎴愮敓浜ц川閲忔眹鎶ュ崟 鐒跺悗鎵嶄細鍘昏繑淇�
+ //濡傛灉鏉＄爜鐢熸垚璐ㄩ噺姹囨姤鍗曠殑鏃堕棿 澶т簬杩斾慨璁板綍鐨勬椂闂� 鍒欒瘉鏄庤繖涓潯鐮佸睘浜庢祴璇曟潯鐮� 姝ｅ父 杩斾慨OK鐨勬墠浼氳繘鍏ヨ繖涓嚭绔欏崟淇濆瓨鏂规硶 涓嶄細杩涘叆NG
if (DateTime.Parse(HBadDate) < DateTime.Parse(HRepairDate)) {
//鍙嶅啓宸ュ簭鍑虹珯鍗曠殑涓嶈壇鏁伴噺
oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HWasterQty_Work+=1 where HInterID='" + HInterID + "'");
@@ -461,6 +480,7 @@
//澧炲姞浜х嚎缁勮杩芥函鍗�
+ //鏌ヨ娴佽浆鍗″拰宸ュ簭瀵瑰簲鐨勯厤浠朵俊鎭� 濡傛灉鏈� 鍒欐煡璇㈤厤浠剁殑鏁伴噺
DataSet dataSet = oCN.RunProcReturn("exec h_p_Gy_BarCodeBillBomList '" + HProcExchBillNo + "'," + HProcID, "h_p_Gy_BarCodeBillBomList");
CustomWriteLog("2.1.18 浜х嚎缁勮杩芥函鍗曟煡璇� :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
@@ -581,6 +601,7 @@
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 WITH(NOLOCK)
inner join Sc_ProcessExchangeBillSub b WITH(NOLOCK) on a.HInterID=b.HInterID
@@ -611,11 +632,13 @@
// return false;
//}
+ //鏌ヨ浜х嚎缁勮杩芥函鍗曠殑鏁版嵁 鑾峰彇鏃堕棿 鏍规嵁鏃堕棿鍒ゆ柇瀵瑰簲 鏄摢澶╁嚭绔欏崟鐨勬暟鎹�
ds = oCN.RunProcReturn("select HDate from Sc_AssemblyBillMain WITH(NOLOCK) where HMainSourceInterID=" + HProcExchInterID + " and HMainSourceEntryID=" + HProcExchEntryID, "Sc_AssemblyBillMain");
DateTime HDate=DateTime.Now;
//褰撲骇鍝佹病鏈夐厤浠剁殑鏃跺�� 鏌ヨ 涓嶈壇璁板綍
if (ds.Tables[0].Rows.Count == 0)
{
+ //鏌ヨ鐢熶骇璐ㄩ噺姹囨姤鍗曟暟鎹�
ds = oCN.RunProcReturn("select HMakeDate from Sc_QualityReportBillSub WITH(NOLOCK) where HProcExchInterID=" + HProcExchInterID + " and HProcExchEntryID=" + HProcExchEntryID+ " and HBarCode='" + HBadCodeSN + "'", "Sc_AssemblyBillMain");
HDate = DateTime.Parse(ds.Tables[0].Rows[0]["HMakeDate"].ToString());
}
@@ -686,7 +709,7 @@
try
{
-
+ //鏌ヨ鍑虹珯鍗曠殑淇℃伅 鏂逛究鍙傛暟淇濆瓨
DataSet ds = oCN.RunProcReturn(@"select a.HProcExchInterID,a.HProcExchEntryID,a.HProcExchBillNo,a.HProcID,p.HNumber from Sc_StationOutBillMain a WITH(NOLOCK)
left join Gy_Process p WITH(NOLOCK) on a.HProcID=p.HItemID where HInterID=" + HInterID + " and HBillNo='" + HBillNo + "'", "Sc_StationOutBillMain");
string HProcExchInterID = ds.Tables[0].Rows[0]["HProcExchInterID"].ToString();
@@ -696,6 +719,7 @@
string HProcNum = ds.Tables[0].Rows[0]["HNumber"].ToString();
//娉�:鍥犱负 缁勮 鎷嶇収 鏃堕棿闂撮殧姣旇緝鐭� 鎵�浠ョ洰鍓嶅彧鏄庣‘缁勮宸ュ簭鎵嶅彲浠ヤ繚瀛樺伐鑹哄弬鏁� 涔嬪悗濡傛灉鏈夊叾浠栧伐搴忕殑璇� 闇�瑕佸鍔犲伐搴忓瓧娈�
if (HProcID == "88"|| HProcNum=="005") {
+ //鏌ヨ宸ヨ壓鍙傛暟涓存椂琛� 鑾峰彇褰撳ぉ鏉＄爜瀵瑰簲鐨勫弬鏁�
ds = oCN.RunProcReturn(@"select s.HItemID HMouldID,t.HItemID HTechParamID,HCount,HCreateTime,a.HResult from Sb_EquipMentCollectionTechParam_SN a WITH(NOLOCK)
inner join Gy_Source s WITH(NOLOCK) on a.HSourceCode=s.HNumber
inner join Gy_TechnologyParameter t WITH(NOLOCK) on a.HType=t.HName
@@ -1014,6 +1038,8 @@
long HICMOInterID = 0;
long HICMOEntryID = 0;
string HICMOBillNo = "";
+
+ //鏍规嵁 鏉＄爜+宸ュ簭 鏌ヨ娴佽浆鍗′俊鎭�
ds = oCN.RunProcReturn(@"select b.HProcID, HMaterID,HUnitID,a.HICMOInterID,a.HICMOEntryID,a.HICMOBillNo,HBillNo,a.HInterID,b.HEntryID,a.HBillNo from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
inner join Sc_ProcessExchangeBillSub b WITH(NOLOCK) on a.HInterID=b.HInterID
left join Gy_Process p WITH(NOLOCK) on b.HProcID=p.HItemID
--
Gitblit v1.9.1