From 980b78709fef23248956382fe72571e431c4d289 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期二, 06 一月 2026 10:46:05 +0800
Subject: [PATCH] 单品过站同步插件增加打印生产质量汇报单单号日志
---
WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.cs | 245 +++++++++++++++++++++++++-----------------------
1 files changed, 129 insertions(+), 116 deletions(-)
diff --git a/WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.cs b/WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.cs
index 6a8d276..549b2e0 100644
--- a/WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.cs
+++ b/WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.cs
@@ -40,10 +40,10 @@
this.txtHMaker.Text = "璇疯緭鍏ョ敤鎴风紪鐮�!";
bindCbox();
-
+
}
- private void btnBegin_Click(object sender, EventArgs e)
+ private void btnBegin_Click(object sender, EventArgs e)
{
if (this.txtHBathNo.Text == "" || this.txtHBathNo.ReadOnly == false)
//if (false)
@@ -119,7 +119,7 @@
",鏈夋棤铻虹墮妫�娴嬬粨鏋�:" + dt.Rows[i]["DetectionResult"].ToString() +
",鏃堕棿:" + dt.Rows[i]["HDate"].ToString());
}
-
+
}
}
}
@@ -175,7 +175,8 @@
for (int j = 0; j < 2; j++)
{
DateTime Now = DateTime.Parse(dt2.Rows[i][dt2.Columns[6]].ToString() + " " + dt2.Rows[i][dt2.Columns[7]].ToString());
- if (Now >= HBegin && Now <= HEnd) {
+ if (Now >= HBegin && Now <= HEnd)
+ {
DataRow dr = dt.NewRow();
dr["BottomHoleDiameter"] = dt2.Rows[i][dt2.Columns[j]].ToString();
dr["TestingData"] = dt2.Rows[i][dt2.Columns[j + 2]].ToString();
@@ -211,16 +212,18 @@
{
MessageBox.Show("璇疯緭鍏ュ埗鍗曚汉淇℃伅!");
}
- else {
+ else
+ {
Get_DisplayBard();
}
//this.txtHBathNo.ReadOnly = true;
-
+
}
}
//鏌ヨ鏉＄爜鏁版嵁
- public void Get_DisplayBard() {
+ public void Get_DisplayBard()
+ {
string HBarCode = this.txtHBathNo.Text;
DataSet ds = oCN.RunProcReturn("select HBatchNo,m.HNumber,a.HMaterID from Gy_BarCodeBill a left join Gy_Material m on a.HMaterID = m.HItemID where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill");
@@ -228,7 +231,8 @@
{
MessageBox.Show("鏉＄爜鏌ユ棤鏁版嵁!");
}
- else {
+ else
+ {
this.txtHBathNo.Text = ds.Tables[0].Rows[0]["HBatchNo"].ToString();
this.txtHMaterNumber.Text = ds.Tables[0].Rows[0]["HNumber"].ToString();
this.HMaterID.Text = ds.Tables[0].Rows[0]["HMaterID"].ToString();
@@ -262,7 +266,8 @@
{
DialogResult dr = MessageBox.Show("纭淇濆瓨?", "鎻愮ず", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
- if (dr == DialogResult.Yes) {
+ if (dr == DialogResult.Yes)
+ {
string Url = DBHelper.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "Config/SQLAPI.config", "sUrl");
//閫氳繃鎺ュ彛 鑾峰彇token
@@ -287,12 +292,13 @@
}
//铻烘瘝鍏ㄦ淇濆瓨
- public async void SaveFullInspectionOfNuts(string token,string url) {
+ public async void SaveFullInspectionOfNuts(string token, string url)
+ {
try
{
-
+
//鑾峰彇鎵�鏈夎澶囨暟鎹�
- JsonEquipmentData jsonResult =await FindDeviceList(url, token);
+ JsonEquipmentData jsonResult = await FindDeviceList(url, token);
if (jsonResult.code != "0")
{
@@ -321,7 +327,8 @@
this.btnSave.Enabled = true;
MessageBox.Show("鏁伴噺鑾峰彇鎶ラ敊:" + jsonResult.message);
}
- else {
+ else
+ {
double HInSpectQty = 0;//妫�楠屾暟閲�
double HRightQty = 0;//鍚堟牸
double HUnRightQty = 0;//涓嶅悎鏍�
@@ -373,7 +380,8 @@
this.btnSave.Enabled = true;
MessageBox.Show("鐢熶骇璧勬簮鏌ユ棤鏁版嵁!");
}
- else {
+ else
+ {
HSourceID = int.Parse(dsSouce.Tables[0].Rows[0]["HItemID"].ToString());
@@ -413,7 +421,7 @@
//鍒嗘瀽鏂规硶 涓哄畾閲忓垎鏋�
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());
@@ -581,13 +589,13 @@
}
}
- /// <summary>
- /// 鑾峰彇璁惧鍒楄〃
- /// </summary>
- /// <param name="url"></param>
- /// <param name="postData"></param>
- /// <returns></returns>
- public async Task<JsonEquipmentData> EquipmentList(string url, StringContent postData,string Type)
+ /// <summary>
+ /// 鑾峰彇璁惧鍒楄〃
+ /// </summary>
+ /// <param name="url"></param>
+ /// <param name="postData"></param>
+ /// <returns></returns>
+ public async Task<JsonEquipmentData> EquipmentList(string url, StringContent postData, string Type)
{
// 鍒涘缓 HttpClient 瀹炰緥
@@ -606,8 +614,8 @@
// 鍙戣捣 get 璇锋眰
response = await client.GetAsync(url);
}
-
-
+
+
// 纭繚璇锋眰鎴愬姛
if (response.IsSuccessStatusCode)
{
@@ -617,7 +625,7 @@
}
else
{
- MessageBox.Show($"璇锋眰澶辫触锛�: {response.StatusCode}");
+ MessageBox.Show($"璇锋眰澶辫触锛歿response.StatusCode} - {url} - 褰撳墠鏃堕棿锛歿DateTime.Now:yyyy-MM-dd HH:mm:ss}");
}
}
@@ -659,7 +667,7 @@
}
else
{
- MessageBox.Show($"璇锋眰澶辫触锛�: {response.StatusCode}");
+ MessageBox.Show($"璇锋眰澶辫触锛歿response.StatusCode} - {url} - 褰撳墠鏃堕棿锛歿DateTime.Now:yyyy-MM-dd HH:mm:ss}");
}
}
@@ -679,8 +687,8 @@
// 鍑嗗瑕佸彂閫佺殑琛ㄥ崟鏁版嵁
var formData = new FormUrlEncodedContent(new[]
{
- new KeyValuePair<string, string>("userName", "admin"),
- new KeyValuePair<string, string>("password", "admin")
+ new KeyValuePair<string, string>("userName", "mes"),
+ new KeyValuePair<string, string>("password", "MesApi123")
// 娣诲姞鏇村閿�煎锛屾牴鎹偍鐨勯渶瑕�
});
JsonResult jsonResult = await getUrl(urls, formData);
@@ -688,7 +696,8 @@
}
//鑾峰彇璁惧鍒楄〃
- public async Task<JsonEquipmentData> FindDeviceList(string url,string token) {
+ public async Task<JsonEquipmentData> FindDeviceList(string url, string token)
+ {
//璁惧鍒楄〃鎺ュ彛
string urls = url + EquipmentType.Two;
// 鍑嗗瑕佸彂閫佺殑琛ㄥ崟鏁版嵁
@@ -698,7 +707,7 @@
}
//鑾峰彇鑹搧銆佷笉鑹搧鏄庣粏
- public async Task<JsonEquipmentData> FindAllDevicePropsDetailByTimeRange(string url, string token,string nos, string HBegin, string HEnd)
+ public async Task<JsonEquipmentData> FindAllDevicePropsDetailByTimeRange(string url, string token, string nos, string HBegin, string HEnd)
{
string basePropIds = DBHelper.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "Config/SQLAPI.config", "basePropIds");
basePropIds = "[" + basePropIds + "]";
@@ -707,7 +716,7 @@
//璁惧鍒楄〃鎺ュ彛
string urls = url + EquipmentType.Nine;
- CustomWriteLog("鑾峰彇宸ヨ壓鍙傛暟鎺ュ彛锛�'"+ urls + "'", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ CustomWriteLog("宸ヨ壓鍙傛暟鎺ュ彛锛�'" + urls + "' 鍙傛暟鍊硷細 '" + stringJson + "'", DateTime.Now.ToString("yyyy-MM-dd"));
// 鍑嗗瑕佸彂閫佺殑琛ㄥ崟鏁版嵁
var postData = new StringContent(stringJson, System.Text.Encoding.UTF8, "application/json");
@@ -716,11 +725,12 @@
}
//鑾峰彇涓嶈壇鏁帮紝鍚堟暟鏁帮紝鍙枒鏁� 鎬绘暟
- public async Task<JsonEquipmentData> FindDevicePropCalc(string url, string token,string nos,string HBegin,string HEnd)
+ public async Task<JsonEquipmentData> FindDevicePropCalc(string url, string token, string nos, string HBegin, string HEnd)
{
string stringJson = "{\"token\":\"" + token + "\",\"deviceNo\":\"" + nos + "\",\"propIds\":[606,173,469,470],\"beginTime\":\"" + HBegin + "\",\"endTime\":\"" + HEnd + "\"}";
var postData = new StringContent(stringJson, System.Text.Encoding.UTF8, "application/json");
string urls = url + EquipmentType.Seven;
+ CustomWriteLog("鑾峰彇涓嶈壇鏁帮紝鍚堟暟鏁帮紝鍙枒鏁� 鎬绘暟锛�'" + urls + "' 鍙傛暟鍊硷細 '" + stringJson + "'", DateTime.Now.ToString("yyyy-MM-dd"));
JsonEquipmentData jsonResult = await EquipmentList(urls, postData, "POST");
return jsonResult;
}
@@ -734,6 +744,7 @@
string stringJson = "{\"token\":\"" + token + "\",\"nos\":[" + nos + "]}";
var postData = new StringContent(stringJson, System.Text.Encoding.UTF8, "application/json");
string urls = url + EquipmentType.Three;
+ CustomWriteLog("璁惧杩愯鐘舵�侊細'" + urls + "' 鍙傛暟鍊硷細 '" + stringJson + "'", DateTime.Now.ToString("yyyy-MM-dd"));
JsonEquipmentData jsonResult = await EquipmentList(urls, postData, "POST");
return jsonResult;
}
@@ -746,6 +757,7 @@
string stringJson = "{\"token\":\"" + token + "\",\"nos\":[" + nos + "],\"startTime\":\"" + HBegin + "\",\"endTime\":\"" + HEnd + "\"}";
var postData = new StringContent(stringJson, System.Text.Encoding.UTF8, "application/json");
string urls = url + EquipmentType.Four;
+ CustomWriteLog("璁惧鏃堕棿娈典骇閲忥細'" + urls + "' 鍙傛暟鍊硷細 '" + stringJson + "'", DateTime.Now.ToString("yyyy-MM-dd"));
JsonEquipmentData jsonResult = await EquipmentList(urls, postData, "POST");
return jsonResult;
}
@@ -758,6 +770,7 @@
string stringJson = "{\"token\":\"" + token + "\",\"no\":" + nos + ",\"startTime\":\"" + HBegin + "\",\"endTime\":\"" + HEnd + "\"}";
var postData = new StringContent(stringJson, System.Text.Encoding.UTF8, "application/json");
string urls = url + EquipmentType.Five;
+ CustomWriteLog("璁惧杩愯鏃堕棿鎺ュ彛锛�'" + urls + "' 鍙傛暟鍊硷細 '" + stringJson + "'", DateTime.Now.ToString("yyyy-MM-dd"));
JsonResult jsonResult = await EquipResultList(urls, postData, "POST");
return jsonResult;
}
@@ -770,6 +783,7 @@
string stringJson = "{\"token\":\"" + token + "\",\"no\":" + nos + ",\"startTime\":\"" + HBegin + "\",\"endTime\":\"" + HEnd + "\"}";
var postData = new StringContent(stringJson, System.Text.Encoding.UTF8, "application/json");
string urls = url + EquipmentType.Ten;
+ CustomWriteLog("娉ㄥ鏈虹殑 寮�鏈烘帴鍙ｏ細'" + urls + "' 鍙傛暟鍊硷細 '" + stringJson + "'", DateTime.Now.ToString("yyyy-MM-dd"));
JsonResult jsonResult = await EquipResultList(urls, postData, "POST");
return jsonResult;
}
@@ -779,7 +793,7 @@
private void bindCbox()
{
IList<Info> infoList = new List<Info>();
- Info info1 = new Info() { Id = "CMR-QC-SE-001", Name = "铻烘瘝鍏ㄦ" };
+ Info info1 = new Info() { Id = "CMR-QC-SE-001", Name = "铻烘瘝鍏ㄦ" };
Info info2 = new Info() { Id = "CMR-ZZ-SE-001", Name = "铻烘瘝鍘嬭" };
Info info3 = new Info() { Id = "ZSJ07", Name = "娉ㄥ鏈�#07" };
//Info info3 = new Info() { Id = "3", Name = "鐜嬩簲" };
@@ -801,7 +815,7 @@
this.btnLj.Enabled = true;
this.timer.Enabled = false;
}
- else
+ else
{
this.btnLj.Enabled = false;
DialogResult dr = MessageBox.Show("鏄惁纭寮�濮嬮噰闆�?", "鎻愮ず", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
@@ -829,8 +843,8 @@
// 鍑嗗瑕佸彂閫佺殑琛ㄥ崟鏁版嵁
var formData = new FormUrlEncodedContent(new[]
{
- new KeyValuePair<string, string>("userName", "admin"),
- new KeyValuePair<string, string>("password", "admin")
+ new KeyValuePair<string, string>("userName", "mes"),
+ new KeyValuePair<string, string>("password", "MesApi123")
// 娣诲姞鏇村閿�煎锛屾牴鎹偍鐨勯渶瑕�
});
JsonResult jsonResult = await getUrl(urls, formData);
@@ -849,7 +863,8 @@
}
//铻烘瘝鍘嬭閲囬泦鏁版嵁 淇濆瓨
- public async void SaveNutPressFit(string Url , string token, string time) {
+ public async void SaveNutPressFit(string Url, string token, string time)
+ {
if (TimeDate == "")
{
TimeDate = this.txtBegin.Text;
@@ -863,7 +878,7 @@
}
else
{
- string nos = "";
+ string nos = "";
//鑾峰彇鍘昏澶囩紪鐮�
for (int i = 0; i < jsonResult.data.Count; i++)
{
@@ -905,8 +920,8 @@
//鍚堟牸鏁�
if (jsonEquipment.data[i].propId == 469)
{
- JsonData += "{\"HDate\":\"" + time + "\",\"HTechParamName\":\"鑹搧鏁癨",\"HResult\":\"OK\",\"HCount\":" + jsonEquipment.data[i].sum + ",\"HSourceCode\":\""+ nos + "\"},";
- }
+ JsonData += "{\"HDate\":\"" + time + "\",\"HTechParamName\":\"鑹搧鏁癨",\"HResult\":\"OK\",\"HCount\":" + jsonEquipment.data[i].sum + ",\"HSourceCode\":\"" + nos + "\"},";
+ }
//涓嶈壇鏁�
else if (jsonEquipment.data[i].propId == 470)
{
@@ -925,25 +940,22 @@
}
//娉ㄥ鏈洪噰闆嗘暟鎹� 淇濆瓨
- public async void SaveInjectionMoldingMachine(string token, string Url, string time)
+ public async void SaveInjectionMoldingMachine(string token, string Url, string time)
{
ListData.Items.Clear();
if (TimeDate == "")
{
TimeDate = this.txtBegin.Text;
}
- //this.timer.Enabled = false;
-
- //TimeDate = "2025-02-10 13:10:50";
- //time = "2025-02-10 13:11:50";
-
+
//鑾峰彇鎵�鏈夎澶囨暟鎹�
JsonEquipmentData jsonResult = await FindDeviceList(Url, token);
if (jsonResult.code != "0")
{
MessageBox.Show("璁惧鍒楄〃鎶ラ敊:" + jsonResult.message);
}
- else {
+ else
+ {
string nos = "";
//鑾峰彇璁惧缂栫爜
@@ -962,26 +974,25 @@
nos = nos.Substring(0, nos.Length - 1);
//鑾峰彇鍙傛暟 鑾峰彇姣忎釜璁惧瀵瑰簲鐨勬墍鏈夊弬鏁�
JsonEquipmentData jsonEquipment = await FindAllDevicePropsDetailByTimeRange(Url, token, nos, TimeDate, time);
+ var JsonData = "{\"data\":[";
if (jsonEquipment == null)
{
- CustomWriteLog("jsonEquipment瀵硅薄涓虹┖", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ CustomWriteLog("jsonEquipment瀵硅薄涓虹┖", DateTime.Now.ToString("yyyy-MM-dd"));
}
if (jsonEquipment.data == null)
{
- CustomWriteLog("data灞炴�т负绌�",DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ CustomWriteLog("jsonEquipment.data灞炴�т负绌�", DateTime.Now.ToString("yyyy-MM-dd"));
}
-
- var JsonData = "{\"data\":[";
- CustomWriteLog("寮�濮嬪惊鐜伐鑹哄弬鏁版�绘暟涓猴細锛�'" + jsonEquipment.data.Count + "'", DateTime.Now.ToString("yyyy-MM-dd"));
-
- try
+ else
{
+ CustomWriteLog("寮�濮嬪惊鐜伐鑹哄弬鏁版�绘暟涓猴細锛�'" + jsonEquipment.data.Count + "'", DateTime.Now.ToString("yyyy-MM-dd"));
+
//閫氳繃姣忎釜璁惧杩涜寰幆璧嬪��
for (int i = 0; i < jsonEquipment.data.Count; i++)
{
- CustomWriteLog("褰撳墠寰幆 绗� '"+i+"' 娆�", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ CustomWriteLog("褰撳墠寰幆 绗� '" + i + "' 娆�", DateTime.Now.ToString("yyyy-MM-dd"));
//鑾峰彇璁惧瀵瑰簲鐨勭紪鐮� 鍒ゆ柇缂栫爜鏄惁婊¤冻涓鸿灪姣嶅帇瑁呰澶�
if (jsonEquipment.data[i].deviceNo.Contains("CMR-ZZ-SE-"))
{
@@ -1014,6 +1025,8 @@
JsonEquipmentData data = await FindDevicePropCalc(Url, token, jsonEquipment.data[i].deviceNo, TimeDate, time);
+ await Task.Delay(200);
+
for (int j = 0; j < data.data.Count; j++)
{
//鍚堟牸鏁�
@@ -1037,27 +1050,26 @@
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 + "\"},";
- CustomWriteLog("宸ヨ壓鍙傛暟鍏蜂綋鍊硷細{\"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 + "\"}", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ //CustomWriteLog("宸ヨ壓鍙傛暟鍏蜂綋鍊硷細{\"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 + "\"}", DateTime.Now.ToString("yyyy-MM-dd"));
}
}
//鑾峰彇璁惧鏃堕棿娈典骇閲�
- JsonEquipmentData data = await FindProdByNosAndTime(Url, token, jsonEquipment.data[i].deviceNo, TimeDate, time);
+ JsonEquipmentData data = await FindProdByNosAndTime(Url, token, jsonEquipment.data[i].deviceNo, TimeDate, time);
for (int j = 0; j < data.data.Count; j++)
{
JsonData += "{\"HDate\":\"" + time + "\",\"HTechParamName\":\"鐢熶骇鏁伴噺\",\"HResult\":\"OK\",\"HCount\":" + data.data[j].prod + ",\"HSourceCode\":\"" + jsonEquipment.data[i].deviceNo + "\"},";
- CustomWriteLog("璁惧浜ч噺鍊硷細{\"HDate\":\"" + time + "\",\"HTechParamName\":\"鐢熶骇鏁伴噺\",\"HResult\":\"OK\",\"HCount\":" + data.data[j].prod + ",\"HSourceCode\":\"" + jsonEquipment.data[i].deviceNo + "\"}", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ //CustomWriteLog("璁惧浜ч噺鍊硷細{\"HDate\":\"" + time + "\",\"HTechParamName\":\"鐢熶骇鏁伴噺\",\"HResult\":\"OK\",\"HCount\":" + data.data[j].prod + ",\"HSourceCode\":\"" + jsonEquipment.data[i].deviceNo + "\"}", DateTime.Now.ToString("yyyy-MM-dd"));
}
}
}
- }
- catch (Exception ex)
- {
- CustomWriteLog("EXCEPTION_CAUGHT", $"{DateTime.Now:yyyy-MM-dd HH:mm:ss} - 寮傚父淇℃伅锛歿ex.ToString()}");
- }
- CustomWriteLog("宸ヨ壓鍙傛暟涓庝骇閲忓惊鐜粨鏉�", DateTime.Now.ToString("yyyy-MM-dd"));
+ CustomWriteLog("宸ヨ壓鍙傛暟涓庝骇閲忓惊鐜粨鏉�", DateTime.Now.ToString("yyyy-MM-dd"));
+ }
+
+ CustomWriteLog("1", DateTime.Now.ToString("yyyy-MM-dd"));
+
//鑾峰彇璁惧杩愯鐘舵��
var EquipmentStaus = await FindDeviceStatusByNos(Url, token, nos);
@@ -1066,55 +1078,47 @@
{
//鍗风粫 娉ㄥ 娴告笉 缁勮 鐨勮澶囪繍琛� 寮�鍏冲仠鏈烘椂闂�
if (EquipmentStaus.data[i].no.Contains("CMR-JR-SD-") || EquipmentStaus.data[i].no.Contains("CMR-JZ-SD-") || EquipmentStaus.data[i].no.Contains("CMR-HX-SD-")
- || EquipmentStaus.data[i].no.Contains("CMR-ZD-SD")|| EquipmentStaus.data[i].no.Contains("CMR-ZS-SE-"))
+ || EquipmentStaus.data[i].no.Contains("CMR-ZD-SD") || EquipmentStaus.data[i].no.Contains("CMR-ZS-SE-"))
{
string HBegDate = DateTime.Now.ToString("yyyy-MM-dd 00:00:00");
string HEndDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:00");
- if (DateTime.Parse(HEndDate).AddMinutes(1).ToString("yyyy-MM-dd") != DateTime.Parse(HEndDate).ToString("yyyy-MM-dd")) {
- HEndDate= DateTime.Parse(HEndDate).AddMinutes(1).ToString("yyyy-MM-dd HH:mm:00");
+ if (DateTime.Parse(HEndDate).AddMinutes(1).ToString("yyyy-MM-dd") != DateTime.Parse(HEndDate).ToString("yyyy-MM-dd"))
+ {
+ HEndDate = DateTime.Parse(HEndDate).AddMinutes(1).ToString("yyyy-MM-dd HH:mm:00");
}
JsonResult HEqDate = await FindDeviceStatusTimeByNo(Url, token, EquipmentStaus.data[i].no, HBegDate, HEndDate);
+ if (HEqDate != null && HEqDate.data != null)
+ {
- // 璁板綍寮�鏈烘椂闀�
- CustomWriteLog("璁惧寮�鏈烘椂闀�: {\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"寮�鏈烘椂闀縗",\"HResult\":\"" + ((float)(HEqDate.data.onlineTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"}",
- DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ // 璁板綍寮�鏈烘椂闀�
+ CustomWriteLog("璁惧寮�鏈烘椂闀�: 寮�鏈烘椂闀�" + ((float)(HEqDate.data.onlineTime / 60 / 60)).ToString("0.00") + " " + EquipmentStaus.data[i].no + "",
+ DateTime.Now.ToString("yyyy-MM-dd"));
- // 璁板綍鍏虫満鏃堕暱
- CustomWriteLog("璁惧鍏虫満鏃堕暱: {\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"鍏虫満鏃堕暱\",\"HResult\":\"" + ((float)(HEqDate.data.offlineTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"}",
- DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ // 璁板綍鍏虫満鏃堕暱
+ CustomWriteLog("璁惧鍏虫満鏃堕暱: 鍏虫満鏃堕暱" + ((float)(HEqDate.data.offlineTime / 60 / 60)).ToString("0.00") + " " + EquipmentStaus.data[i].no + "",
+ DateTime.Now.ToString("yyyy-MM-dd"));
- // 璁板綍鍋滄満鏃堕暱
- CustomWriteLog("璁惧鍋滄満鏃堕暱: {\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"鍋滄満鏃堕暱\",\"HResult\":\"" + ((float)(HEqDate.data.standbyTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"}",
- DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ // 璁板綍鍋滄満鏃堕暱
+ CustomWriteLog("璁惧鍋滄満鏃堕暱: 鍋滄満鏃堕暱" + ((float)(HEqDate.data.standbyTime / 60 / 60)).ToString("0.00") + " " + EquipmentStaus.data[i].no + "",
+ DateTime.Now.ToString("yyyy-MM-dd"));
- // 璁板綍杩愯鏃堕暱
- CustomWriteLog("璁惧杩愯鏃堕暱: {\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"杩愯鏃堕暱\",\"HResult\":\"" + ((float)(HEqDate.data.runTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"}",
- DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ // 璁板綍杩愯鏃堕暱
+ CustomWriteLog("璁惧杩愯鏃堕暱: 杩愯鏃堕暱" + ((float)(HEqDate.data.runTime / 60 / 60)).ToString("0.00") + " " + EquipmentStaus.data[i].no + "",
+ DateTime.Now.ToString("yyyy-MM-dd"));
- JsonData += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"寮�鏈烘椂闀縗",\"HResult\":\"" + ((float)(HEqDate.data.onlineTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
- JsonData += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"鍏虫満鏃堕暱\",\"HResult\":\"" + ((float)(HEqDate.data.offlineTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
- JsonData += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"鍋滄満鏃堕暱\",\"HResult\":\"" + ((float)(HEqDate.data.standbyTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
- JsonData += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"杩愯鏃堕暱\",\"HResult\":\"" + ((float)(HEqDate.data.runTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
+ JsonData += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"寮�鏈烘椂闀縗",\"HResult\":\"" + ((float)(HEqDate.data.onlineTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
+ JsonData += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"鍏虫満鏃堕暱\",\"HResult\":\"" + ((float)(HEqDate.data.offlineTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
+ JsonData += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"鍋滄満鏃堕暱\",\"HResult\":\"" + ((float)(HEqDate.data.standbyTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
+ JsonData += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"杩愯鏃堕暱\",\"HResult\":\"" + ((float)(HEqDate.data.runTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
+ }
+ else
+ {
+ // 璁板綍杩愯鏃堕暱
+ CustomWriteLog("璁惧寮�鍋滄満鏃堕暱涓虹┖ HEqDate锛�" + HEqDate + " , HEqDate.data " + HEqDate.data + "", DateTime.Now.ToString("yyyy-MM-dd"));
+ }
}
- //鍗风粫 娉ㄥ 娴告笉 缁勮 鐨勮澶囪繍琛� 寮�鍏冲仠鏈烘椂闂�
- //if (EquipmentStaus.data[i].no.Contains("CMR-ZS-SE-"))
- //{
- // string HBegDate = DateTime.Now.ToString("yyyy-MM-dd 00:00:00");
- // string HEndDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-
- // JsonResult kj = await FindDeviceStatusTimeByNosAndOperationMode(Url, token, EquipmentStaus.data[i].no, HBegDate, HEndDate);
- // JsonData += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"寮�鏈烘椂闀縗",\"HResult\":\"" + ((float)(kj.data.onlineTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
-
- // JsonResult HEqDate = await FindDeviceStatusTimeByNo(Url, token, EquipmentStaus.data[i].no, HBegDate, HEndDate);
-
- // JsonData += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"鍏虫満鏃堕暱\",\"HResult\":\"" + ((float)(HEqDate.data.offlineTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
- // JsonData += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"鍋滄満鏃堕暱\",\"HResult\":\"" + ((float)(HEqDate.data.standbyTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
- // JsonData += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"杩愯鏃堕暱\",\"HResult\":\"" + ((float)(HEqDate.data.runTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
- //}
-
-
string staus = "";
switch (EquipmentStaus.data[i].status)
{
@@ -1135,7 +1139,11 @@
staus = "鍛婅";
break;
}
- if (jsonEquipment.data.Count > 0)
+ if (jsonEquipment == null || jsonEquipment.data == null)
+ {
+ JsonData += "{\"HDate\":\"" + time + "\",\"HTechParamName\":\"寮�鍏虫満鐘舵�乗",\"HResult\":\"" + staus + "\",\"HCount\":0,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
+ }
+ else if (jsonEquipment.data.Count > 0)
{
JsonData += "{\"HDate\":\"" + time + "\",\"HTechParamName\":\"寮�鍏虫満鐘舵�乗",\"HResult\":\"" + staus + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
}
@@ -1177,18 +1185,18 @@
}
//鏁版嵁淇濆瓨
- public void DataSave(string JsonData) {
- JsonEquipmentData data = JsonConvert.DeserializeObject<JsonEquipmentData>(JsonData);
+ public void DataSave(string JsonData)
+ {
+ JsonEquipmentData data = JsonConvert.DeserializeObject<JsonEquipmentData>(JsonData);
for (int i = 0; i < data.data.Count; i++)
{
oCN.RunProc(@"insert into Sb_EquipMentCollectionTechParam_Temp(HDate,HSourceCode,HTechParamID,HTechParamName,HCount
,HCreateTime,HResult,HProcNumber,HFlag)
-values(getdate(),'"+ data.data[i].HSourceCode + "',0,'" + data.data[i].HTechParamName + "'," + data.data[i].HCount
+values(getdate(),'" + data.data[i].HSourceCode + "',0,'" + data.data[i].HTechParamName + "'," + data.data[i].HCount
+ ",'" + data.data[i].HDate + "','" + data.data[i].HResult + "','" + data.data[i].HProcNumber + "',0)");
-
- ListData.Items.Add("鏃堕棿:" + data.data[i].HDate +",宸ヨ壓鍙傛暟:" + data.data[i].HTechParamName +",宸ヨ壓鍙傛暟鍊�:" + data.data[i].HResult);
}
+ ListData.Items.Add($"鏃堕棿: {DateTime.Now:yyyy-MM-dd HH:mm:ss}锛屽姞杞芥垚鍔�");
}
//瀹氭椂鐢熸垚浜ч噺姹囨姤鍗�
@@ -1200,8 +1208,8 @@
// 鍑嗗瑕佸彂閫佺殑琛ㄥ崟鏁版嵁
var formData = new FormUrlEncodedContent(new[]
{
- new KeyValuePair<string, string>("userName", "admin"),
- new KeyValuePair<string, string>("password", "admin")
+ new KeyValuePair<string, string>("userName", "mes"),
+ new KeyValuePair<string, string>("password", "MesApi123")
// 娣诲姞鏇村閿�煎锛屾牴鎹偍鐨勯渶瑕�
});
JsonResult jsonResult = await getUrl(urls, formData);
@@ -1233,10 +1241,10 @@
nos = nos.Substring(0, nos.Length - 1);
//this.Time_CLHB.Enabled = false;
-
+ CustomWriteLog("浜ч噺姹囨姤鍗曪紝璁惧缂栫爜锛�'" + nos + "'", DateTime.Now.ToString("yyyy-MM-dd"));
//鏌ヨ寮�宸ョ殑璁惧淇℃伅 浠ュ強 鏌ヨ褰撳ぉ璁惧瀵瑰簲鐨勫紑宸ユ椂闂� 鍜屽畬宸ユ椂闂�
DataSet ds = oCN.RunProcReturn("exec h_p_Sc_TimeICMOReporList '" + nos + "'", "h_p_Sc_TimeICMOReporList");
-
+
if (ds.Tables[0].Rows.Count > 0)
{
//鏍规嵁褰撳ぉ鍙紑宸ユ病鏈夊畬宸ュ搴旂殑浜ч噺鏁版嵁 鐢熸垚浜ч噺姹囨姤鍗�
@@ -1248,14 +1256,16 @@
string HBegDate = DateTime.Parse(dt.Rows[i]["鏃ユ湡"].ToString()).ToString("yyyy-MM-dd HH:mm:ss");
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) {
+ if (decimal.Parse(jsonEquipment.data[0].prod) > 0)
+ {
//鐢熸垚浜ч噺姹囨姤鍗�
- oCN.RunProc("exec h_p_Sc_AddTimeICMORepor " + HICMInterID + "," + jsonEquipment.data[0].prod+",'"+ HEndDate + "'");
+ oCN.RunProc("exec h_p_Sc_AddTimeICMORepor " + HICMInterID + "," + jsonEquipment.data[0].prod + ",'" + HEndDate + "'");
+ CustomWriteLog("鐢熸垚浜ч噺姹囨姤鍗�1锛�'exec h_p_Sc_AddTimeICMORepor " + HICMInterID + "," + jsonEquipment.data[0].prod + ",'" + HEndDate + "''", DateTime.Now.ToString("yyyy-MM-dd"));
}
}
}
if (ds.Tables[1].Rows.Count > 0)
- {
+ {
//鏍规嵁褰撳ぉ寮�宸ュ苟涓斿畬宸ュ搴旂殑浜ч噺鏁版嵁 鐢熸垚浜ч噺姹囨姤鍗�
DataTable dt = ds.Tables[1];
for (int i = 0; i < dt.Rows.Count; i++)
@@ -1269,6 +1279,7 @@
{
//鐢熸垚浜ч噺姹囨姤鍗�
oCN.RunProc("exec h_p_Sc_AddTimeICMORepor " + HICMInterID + "," + jsonEquipment.data[0].prod + ",'" + HEndDate + "'");
+ CustomWriteLog("鐢熸垚浜ч噺姹囨姤鍗�2锛�'exec h_p_Sc_AddTimeICMORepor " + HICMInterID + "," + jsonEquipment.data[0].prod + ",'" + HEndDate + "''", DateTime.Now.ToString("yyyy-MM-dd"));
}
}
}
@@ -1388,7 +1399,8 @@
}
- public class JsonResult {
+ public class JsonResult
+ {
public string code { get; set; }
public string message { get; set; }
public string expirationTime { get; set; }
@@ -1435,7 +1447,7 @@
public double sum { get; set; }
public string createTime { get; set; }
public string happenTime { get; set; }
- public string HDate{ get; set; }
+ public string HDate { get; set; }
public string HTechParamName { get; set; }
public string HResult { get; set; }
public string HCount { get; set; }
@@ -1443,7 +1455,8 @@
public string HProcNumber { get; set; }
}
- public class propsData {
+ public class propsData
+ {
public string propName { get; set; }
public List<JsonData> datas { get; set; }
public string basePropId { get; set; }
--
Gitblit v1.9.1