优化

yangle

2025-01-09 69b06dbacab4cbb00985e4bfcc8a39ac8134fce0

 WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.cs

@@ -747,6 +747,19 @@
            return jsonResult;
        }

        //获取注塑机的 开机
        public async Task<JsonResult> FindDeviceStatusTimeByNosAndOperationMode(string url, string token, string nos, string HBegin, string HEnd)
        {
            nos = nos.Replace(",", "\",\"");
            nos = "\"" + nos + "\"";
            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;
            JsonResult jsonResult = await EquipResultList(urls, postData, "POST");
            return jsonResult;
        }


        //下拉框绑定数据
        private void bindCbox()
        {
@@ -995,8 +1008,9 @@

                for (int i = 0; i < EquipmentStaus.data.Count; i++)
                {
                    //卷绕的设备运行 开关停机时间
                    if (EquipmentStaus.data[i].no.Contains("CMR-JR-SD-"))
                    //卷绕  注塑  浸渍  组装  的设备运行 开关停机时间
                    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-"))
                    {
                        string HBegDate = DateTime.Now.ToString("yyyy-MM-dd 00:00:00");
                        string HEndDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -1008,6 +1022,22 @@
                        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 + "\"},";
                    }
                    //卷绕  注塑  浸渍  组装  的设备运行 开关停机时间
                    //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)
@@ -1038,6 +1068,24 @@
                        JsonData += "{\"HDate\":\"" + time + "\",\"HTechParamName\":\"开关机状态\",\"HResult\":\"" + staus + "\",\"HCount\":0,\"HSourceCode\":\"" + EquipmentStaus.data[i].no + "\"},";
                    }
                }


                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
                                            where a.HICMOStatus = '1' ", "Sc_ICMOBillStatus_Tmp");

                if (datable.Tables[0].Rows.Count > 0)
                {
                    for (int i = 0; i < datable.Tables[0].Rows.Count; i++)
                    {
                        string HSourceCode = datable.Tables[0].Rows[i]["HEquipFileNo"].ToString();
                        string HNumber = datable.Tables[0].Rows[i]["HNumber"].ToString();

                        JsonData += "{\"HDate\":\"" + DateTime.Now.ToString() + "\",\"HTechParamName\":\"物料代码\",\"HResult\":\"" + HNumber + "\",\"HCount\":1,\"HSourceCode\":\"" + HSourceCode + "\"},";
                    }
                }


                JsonData = JsonData.Substring(0, JsonData.Length - 1);
                JsonData += "]}";
@@ -1302,8 +1350,8 @@
        public static string Eight = "/api/third/dayDeviceStatusTimeline";
        //良品 不良品 明细 注塑机数据
        public static string Nine = "/api/third/findAllDevicePropsDetailByTimeRange_v1";
        //注塑机数据
        //public static string Ten = "/api/third/findAllDevicePropsDetailByTimeRange";
        //注塑机开机时长 根据 操作模式采集
        public static string Ten = "/api/third/findDeviceStatusTimeByNosAndOperationMode";
        //public static string Eleven = "Monday";
        //public static string Twelve = "Monday";
    }