From 57c475ed168e905443eb2e34cc12a3d03fc355f6 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期四, 31 七月 2025 14:12:45 +0800
Subject: [PATCH] 增加九菱和凯贝的数据采集
---
WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm_JiuLing.cs | 206 +++++++++++++++++++++++++++++---------------------
1 files changed, 119 insertions(+), 87 deletions(-)
diff --git a/WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm_JiuLing.cs b/WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm_JiuLing.cs
index 0e48dd5..3283228 100644
--- a/WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm_JiuLing.cs
+++ b/WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm_JiuLing.cs
@@ -625,7 +625,7 @@
}
else
{
- MessageBox.Show($"璇锋眰澶辫触锛�: {response.StatusCode}");
+ MessageBox.Show($"璇锋眰澶辫触锛歿response.StatusCode} - {url} - 褰撳墠鏃堕棿锛歿DateTime.Now:yyyy-MM-dd HH:mm:ss}");
}
}
@@ -667,7 +667,7 @@
}
else
{
- MessageBox.Show($"璇锋眰澶辫触锛�: {response.StatusCode}");
+ MessageBox.Show($"璇锋眰澶辫触锛歿response.StatusCode} - {url} - 褰撳墠鏃堕棿锛歿DateTime.Now:yyyy-MM-dd HH:mm:ss}");
}
}
@@ -700,6 +700,7 @@
{
//璁惧鍒楄〃鎺ュ彛
string urls = url + EquipmentType_JL.Two;
+ CustomWriteLog("璁惧鍒楄〃鎺ュ彛锛�'" + urls + "'", DateTime.Now.ToString("yyyy-MM-dd"));
// 鍑嗗瑕佸彂閫佺殑琛ㄥ崟鏁版嵁
var postData = new StringContent("{\"token\":\"" + token + "\"}", System.Text.Encoding.UTF8, "application/json");
JsonEquipmentData_JL jsonResult = await EquipmentList(urls, postData, "POST");
@@ -712,10 +713,12 @@
string basePropIds = DBHelper.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "Config/SQLAPI.config", "basePropIds");
basePropIds = "[" + basePropIds + "]";
nos = nos.Replace(",", "\",\"");
- string stringJson = "{\"token\":\"" + token + "\",\"deviceNos\":[\"" + nos + "\"],\"startTime\":\"" + HBegin + "\",\"endTime\":\"" + HEnd + "\",\"basePropIds\":" + basePropIds + "}";
+ //20250723 鍙戠幇鏈夌殑瀹㈡埛鏁伴噰娌℃湁閲囬泦宸ヨ壓鍙傛暟 濡傛灉浼犲叆瀵瑰簲鐨� 璁惧缂栧彿 浼氬鑷� 璇锋眰澶辫触 浼犲叆鍙傛暟ID 涔熷彲浠ヨ幏鍙栧埌瀵瑰簲鐨勮澶� 杩欐牱涓嶄細 璇锋眰澶辫触
+ //string stringJson = "{\"token\":\"" + token + "\",\"deviceNos\":[\"" + nos + "\"],\"startTime\":\"" + HBegin + "\",\"endTime\":\"" + HEnd + "\",\"basePropIds\":" + basePropIds + "}";
+ string stringJson = "{\"token\":\"" + token + "\",\"startTime\":\"" + HBegin + "\",\"endTime\":\"" + HEnd + "\",\"basePropIds\":" + basePropIds + "}";
//璁惧鍒楄〃鎺ュ彛
string urls = url + EquipmentType_JL.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");
JsonEquipmentData_JL jsonEquipment = await EquipmentList(urls, postData, "POST");
@@ -728,6 +731,7 @@
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_JL.Seven;
+ CustomWriteLog("鑾峰彇涓嶈壇鏁帮紝鍚堟暟鏁帮紝鍙枒鏁� 鎬绘暟锛�'" + urls + "' 鍙傛暟鍊硷細 '" + stringJson + "'", DateTime.Now.ToString("yyyy-MM-dd"));
JsonEquipmentData_JL jsonResult = await EquipmentList(urls, postData, "POST");
return jsonResult;
}
@@ -741,6 +745,7 @@
string stringJson = "{\"token\":\"" + token + "\",\"nos\":[" + nos + "]}";
var postData = new StringContent(stringJson, System.Text.Encoding.UTF8, "application/json");
string urls = url + EquipmentType_JL.Three;
+ CustomWriteLog("璁惧杩愯鐘舵�侊細'" + urls + "' 鍙傛暟鍊硷細 '" + stringJson + "'", DateTime.Now.ToString("yyyy-MM-dd"));
JsonEquipmentData_JL jsonResult = await EquipmentList(urls, postData, "POST");
return jsonResult;
}
@@ -753,6 +758,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_JL.Four;
+ CustomWriteLog("璁惧鏃堕棿娈典骇閲忥細'" + urls + "' 鍙傛暟鍊硷細 '" + stringJson + "'", DateTime.Now.ToString("yyyy-MM-dd"));
JsonEquipmentData_JL jsonResult = await EquipmentList(urls, postData, "POST");
return jsonResult;
}
@@ -765,6 +771,8 @@
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_JL.Five;
+ // 璁板綍寮�鏈烘椂闀�
+ CustomWriteLog("璁惧杩愯鏃堕棿鎺ュ彛锛�'"+ urls + "' 鍙傛暟鍊硷細 '" + stringJson + "'", DateTime.Now.ToString("yyyy-MM-dd"));
JsonResult_JL jsonResult = await EquipResultList(urls, postData, "POST");
return jsonResult;
}
@@ -777,6 +785,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_JL.Ten;
+ CustomWriteLog("娉ㄥ鏈虹殑 寮�鏈烘帴鍙ｏ細'" + urls + "' 鍙傛暟鍊硷細 '" + stringJson + "'", DateTime.Now.ToString("yyyy-MM-dd"));
JsonResult_JL jsonResult = await EquipResultList(urls, postData, "POST");
return jsonResult;
}
@@ -968,40 +977,42 @@
//鑾峰彇鍙傛暟 鑾峰彇姣忎釜璁惧瀵瑰簲鐨勬墍鏈夊弬鏁�
JsonEquipmentData_JL jsonEquipment = await FindAllDevicePropsDetailByTimeRange(Url, token, nos, TimeDate, time);
+ var JsonData_JL = "{\"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("data灞炴�т负绌�", DateTime.Now.ToString("yyyy-MM-dd"));
}
-
- var JsonData_JL = "{\"data\":[";
- CustomWriteLog("寮�濮嬪惊鐜伐鑹哄弬鏁版�绘暟涓猴細锛�'" + jsonEquipment.data.Count + "'", DateTime.Now.ToString("yyyy-MM-dd"));
-
- //閫氳繃姣忎釜璁惧杩涜寰幆璧嬪��
- for (int i = 0; i < jsonEquipment.data.Count; i++)
+ else
{
- //寰幆 铻烘瘝鍘嬭璁惧瀵瑰簲鐨勬墍鏈夊伐鑹哄弬鏁�
- for (int j = 0; j < jsonEquipment.data[i].props.Count; j++)
+ CustomWriteLog("寮�濮嬪惊鐜伐鑹哄弬鏁版�绘暟涓猴細'" + jsonEquipment.data.Count + "'", DateTime.Now.ToString("yyyy-MM-dd"));
+
+ //閫氳繃姣忎釜璁惧杩涜寰幆璧嬪��
+ for (int i = 0; i < jsonEquipment.data.Count; i++)
{
- //寰幆 姣忎釜鍙傛暟瀵瑰簲鐨勬墍鏈夋暟鎹�
- for (int k = 0; k < jsonEquipment.data[i].props[j].datas.Count; k++)
+ //寰幆 铻烘瘝鍘嬭璁惧瀵瑰簲鐨勬墍鏈夊伐鑹哄弬鏁�
+ for (int j = 0; j < jsonEquipment.data[i].props.Count; j++)
{
- JsonData_JL += "{\"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"));
+ //寰幆 姣忎釜鍙傛暟瀵瑰簲鐨勬墍鏈夋暟鎹�
+ for (int k = 0; k < jsonEquipment.data[i].props[j].datas.Count; k++)
+ {
+ JsonData_JL += "{\"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"));
+ }
}
- }
- //鑾峰彇璁惧鏃堕棿娈典骇閲�
- JsonEquipmentData_JL data = await FindProdByNosAndTime(Url, token, jsonEquipment.data[i].deviceNo, TimeDate, time);
- for (int j = 0; j < data.data.Count; j++)
- {
+ //鑾峰彇璁惧鏃堕棿娈典骇閲�
+ JsonEquipmentData_JL data = await FindProdByNosAndTime(Url, token, jsonEquipment.data[i].deviceNo, TimeDate, time);
+ for (int j = 0; j < data.data.Count; j++)
+ {
- JsonData_JL += "{\"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"));
+ JsonData_JL += "{\"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"));
+ }
}
}
@@ -1009,75 +1020,96 @@
//鑾峰彇璁惧杩愯鐘舵��
var EquipmentStaus = await FindDeviceStatusByNos(Url, token, nos);
-
- for (int i = 0; i < EquipmentStaus.data.Count; i++)
+ if (EquipmentStaus == null)
{
- //鍗风粫 娉ㄥ 娴告笉 缁勮 鐨勮澶囪繍琛� 寮�鍏冲仠鏈烘椂闂�
- if (EquipmentStaus.data[i].no.Contains("JS_RX_") || EquipmentStaus.data[i].no.Contains("JS_HX_") || EquipmentStaus.data[i].no.Contains("JS_LS_")
- || EquipmentStaus.data[i].no.Contains("JS_YL_") || EquipmentStaus.data[i].no.Contains("JS_M2_") || EquipmentStaus.data[i].no.Contains("JS_ZS_"))
+ CustomWriteLog("EquipmentStaus瀵硅薄涓虹┖", DateTime.Now.ToString("yyyy-MM-dd"));
+ }
+ if (EquipmentStaus.data == null)
+ {
+ CustomWriteLog("data灞炴�т负绌�", DateTime.Now.ToString("yyyy-MM-dd"));
+ }
+ else
+ {
+ for (int i = 0; i < EquipmentStaus.data.Count; i++)
{
- 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"))
+ //鍗风粫 娉ㄥ 娴告笉 缁勮 鐨勮澶囪繍琛� 寮�鍏冲仠鏈烘椂闂�
+ if (EquipmentStaus.data[i].no.Contains("JS-MZ-") || EquipmentStaus.data[i].no.Contains("JS_LS_") || EquipmentStaus.data[i].no.Contains("JL_E_")
+ || EquipmentStaus.data[i].no.Contains("JL_") || EquipmentStaus.data[i].no.Contains("JL_A_") || EquipmentStaus.data[i].no.Contains("JL_B_")
+ || EquipmentStaus.data[i].no.Contains("JL_3_") || EquipmentStaus.data[i].no.Contains("JL_2_") || EquipmentStaus.data[i].no.Contains("JL_1_")
+ || EquipmentStaus.data[i].no.Contains("JS_RX_") || EquipmentStaus.data[i].no.Contains("JS_ZS_") || EquipmentStaus.data[i].no.Contains("JS_YL_")
+ || EquipmentStaus.data[i].no.Contains("JS_HX_") || EquipmentStaus.data[i].no.Contains("JS_LS_30_") || EquipmentStaus.data[i].no.Contains("JS_M2_"))
{
- HEndDate = DateTime.Parse(HEndDate).AddMinutes(1).ToString("yyyy-MM-dd HH:mm:00");
+ 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");
+ }
+
+ JsonResult_JL HEqDate = await FindDeviceStatusTimeByNo(Url, token, EquipmentStaus.data[i].no, HBegDate, HEndDate);
+
+ // 璁板綍寮�鏈烘椂闀�
+ CustomWriteLog("璁惧寮�鏈烘椂闀�: 寮�鏈烘椂闀�" + ((float)(HEqDate.data.onlineTime / 60 / 60)).ToString("0.00") + " " + EquipmentStaus.data[i].no + "",
+ DateTime.Now.ToString("yyyy-MM-dd"));
+
+ // 璁板綍鍏虫満鏃堕暱
+ CustomWriteLog("璁惧鍏虫満鏃堕暱: 鍏虫満鏃堕暱" + ((float)(HEqDate.data.offlineTime / 60 / 60)).ToString("0.00") + " " + EquipmentStaus.data[i].no + "",
+ DateTime.Now.ToString("yyyy-MM-dd"));
+
+ // 璁板綍鍋滄満鏃堕暱
+ CustomWriteLog("璁惧鍋滄満鏃堕暱: 鍋滄満鏃堕暱" + ((float)(HEqDate.data.standbyTime / 60 / 60)).ToString("0.00") + " " + EquipmentStaus.data[i].no + "",
+ DateTime.Now.ToString("yyyy-MM-dd"));
+
+ // 璁板綍杩愯鏃堕暱
+ CustomWriteLog("璁惧杩愯鏃堕暱: 杩愯鏃堕暱" + ((float)(HEqDate.data.runTime / 60 / 60)).ToString("0.00") + " " + EquipmentStaus.data[i].no + "",
+ DateTime.Now.ToString("yyyy-MM-dd"));
+
+ JsonData_JL += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"寮�鏈烘椂闀縗",\"HResult\":\"" + ((float)(HEqDate.data.onlineTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
+ JsonData_JL += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"鍏虫満鏃堕暱\",\"HResult\":\"" + ((float)(HEqDate.data.offlineTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
+ JsonData_JL += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"鍋滄満鏃堕暱\",\"HResult\":\"" + ((float)(HEqDate.data.standbyTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
+ JsonData_JL += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"杩愯鏃堕暱\",\"HResult\":\"" + ((float)(HEqDate.data.runTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
}
- JsonResult_JL HEqDate = await FindDeviceStatusTimeByNo(Url, token, EquipmentStaus.data[i].no, HBegDate, HEndDate);
- // 璁板綍寮�鏈烘椂闀�
- 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"));
+ string staus = "";
+ switch (EquipmentStaus.data[i].status)
+ {
+ //-1锛氭湭鐭ワ紝1锛氱绾匡紝2锛氬緟鏈猴紝3锛氭甯歌繍琛岋紝4锛氬憡璀�
+ case "-1":
+ staus = "鏈煡";
+ break;
+ case "1":
+ staus = "绂荤嚎";
+ break;
+ case "2":
+ staus = "寰呮満";
+ break;
+ case "3":
+ staus = "姝ｅ父杩愯";
+ break;
+ case "4":
+ staus = "鍛婅";
+ break;
+ }
+ if (jsonEquipment == null || jsonEquipment.data == null)
+ {
+ // 褰� jsonEquipment 鎴� jsonEquipment.data 涓� null 鏃讹紝缁熶竴璧拌繖閲�
+ JsonData_JL += "{\"HDate\":\"" + time + "\",\"HTechParamName\":\"寮�鍏虫満鐘舵�乗",\"HResult\":\"" + staus + "\",\"HCount\":0,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
+ }
+ else if (jsonEquipment.data.Count > 0)
+ {
+ JsonData_JL += "{\"HDate\":\"" + time + "\",\"HTechParamName\":\"寮�鍏虫満鐘舵�乗",\"HResult\":\"" + staus + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
+ }
+ else
+ {
+ JsonData_JL += "{\"HDate\":\"" + time + "\",\"HTechParamName\":\"寮�鍏虫満鐘舵�乗",\"HResult\":\"" + staus + "\",\"HCount\":0,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
+ }
- // 璁板綍鍏虫満鏃堕暱
- 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("璁惧鍋滄満鏃堕暱: {\"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("璁惧杩愯鏃堕暱: {\"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"));
-
- JsonData_JL += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"寮�鏈烘椂闀縗",\"HResult\":\"" + ((float)(HEqDate.data.onlineTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
- JsonData_JL += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"鍏虫満鏃堕暱\",\"HResult\":\"" + ((float)(HEqDate.data.offlineTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
- JsonData_JL += "{\"HDate\":\"" + HEndDate + "\",\"HTechParamName\":\"鍋滄満鏃堕暱\",\"HResult\":\"" + ((float)(HEqDate.data.standbyTime / 60 / 60)).ToString("0.00") + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
- JsonData_JL += "{\"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)
- {
- //-1锛氭湭鐭ワ紝1锛氱绾匡紝2锛氬緟鏈猴紝3锛氭甯歌繍琛岋紝4锛氬憡璀�
- case "-1":
- staus = "鏈煡";
- break;
- case "1":
- staus = "绂荤嚎";
- break;
- case "2":
- staus = "寰呮満";
- break;
- case "3":
- staus = "姝ｅ父杩愯";
- break;
- case "4":
- staus = "鍛婅";
- break;
- }
- if (jsonEquipment.data.Count > 0)
- {
- JsonData_JL += "{\"HDate\":\"" + time + "\",\"HTechParamName\":\"寮�鍏虫満鐘舵�乗",\"HResult\":\"" + staus + "\",\"HCount\":1,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
- }
- else
- {
- JsonData_JL += "{\"HDate\":\"" + time + "\",\"HTechParamName\":\"寮�鍏虫満鐘舵�乗",\"HResult\":\"" + staus + "\",\"HCount\":0,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
}
}
+
+ CustomWriteLog("03", DateTime.Now.ToString("yyyy-MM-dd"));
//鏌ヨ褰撳墠寮�宸ョ殑璁惧 鑾峰彇瀵瑰簲鐨勭墿鏂欎俊鎭�
DataSet datable = oCN.RunProcReturn(@"select m.HNumber,eq.HEquipFileNo from Sc_ICMOBillStatus_Tmp a
@@ -1096,7 +1128,7 @@
}
}
- CustomWriteLog("03", DateTime.Now.ToString("yyyy-MM-dd"));
+ CustomWriteLog("04", DateTime.Now.ToString("yyyy-MM-dd"));
JsonData_JL = JsonData_JL.Substring(0, JsonData_JL.Length - 1);
JsonData_JL += "]}";
--
Gitblit v1.9.1