1

yangle

2024-09-24 619b831e0f885ceb9ce1b3cce0cffdf65ea4771c

1

 WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.Designer.cs

@@ -249,7 +249,7 @@
        private System.Windows.Forms.ListBox ListData;
        private System.Windows.Forms.TextBox txtHMaterNumber;
        private System.Windows.Forms.Label HMaterID;
        private System.Windows.Forms.Timer timer;
        private System.Windows.Forms.Timer Time_CLHB;
        private System.Windows.Forms.Timer timer;
    }
}

 WFormSynchronizeData_SMR/EquipmentCollectionForm/EquipmentCollectionForm.cs

@@ -40,13 +40,14 @@
        private  void btnBegin_Click(object sender, EventArgs e)
        {
            if (this.txtHBathNo.Text == "" || this.txtHBathNo.ReadOnly == false)
            //if (false)
            {
                MessageBox.Show("请输入批次号进行确认!");
            }
            else
            {
                this.txtBegin.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                //this.txtBegin.Text = "2024-09-06 10:52:39";
                //this.txtBegin.Text = "2024-09-24 09:47:39";
                this.btnBegin.Enabled = false;
                if (cmbEquipFile.SelectedIndex == 1)
                {
@@ -65,7 +66,7 @@
            else
            {
                this.txtEnd.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                //this.txtEnd.Text = "2024-09-06 11:20:39";
                //this.txtEnd.Text = "2024-09-24 09:52:39";
                this.btnEnd.Enabled = false;

                if (cmbEquipFile.SelectedIndex == 1)
@@ -310,7 +311,7 @@

                        for (int i = 0; i < jsonResult.data.Count; i++)
                        {
                            if (jsonResult.data[i].propId == 467)
                            if (jsonResult.data[i].propId == 173)
                            {
                                HInSpectQty = jsonResult.data[i].sum;
                            }
@@ -318,7 +319,7 @@
                            {
                                HRightQty = jsonResult.data[i].sum;
                            }
                            else if (jsonResult.data[i].propId == 466)
                            else if (jsonResult.data[i].propId == 606)
                            {
                                HUnKnowQty = jsonResult.data[i].sum;
                            }
@@ -644,7 +645,7 @@
        //获取不良数，合数数，可疑数 总数
        public async Task<JsonEquipmentData> FindDevicePropCalc(string url, string token,string nos,string HBegin,string HEnd)
        {
            string stringJson = "{\"token\":\"" + token + "\",\"deviceNo\":\"" + nos + "\",\"propIds\":[466,467,469,470],\"beginTime\":\"" + HBegin + "\",\"endTime\":\"" + 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;
            JsonEquipmentData jsonResult = await EquipmentList(urls, postData, "POST");
@@ -986,6 +987,7 @@
        //定时生成产量汇报单
        private async void Time_CLHB_Tick(object sender, EventArgs e)
        {
            //this.Time_CLHB.Enabled = false;
            string Url = DBHelper.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "Config/SQLAPI.config", "sUrl");
            string urls = Url + EquipmentType.One;
            // 准备要发送的表单数据

 WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug.rar

Binary files differ

 WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug/Config/SQLAPI.config

@@ -6,8 +6,8 @@
        <add key="sDataBase" value="HX_LMESsys_test"></add>
        <add key="sUser" value="HX_USER"></add>
        <add key="sPassword" value="lc@841022"></add>
        <add key="sUrl" value="http://30.10.7.6:8066"></add><!--内部测试-->
        <!--<add key="sUrl" value="https://hzsme.nps.iiot.youngsunnb.com/"></add>--><!--斯莫尔外网测试-->
        <!--<add key="sUrl" value="https://30.10.7.6:8066"></add>--><!--内部测试-->
        <add key="sUrl" value="https://hzsme.nps.iiot.youngsunnb.com/"></add><!--斯莫尔外网测试-->
        <!--47-->
        <!--<add key="sServer" value="47.96.97.237,15127"></add>
        <add key="sDataBase" value="HX_LMESsys"></add>

 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.csproj.AssemblyReference.cache

Binary files differ

 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

 WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.GenerateResource.cache

Binary files differ

 WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.exe

Binary files differ

 WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.pdb

Binary files differ