优化

yangle

2025-01-09 69b06dbacab4cbb00985e4bfcc8a39ac8134fce0

优化

 WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo

Binary files differ

 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,16 +1008,36 @@

                for (int i = 0; i < EquipmentStaus.data.Count; i++)
                {
                    //卷绕  注塑  浸渍  组装  的设备运行 开关停机时间
                    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");

                    string HBegDate = DateTime.Now.ToString("yyyy-MM-dd 00:00:00");
                    string HEndDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                        JsonResult HEqDate = await FindDeviceStatusTimeByNo(Url, token, EquipmentStaus.data[i].no, HBegDate, HEndDate);

                    JsonResult HEqDate = await FindDeviceStatusTimeByNo(Url, token, EquipmentStaus.data[i].no, HBegDate, HEndDate);
                        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 + "\"},";
                    }
                    //卷绕  注塑  浸渍  组装  的设备运行 开关停机时间
                    //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");

                    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 + "\"},";
                    //    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)
@@ -1317,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";
    }

 WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug.rar

Binary files differ

 WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug/EquipmentCollectionForm.exe

Binary files differ

 WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug/EquipmentCollectionForm.pdb

Binary files differ

 WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.exe

Binary files differ

 WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.pdb

Binary files differ

 WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug.rar

Binary files differ

 WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.AssemblyReference.cache

Binary files differ

 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

 WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs

@@ -183,7 +183,7 @@
                string sReturn = "";
                if (GetSingleSystemParameter("WMS_CampanyName", ref sReturn) == "杭州斯莫尔")
                {
                    HDeptID = 389499;
                    HDeptID = 389505;
                    HPRDOrgIDs = 100199;
                }
                else {
@@ -198,7 +198,7 @@

             

                ds = oCN.RunProcReturn(@"select   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)
                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 
where a.HBillNo='" + HProcExchBillNo + "'  and p.HNumber='" + HProcNumber + "'", "Sc_ProcessExchangeBillMain");
@@ -207,7 +207,7 @@
                long HMainInterID = 0;
                string BillType = "3791";
                string HBillSubType = "3791";

                string HWorkShopID= ds.Tables[0].Rows[0]["HWorkShopID"].ToString();
                int HBillStatus = 1;
                string HMaker = HEmpName;//制单人
                string HMouldNum = "";//模穴号
@@ -270,6 +270,12 @@
                int HTemporaryAreaID = 0;//暂放区
                long HInterID = 0;
                string HBillNo = "";
                int HShiftsID = 0;

                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());
                }

                ds = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + HBadCodeSN + "'," + HProcID, "h_v_Gy_QualifiedRecordsList");
                if (ds.Tables[0].Rows.Count == 0)
@@ -313,7 +319,7 @@
                   ",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
                   ",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
                   ",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID,HPRDOrgID" +
                       ",HmaterOutqty,HProcPriceRate,HTemporaryAreaID" +
                   ",HmaterOutqty,HProcPriceRate,HTemporaryAreaID,HShiftsID" +
                   ") " +
                   " values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
                   "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
@@ -323,7 +329,7 @@
                   "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HBadCount + "," + HCenterID + "," + HProcNo + ",'" + HOrderProcNO + "'" + ",'" + HSourceNameList + "'" +
                   "," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
                   "," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID +
                 "," + HmaterOutqty + "," + HProcPriceRate + "," + HTemporaryAreaID + ") ");
                 "," + HmaterOutqty + "," + HProcPriceRate + "," + HTemporaryAreaID + ","+ HShiftsID + ") ");
                }

                if (HResult == "OK")
@@ -487,7 +493,7 @@
                string sReturn = "";
                if (GetSingleSystemParameter("WMS_CampanyName", ref sReturn) == "杭州斯莫尔")
                {
                    HDeptID = 389499;
                    HDeptID = 389505;
                    HPRDOrgIDs = 100199;
                }
                else
@@ -912,7 +918,7 @@
                string sReturn = "";
                if (GetSingleSystemParameter("WMS_CampanyName", ref sReturn) == "杭州斯莫尔")
                {
                    HDeptID = 389499;
                    HDeptID = 389505;
                }
                else
                {
@@ -991,7 +997,7 @@
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}'," + HProcID + ")");
,1,'{HResult}',{ HProcExchInterID},{ HProcExchEntryID},'{ HProcExchBillNo}'," + HProcID + ")");

                return true;
            }

 WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug.rar

Binary files differ

 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>6xCrGDdEGNPT3Cs3lhML+7KbUNm8O8iWwAtDvWel31Y=</dsig:DigestValue>
        <dsig:DigestValue>NwsnDbVCDNVDElH7jYILJi/+IuwqOdTyHQpbl8yBMWM=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>

 WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe

Binary files differ

 WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe.manifest

@@ -61,7 +61,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>D30L5p/EnWT+ENzvZm0SCvg4Uvt9qv/4ZyS799l2+aU=</dsig:DigestValue>
        <dsig:DigestValue>O9Cwdsqhg57KrTVWUE/D7CTOjFMM3ip5ZKLlYjwO908=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>

 WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.pdb

Binary files differ

 WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/app.publish/WFormSynchronizeData_SMR.exe

Binary files differ

 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>6xCrGDdEGNPT3Cs3lhML+7KbUNm8O8iWwAtDvWel31Y=</dsig:DigestValue>
        <dsig:DigestValue>NwsnDbVCDNVDElH7jYILJi/+IuwqOdTyHQpbl8yBMWM=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>

 WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe

Binary files differ

 WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe.manifest

@@ -61,7 +61,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>D30L5p/EnWT+ENzvZm0SCvg4Uvt9qv/4ZyS799l2+aU=</dsig:DigestValue>
        <dsig:DigestValue>O9Cwdsqhg57KrTVWUE/D7CTOjFMM3ip5ZKLlYjwO908=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>

 WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.pdb

Binary files differ