modify:完成有关非标数据保存处理的内容

lqnet.sln

@@ -1,12 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.32602.291
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33414.496
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lqnet", "lqnet\Lqnet.csproj", "{98F57028-AF22-4FE1-8A58-F52A626D4D50}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "TDM测试台数据传输终端", "TDM测试台数据传输终端\TDM测试台数据传输终端.vdproj", "{BE92FB7E-2F51-487C-BDC9-8E21378BFC62}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,9 +15,6 @@ Global
 		{98F57028-AF22-4FE1-8A58-F52A626D4D50}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{98F57028-AF22-4FE1-8A58-F52A626D4D50}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{98F57028-AF22-4FE1-8A58-F52A626D4D50}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BE92FB7E-2F51-487C-BDC9-8E21378BFC62}.Debug|Any CPU.ActiveCfg = Release
-		{BE92FB7E-2F51-487C-BDC9-8E21378BFC62}.Debug|Any CPU.Build.0 = Release
-		{BE92FB7E-2F51-487C-BDC9-8E21378BFC62}.Release|Any CPU.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

lqnet/Api/CallApi.cs

@@ -1,5 +1,6 @@
 using lqnet.Entities;
 using lqnet.Entities.Dto;
+using System.ComponentModel;
 
 namespace lqnet.Api
 {
@@ -28,7 +29,7 @@ namespace lqnet.Api
         /// <returns></returns>
         public static R SelectTasksList(TaskSelectDTO dto)
         {
-            return CommonApi.PostApi("test/plugin/listPageTask", dto);
+            return CommonApi.GetApi("test/plugin/listPageTask", dto);
         }
 
         /// <summary>
@@ -38,7 +39,7 @@ namespace lqnet.Api
         /// <returns></returns>
         public static R SelectCheckItemList(CheckItemsDTO dto)
         {
-            return CommonApi.PostApi("test/plugin/checkItemList", dto);
+            return CommonApi.GetApi("test/plugin/checkItemList/"+dto.GroupOrderId+"/"+dto.ProceCode, dto);
         }
 
         /// <summary>
@@ -48,9 +49,10 @@ namespace lqnet.Api
         /// <returns></returns>
         public static R PostDataFile(DataFileSubmitDTO dto)
         {
-            return CommonApi.PostFileApi("test/plugin/dataFile?groupOrderCode="+dto.GroupOrderCode
-                +"&checkCode="+dto.CheckCode,
-                dto.FilePath,
+            return CommonApi.PostFileApi("test/plugin/dataFile?groupProceId=" + dto.GroupProceId
+                + "&checkCode="+dto.CheckCode+ "&itemNum="+dto.ItemNum+ "&prodtCodePosition="+dto.ProdtCodePosition
+                + "&mergeCount="+dto.MergeCount,
+                dto.DataFile,
                 "dataFile");
         }
     }

lqnet/Api/CommonApi.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Text;
@@ -64,14 +65,55 @@ namespace lqnet.Api
             }
         }
 
-        /// <summary>
-        /// 发送文件请求
-        /// </summary>
-        /// <param name="relativeUrlAndParam"></param>
-        /// <param name="absoluteFilePath">绝对文件路径</param>
-        /// <param name="fileParamName">文件的参数的名称</param>
-        /// <returns></returns>
-        public static R PostFileApi(string relativeUrlAndParam, string absoluteFilePath,string fileParamName)
+        public static R GetApi(string relativeUrl, object data)
+        {
+            string strUrl = VariablesGlobal.IP_PORT + relativeUrl;
+            if (null != data)
+            {
+                var paramsData = JsonConvert.DeserializeObject<Dictionary<string, string>>(JsonConvert.SerializeObject(data));
+                foreach (var key in paramsData.Keys)
+                {
+                    if (strUrl.IndexOf("?") >= 0)
+                    {
+                        strUrl += "&" + key + "=" + paramsData[key];
+                    } else
+                    {
+                        strUrl += "?" + key + "=" + paramsData[key];
+                    }
+                }
+            }
+            HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(strUrl);
+            request.Method = MyConstants.METHOD_GET;
+            if (!string.IsNullOrEmpty(VariablesGlobal.USER_TOKEN))
+            {
+                request.Headers.Add(MyConstants.USER_AUTH_HEADER, VariablesGlobal.USER_TOKEN);
+            }
+            
+            R r = null;
+            using (WebResponse wr = request.GetResponse())
+            {
+                HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+                StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8);
+                string content = reader.ReadToEnd();
+                r = JsonConvert.DeserializeObject<R>(content);
+                Console.WriteLine("================");
+                Console.WriteLine("code:" + r.Code);
+                Console.WriteLine("msg:" + r.Msg);
+                Console.WriteLine("data:" + r.Data);
+                Console.WriteLine("================");
+                Console.WriteLine();
+            }
+            return r;
+        }
+
+            /// <summary>
+            /// 发送文件请求
+            /// </summary>
+            /// <param name="relativeUrlAndParam"></param>
+            /// <param name="absoluteFilePath">绝对文件路径</param>
+            /// <param name="fileParamName">文件的参数的名称</param>
+            /// <returns></returns>
+            public static R PostFileApi(string relativeUrlAndParam, string absoluteFilePath,string fileParamName)
         {
             try
             {

lqnet/Entities/Dto/CheckItemsDTO.cs

@@ -4,7 +4,10 @@ namespace lqnet.Entities.Dto
 {
     public class CheckItemsDTO
     {
-        [JsonProperty(PropertyName = "groupOrderCode")]
-        public string GroupOrderCode { get; set; }
+        [JsonProperty(PropertyName = "groupOrderId")]
+        public string GroupOrderId { get; set; }
+
+        [JsonProperty(PropertyName = "proceCode")]
+        public string ProceCode { get; set; }
     }
 }

lqnet/Entities/Dto/DataFileSubmitDTO.cs

@@ -7,13 +7,22 @@ namespace lqnet.Entities.Dto
     /// </summary>
     public class DataFileSubmitDTO
     {
+        [JsonProperty(PropertyName = "groupProceId")]
+        public string GroupProceId { get; set; }
+
         [JsonProperty(PropertyName = "checkCode")]
         public string CheckCode { get; set; }
 
-        [JsonProperty(PropertyName = "groupOrderCode")]
-        public string GroupOrderCode { get; set; }
+        [JsonProperty(PropertyName = "itemNum")]
+        public string ItemNum { get; set; }
+
+        [JsonProperty(PropertyName = "prodtCodePosition")]
+        public string ProdtCodePosition { get; set; }
+
+        [JsonProperty(PropertyName = "mergeCount")]
+        public int MergeCount { get; set; } = 1;
 
-        [JsonProperty(PropertyName = "filePath")]
-        public string FilePath { get; set; }
+        [JsonProperty(PropertyName = "dataFile")]
+        public string DataFile { get; set; }
     }
 }

lqnet/Entities/Tasks.cs

@@ -1,4 +1,6 @@
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
 
 namespace lqnet.Entities
 {
@@ -10,14 +12,29 @@ namespace lqnet.Entities
 
         public int Index { get; set; }
 
+        [JsonProperty(PropertyName = "groupOrderId")]
+        public string GroupOrderId { get; set; }
+
+        [JsonProperty(PropertyName = "prodtDesig")]
+        public string ProdtDesig { get; set; }
+
         [JsonProperty(PropertyName = "groupOrderCode")]
         public string GroupOrderCode { get; set; }
 
         [JsonProperty(PropertyName = "prodtGroupType")]
         public string ProdtGroupType { get; set; }
 
-        [JsonProperty(PropertyName = "num")]
-        public string Num { get; set; }
+        [JsonProperty(PropertyName = "groupProceId")]
+        public string GroupProceId { get; set; }
+
+        [JsonProperty(PropertyName = "proceName")]
+        public string ProceName { get; set; }
+
+        [JsonProperty(PropertyName = "proceCode")]
+        public string ProceCode { get; set; }
+
+        [JsonProperty(PropertyName = "planAmt")]
+        public string PlanAmt { get; set; }
 
         [JsonProperty(PropertyName = "prodtBatch")]
         public string ProdtBatch { get; set; }

lqnet/Forms/MainForm.Designer.cs

@@ -1,4 +1,5 @@
-using System.Windows.Forms;
+using System.Drawing;
+using System.Windows.Forms;
 
 namespace lqnet.Forms
 {
@@ -52,33 +53,48 @@ namespace lqnet.Forms
             this.prodtBatch_sel = new System.Windows.Forms.TextBox();
             this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.idDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.prodtDesigDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.numDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.groupOrderCodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.prodtGroupTypeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.prodtBatchDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.groupProceIdDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.groupProceCodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.taskListBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.CheckItemComboBox = new System.Windows.Forms.ComboBox();
             this.reLogin = new System.Windows.Forms.Button();
             this.slectBt = new System.Windows.Forms.Button();
             this.button1 = new System.Windows.Forms.Button();
             this.selectFileBt = new System.Windows.Forms.Button();
             this.currentFilePath = new System.Windows.Forms.TextBox();
-            this.button2 = new System.Windows.Forms.Button();
-            this.button3 = new System.Windows.Forms.Button();
-            this.currentCheckItem = new System.Windows.Forms.TextBox();
             this.uploadTrueBt = new System.Windows.Forms.Button();
             this.version = new System.Windows.Forms.Button();
+            this.prodtIndexLabel = new System.Windows.Forms.Label();
+            this.checkLabel = new System.Windows.Forms.Label();
+            this.prodtIdxTextbox = new System.Windows.Forms.TextBox();
+            this.choosedFileLabel = new System.Windows.Forms.Label();
+            this.startIdxLabel = new System.Windows.Forms.Label();
+            this.startIdxTextbox = new System.Windows.Forms.TextBox();
+            this.mergeCountLabel = new System.Windows.Forms.Label();
+            this.mergeCountTextbox = new System.Windows.Forms.NumericUpDown();
             this.pageHelper2 = new lqnet.Utils.PageHelper();
-            this.numDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.groupOrderCodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.prodtGroupTypeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.prodtBatchDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.taskListBindingSource = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.taskListBindingSource)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.mergeCountTextbox)).BeginInit();
             this.SuspendLayout();
             // 
             // prodtBatch_sel
             // 
             this.prodtBatch_sel.Location = new System.Drawing.Point(156, 26);
             this.prodtBatch_sel.Name = "prodtBatch_sel";
-            this.prodtBatch_sel.Size = new System.Drawing.Size(247, 35);
+            this.prodtBatch_sel.Size = new System.Drawing.Size(247, 28);
             this.prodtBatch_sel.TabIndex = 1;
+
+            DataGridViewCellStyle style = new DataGridViewCellStyle();
+            //style.Alignment =
+            //    DataGridViewContentAlignment.MiddleCenter;
+            style.Font = new Font("宋体", 12);
             // 
             // Index
             // 
@@ -91,15 +107,21 @@ namespace lqnet.Forms
             // 
             // dataGridView1
             // 
+            this.dataGridView1.AllowUserToAddRows= false;
             this.dataGridView1.AutoGenerateColumns = false;
             this.dataGridView1.BackgroundColor = System.Drawing.Color.SkyBlue;
+            this.dataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Index,
+            this.idDataGridViewTextBoxColumn,
+            this.prodtDesigDataGridViewTextBoxColumn,
             this.numDataGridViewTextBoxColumn,
             this.groupOrderCodeDataGridViewTextBoxColumn,
             this.prodtGroupTypeDataGridViewTextBoxColumn,
-            this.prodtBatchDataGridViewTextBoxColumn});
+            this.prodtBatchDataGridViewTextBoxColumn,
+            this.groupProceIdDataGridViewTextBoxColumn,
+            this.groupProceCodeDataGridViewTextBoxColumn});
             this.dataGridView1.DataSource = this.taskListBindingSource;
             this.dataGridView1.Location = new System.Drawing.Point(11, 67);
             this.dataGridView1.MultiSelect = false;
@@ -107,12 +129,92 @@ namespace lqnet.Forms
             this.dataGridView1.ReadOnly = true;
             this.dataGridView1.RowHeadersVisible = false;
             this.dataGridView1.RowHeadersWidth = 82;
-            this.dataGridView1.RowTemplate.Height = 37;
+            this.dataGridView1.ColumnHeadersDefaultCellStyle = style;
             this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dataGridView1.ShowCellToolTips = false;
             this.dataGridView1.Size = new System.Drawing.Size(1088, 266);
             this.dataGridView1.TabIndex = 2;
             this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView1_CellClick);
+
+            // 
+            // idDataGridViewTextBoxColumn
+            // 
+            this.idDataGridViewTextBoxColumn.DataPropertyName = "GroupOrderId";
+            this.idDataGridViewTextBoxColumn.HeaderText = "调度单id";
+            this.idDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.idDataGridViewTextBoxColumn.Name = "idDataGridViewTextBoxColumn";
+            this.idDataGridViewTextBoxColumn.ReadOnly = true;
+            this.idDataGridViewTextBoxColumn.Visible = false;
+            this.idDataGridViewTextBoxColumn.Width = 150;
+            // 
+            // prodtDesigDataGridViewTextBoxColumn
+            // 
+            this.prodtDesigDataGridViewTextBoxColumn.DataPropertyName = "ProdtDesig";
+            this.prodtDesigDataGridViewTextBoxColumn.HeaderText = "产品代号";
+            this.prodtDesigDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.prodtDesigDataGridViewTextBoxColumn.Name = "prodtDesigDataGridViewTextBoxColumn";
+            this.prodtDesigDataGridViewTextBoxColumn.ReadOnly = true;
+            this.prodtDesigDataGridViewTextBoxColumn.Width = 290;
+            // 
+            // numDataGridViewTextBoxColumn
+            // 
+            this.numDataGridViewTextBoxColumn.DataPropertyName = "PlanAmt";
+            this.numDataGridViewTextBoxColumn.HeaderText = "数量";
+            this.numDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.numDataGridViewTextBoxColumn.Name = "numDataGridViewTextBoxColumn";
+            this.numDataGridViewTextBoxColumn.ReadOnly = true;
+            this.numDataGridViewTextBoxColumn.Width = 110;
+            // 
+            // groupOrderCodeDataGridViewTextBoxColumn
+            // 
+            this.groupOrderCodeDataGridViewTextBoxColumn.DataPropertyName = "GroupOrderCode";
+            this.groupOrderCodeDataGridViewTextBoxColumn.HeaderText = "调度单号";
+            this.groupOrderCodeDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.groupOrderCodeDataGridViewTextBoxColumn.Name = "groupOrderCodeDataGridViewTextBoxColumn";
+            this.groupOrderCodeDataGridViewTextBoxColumn.ReadOnly = true;
+            this.groupOrderCodeDataGridViewTextBoxColumn.Width = 290;
+            // 
+            // prodtGroupTypeDataGridViewTextBoxColumn
+            // 
+            this.prodtGroupTypeDataGridViewTextBoxColumn.DataPropertyName = "ProdtGroupType";
+            this.prodtGroupTypeDataGridViewTextBoxColumn.HeaderText = "任务组";
+            this.prodtGroupTypeDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.prodtGroupTypeDataGridViewTextBoxColumn.Name = "prodtGroupTypeDataGridViewTextBoxColumn";
+            this.prodtGroupTypeDataGridViewTextBoxColumn.ReadOnly = true;
+            this.prodtGroupTypeDataGridViewTextBoxColumn.Width = 290;
+            // 
+            // prodtBatchDataGridViewTextBoxColumn
+            // 
+            this.prodtBatchDataGridViewTextBoxColumn.DataPropertyName = "ProdtBatch";
+            this.prodtBatchDataGridViewTextBoxColumn.HeaderText = "生产批次";
+            this.prodtBatchDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.prodtBatchDataGridViewTextBoxColumn.Name = "prodtBatchDataGridViewTextBoxColumn";
+            this.prodtBatchDataGridViewTextBoxColumn.ReadOnly = true;
+            this.prodtBatchDataGridViewTextBoxColumn.Width = 290;
+            // 
+            // groupProceIdDataGridViewTextBoxColumn
+            // 
+            this.groupProceIdDataGridViewTextBoxColumn.DataPropertyName = "GroupProceId";
+            this.groupProceIdDataGridViewTextBoxColumn.HeaderText = "工序id";
+            this.groupProceIdDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.groupProceIdDataGridViewTextBoxColumn.Name = "groupProceIdDataGridViewTextBoxColumn";
+            this.groupProceIdDataGridViewTextBoxColumn.ReadOnly = true;
+            this.groupProceIdDataGridViewTextBoxColumn.Visible = false;
+            this.groupProceIdDataGridViewTextBoxColumn.Width = 150;
+            // 
+            // groupProceCodeDataGridViewTextBoxColumn
+            // 
+            this.groupProceCodeDataGridViewTextBoxColumn.DataPropertyName = "ProceCode";
+            this.groupProceCodeDataGridViewTextBoxColumn.HeaderText = "工序编号";
+            this.groupProceCodeDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.groupProceCodeDataGridViewTextBoxColumn.Name = "groupProceCodeDataGridViewTextBoxColumn";
+            this.groupProceCodeDataGridViewTextBoxColumn.ReadOnly = true;
+            this.groupProceCodeDataGridViewTextBoxColumn.Visible = false;
+            this.groupProceCodeDataGridViewTextBoxColumn.Width = 150;
+            // 
+            // taskListBindingSource
+            // 
+            this.taskListBindingSource.DataSource = typeof(lqnet.Entities.Tasks);
             // 
             // CheckItemComboBox
             // 
@@ -121,17 +223,17 @@ namespace lqnet.Forms
             this.CheckItemComboBox.Items.AddRange(new object[] {
             "绝缘介电强度",
             "外观/尺寸"});
-            this.CheckItemComboBox.Location = new System.Drawing.Point(19, 357);
+            this.CheckItemComboBox.Location = new System.Drawing.Point(19, 438);
             this.CheckItemComboBox.Name = "CheckItemComboBox";
-            this.CheckItemComboBox.Size = new System.Drawing.Size(240, 32);
+            this.CheckItemComboBox.Size = new System.Drawing.Size(240, 26);
             this.CheckItemComboBox.TabIndex = 5;
             this.CheckItemComboBox.SelectionChangeCommitted += new System.EventHandler(this.CheckItemComboBox_SelectionChangeCommitted);
             // 
             // reLogin
             // 
-            this.reLogin.Location = new System.Drawing.Point(940, 6);
+            this.reLogin.Location = new System.Drawing.Point(947, 12);
             this.reLogin.Name = "reLogin";
-            this.reLogin.Size = new System.Drawing.Size(120, 59);
+            this.reLogin.Size = new System.Drawing.Size(120, 48);
             this.reLogin.TabIndex = 6;
             this.reLogin.Text = "重新登录";
             this.reLogin.UseVisualStyleBackColor = true;
@@ -139,7 +241,7 @@ namespace lqnet.Forms
             // 
             // slectBt
             // 
-            this.slectBt.Location = new System.Drawing.Point(409, 26);
+            this.slectBt.Location = new System.Drawing.Point(409, 19);
             this.slectBt.Name = "slectBt";
             this.slectBt.Size = new System.Drawing.Size(91, 39);
             this.slectBt.TabIndex = 7;
@@ -149,7 +251,7 @@ namespace lqnet.Forms
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(12, 26);
+            this.button1.Location = new System.Drawing.Point(12, 22);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(126, 39);
             this.button1.TabIndex = 8;
@@ -158,7 +260,7 @@ namespace lqnet.Forms
             // 
             // selectFileBt
             // 
-            this.selectFileBt.Location = new System.Drawing.Point(19, 400);
+            this.selectFileBt.Location = new System.Drawing.Point(19, 515);
             this.selectFileBt.Name = "selectFileBt";
             this.selectFileBt.Size = new System.Drawing.Size(240, 66);
             this.selectFileBt.TabIndex = 9;
@@ -170,41 +272,15 @@ namespace lqnet.Forms
             // 
             this.currentFilePath.Enabled = false;
             this.currentFilePath.Font = new System.Drawing.Font("宋体", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.currentFilePath.Location = new System.Drawing.Point(300, 486);
+            this.currentFilePath.Location = new System.Drawing.Point(300, 580);
             this.currentFilePath.Multiline = true;
             this.currentFilePath.Name = "currentFilePath";
             this.currentFilePath.Size = new System.Drawing.Size(799, 63);
             this.currentFilePath.TabIndex = 10;
             // 
-            // button2
-            // 
-            this.button2.Location = new System.Drawing.Point(300, 358);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(247, 35);
-            this.button2.TabIndex = 15;
-            this.button2.Text = "当前已选中检验项:";
-            this.button2.UseVisualStyleBackColor = true;
-            // 
-            // button3
-            // 
-            this.button3.Location = new System.Drawing.Point(300, 441);
-            this.button3.Name = "button3";
-            this.button3.Size = new System.Drawing.Size(247, 39);
-            this.button3.TabIndex = 16;
-            this.button3.Text = "当前选择数据文件:";
-            this.button3.UseVisualStyleBackColor = true;
-            // 
-            // currentCheckItem
-            // 
-            this.currentCheckItem.Enabled = false;
-            this.currentCheckItem.Location = new System.Drawing.Point(300, 400);
-            this.currentCheckItem.Name = "currentCheckItem";
-            this.currentCheckItem.Size = new System.Drawing.Size(326, 35);
-            this.currentCheckItem.TabIndex = 17;
-            // 
             // uploadTrueBt
             // 
-            this.uploadTrueBt.Location = new System.Drawing.Point(18, 483);
+            this.uploadTrueBt.Location = new System.Drawing.Point(18, 598);
             this.uploadTrueBt.Name = "uploadTrueBt";
             this.uploadTrueBt.Size = new System.Drawing.Size(240, 66);
             this.uploadTrueBt.TabIndex = 19;
@@ -214,17 +290,100 @@ namespace lqnet.Forms
             // 
             // version
             // 
-            this.version.Location = new System.Drawing.Point(918, 546);
+            this.version.Location = new System.Drawing.Point(925, 648);
             this.version.Name = "version";
             this.version.Size = new System.Drawing.Size(181, 41);
             this.version.TabIndex = 21;
             this.version.Text = "version 1.0.0";
             this.version.UseVisualStyleBackColor = true;
             // 
+            // prodtIndexLabel
+            // 
+            this.prodtIndexLabel.AutoSize = true;
+            this.prodtIndexLabel.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.prodtIndexLabel.Location = new System.Drawing.Point(314, 402);
+            this.prodtIndexLabel.Name = "prodtIndexLabel";
+            this.prodtIndexLabel.Size = new System.Drawing.Size(115, 21);
+            this.prodtIndexLabel.TabIndex = 24;
+            this.prodtIndexLabel.Text = "产品索引列";
+            // 
+            // checkLabel
+            // 
+            this.checkLabel.AutoSize = true;
+            this.checkLabel.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.checkLabel.Location = new System.Drawing.Point(23, 402);
+            this.checkLabel.Name = "checkLabel";
+            this.checkLabel.Size = new System.Drawing.Size(73, 21);
+            this.checkLabel.TabIndex = 25;
+            this.checkLabel.Text = "检验项";
+            // 
+            // prodtIdxTextbox
+            // 
+            this.prodtIdxTextbox.Location = new System.Drawing.Point(318, 438);
+            this.prodtIdxTextbox.Name = "prodtIdxTextbox";
+            this.prodtIdxTextbox.Size = new System.Drawing.Size(763, 28);
+            this.prodtIdxTextbox.TabIndex = 26;
+            // 
+            // choosedFileLabel
+            // 
+            this.choosedFileLabel.AutoSize = true;
+            this.choosedFileLabel.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.choosedFileLabel.Location = new System.Drawing.Point(305, 545);
+            this.choosedFileLabel.Name = "choosedFileLabel";
+            this.choosedFileLabel.Size = new System.Drawing.Size(178, 21);
+            this.choosedFileLabel.TabIndex = 27;
+            this.choosedFileLabel.Text = "当前选择数据文件";
+            // 
+            // startIdxLabel
+            // 
+            this.startIdxLabel.AutoSize = true;
+            this.startIdxLabel.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.startIdxLabel.Location = new System.Drawing.Point(314, 497);
+            this.startIdxLabel.Name = "startIdxLabel";
+            this.startIdxLabel.Size = new System.Drawing.Size(94, 21);
+            this.startIdxLabel.TabIndex = 28;
+            this.startIdxLabel.Text = "开始坐标";
+            // 
+            // startIdxTextbox
+            // 
+            this.startIdxTextbox.Location = new System.Drawing.Point(418, 495);
+            this.startIdxTextbox.Name = "startIdxTextbox";
+            this.startIdxTextbox.Size = new System.Drawing.Size(141, 28);
+            this.startIdxTextbox.TabIndex = 29;
+            // 
+            // mergeCountLabel
+            // 
+            this.mergeCountLabel.AutoSize = true;
+            this.mergeCountLabel.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mergeCountLabel.Location = new System.Drawing.Point(600, 497);
+            this.mergeCountLabel.Name = "mergeCountLabel";
+            this.mergeCountLabel.Size = new System.Drawing.Size(136, 21);
+            this.mergeCountLabel.TabIndex = 30;
+            this.mergeCountLabel.Text = "产品合并行数";
+            // 
+            // mergeCountTextbox
+            // 
+            this.mergeCountTextbox.Location = new System.Drawing.Point(763, 490);
+            this.mergeCountTextbox.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.mergeCountTextbox.Name = "mergeCountTextbox";
+            this.mergeCountTextbox.Size = new System.Drawing.Size(120, 28);
+            this.mergeCountTextbox.TabIndex = 32;
+            this.mergeCountTextbox.UseWaitCursor = true;
+            this.mergeCountTextbox.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            // 
             // pageHelper2
             // 
             this.pageHelper2.AllPage = 1;
-            this.pageHelper2.Location = new System.Drawing.Point(11, 296);
+            this.pageHelper2.Location = new System.Drawing.Point(11, 341);
+            this.pageHelper2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.pageHelper2.Name = "pageHelper2";
             this.pageHelper2.NowPage = 1;
             this.pageHelper2.PageSize = 5;
@@ -233,56 +392,21 @@ namespace lqnet.Forms
             this.pageHelper2.Total = 0;
             this.pageHelper2.Load += new System.EventHandler(this.PageHelper2_Load);
             // 
-            // numDataGridViewTextBoxColumn
-            // 
-            this.numDataGridViewTextBoxColumn.DataPropertyName = "Num";
-            this.numDataGridViewTextBoxColumn.HeaderText = "数量";
-            this.numDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.numDataGridViewTextBoxColumn.Name = "numDataGridViewTextBoxColumn";
-            this.numDataGridViewTextBoxColumn.ReadOnly = true;
-            this.numDataGridViewTextBoxColumn.Width = 110;
-            // 
-            // groupOrderCodeDataGridViewTextBoxColumn
-            // 
-            this.groupOrderCodeDataGridViewTextBoxColumn.DataPropertyName = "GroupOrderCode";
-            this.groupOrderCodeDataGridViewTextBoxColumn.HeaderText = "调度单号";
-            this.groupOrderCodeDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.groupOrderCodeDataGridViewTextBoxColumn.Name = "groupOrderCodeDataGridViewTextBoxColumn";
-            this.groupOrderCodeDataGridViewTextBoxColumn.ReadOnly = true;
-            this.groupOrderCodeDataGridViewTextBoxColumn.Width = 290;
-            // 
-            // prodtGroupTypeDataGridViewTextBoxColumn
-            // 
-            this.prodtGroupTypeDataGridViewTextBoxColumn.DataPropertyName = "ProdtGroupType";
-            this.prodtGroupTypeDataGridViewTextBoxColumn.HeaderText = "任务组";
-            this.prodtGroupTypeDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.prodtGroupTypeDataGridViewTextBoxColumn.Name = "prodtGroupTypeDataGridViewTextBoxColumn";
-            this.prodtGroupTypeDataGridViewTextBoxColumn.ReadOnly = true;
-            this.prodtGroupTypeDataGridViewTextBoxColumn.Width = 290;
-            // 
-            // prodtBatchDataGridViewTextBoxColumn
-            // 
-            this.prodtBatchDataGridViewTextBoxColumn.DataPropertyName = "ProdtBatch";
-            this.prodtBatchDataGridViewTextBoxColumn.HeaderText = "生产批次";
-            this.prodtBatchDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.prodtBatchDataGridViewTextBoxColumn.Name = "prodtBatchDataGridViewTextBoxColumn";
-            this.prodtBatchDataGridViewTextBoxColumn.ReadOnly = true;
-            this.prodtBatchDataGridViewTextBoxColumn.Width = 290;
-            // 
-            // taskListBindingSource
-            // 
-            this.taskListBindingSource.DataSource = typeof(lqnet.Entities.Tasks);
-            // 
             // MainForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-            this.ClientSize = new System.Drawing.Size(1114, 599);
+            this.ClientSize = new System.Drawing.Size(1114, 694);
+            this.Controls.Add(this.mergeCountTextbox);
+            this.Controls.Add(this.mergeCountLabel);
+            this.Controls.Add(this.startIdxTextbox);
+            this.Controls.Add(this.startIdxLabel);
+            this.Controls.Add(this.choosedFileLabel);
+            this.Controls.Add(this.prodtIdxTextbox);
+            this.Controls.Add(this.checkLabel);
+            this.Controls.Add(this.prodtIndexLabel);
             this.Controls.Add(this.version);
             this.Controls.Add(this.pageHelper2);
             this.Controls.Add(this.uploadTrueBt);
-            this.Controls.Add(this.currentCheckItem);
-            this.Controls.Add(this.button3);
-            this.Controls.Add(this.button2);
             this.Controls.Add(this.currentFilePath);
             this.Controls.Add(this.selectFileBt);
             this.Controls.Add(this.button1);
@@ -300,6 +424,7 @@ namespace lqnet.Forms
             this.Paint += new System.Windows.Forms.PaintEventHandler(this.Boder_Paint);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.taskListBindingSource)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.mergeCountTextbox)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -308,10 +433,14 @@ namespace lqnet.Forms
         #endregion
         private BindingSource taskListBindingSource;
         private TextBox prodtBatch_sel;
+        private DataGridViewTextBoxColumn groupProceCodeDataGridViewTextBoxColumn;
+        private DataGridViewTextBoxColumn groupProceIdDataGridViewTextBoxColumn;
         private DataGridViewTextBoxColumn prodtBatchDataGridViewTextBoxColumn;
         private DataGridViewTextBoxColumn prodtGroupTypeDataGridViewTextBoxColumn;
         private DataGridViewTextBoxColumn groupOrderCodeDataGridViewTextBoxColumn;
         private DataGridViewTextBoxColumn numDataGridViewTextBoxColumn;
+        private DataGridViewTextBoxColumn idDataGridViewTextBoxColumn;
+        private DataGridViewTextBoxColumn prodtDesigDataGridViewTextBoxColumn;
         private DataGridViewTextBoxColumn Index;
         private DataGridView dataGridView1;
         private ComboBox CheckItemComboBox;
@@ -320,11 +449,16 @@ namespace lqnet.Forms
         private Button button1;
         private Button selectFileBt;
         private TextBox currentFilePath;
-        private Button button2;
-        private Button button3;
-        private TextBox currentCheckItem;
         private Button uploadTrueBt;
         private Utils.PageHelper pageHelper2;
         private Button version;
+        private Label prodtIndexLabel;
+        private Label checkLabel;
+        private TextBox prodtIdxTextbox;
+        private Label choosedFileLabel;
+        private Label startIdxLabel;
+        private TextBox startIdxTextbox;
+        private Label mergeCountLabel;
+        private NumericUpDown mergeCountTextbox;
     }
 }

lqnet/Forms/MainForm.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;
+using System.Globalization;
 using System.IO;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 using lqnet.Api;
@@ -166,17 +168,20 @@ namespace lqnet.Forms
 
                 Tasks firstTask = c.ListTask[0];
                 firstTask.Index = start;
+                firstTask.PlanAmt = int.Parse(firstTask.PlanAmt, NumberStyles.Float).ToString();
                 this.taskListBindingSource.Add(firstTask);
                 for (int k = 1; k < c.ListTask.Count; k++)
                 {
                     Tasks task = c.ListTask[k];
                     task.Index = start + k;
+                    task.PlanAmt = int.Parse(task.PlanAmt, NumberStyles.Float).ToString(); 
                     this.taskListBindingSource.Add(task);
                 }
 
                 CheckItem_SelectList(new CheckItemsDTO
                 {
-                    GroupOrderCode = firstTask.GroupOrderCode
+                    GroupOrderId = firstTask.GroupOrderId,
+                    ProceCode = firstTask.ProceCode
                 });
                 this.pageHelper2.NowPage = page.Current;
                 this.pageHelper2.AllPage = page.Pages;
@@ -207,10 +212,10 @@ namespace lqnet.Forms
         /// </summary>
         private void SelectedTable()
         {
-            //Console.WriteLine(this.dataGridView1.CurrentRow.Cells[2].Value.ToString());
+            //Console.WriteLine(this.dataGridView1.CurrentRow.Cells[1].Value.ToString());
             this.CheckItemComboBox.SelectedIndex = 0;
             this.CheckItemComboBox.SelectedItem = null;
-            if (null == this.dataGridView1.CurrentRow.Cells[2].Value)
+            if (null == this.dataGridView1.CurrentRow.Cells[1].Value)
             {
                 MessageBox.Show("此行没有任务内容或者任务有缺失,请重新选择", "提示", MessageBoxButtons.OK);
                 Func_My_CheckItemComboBox_ClearAndInit();
@@ -218,7 +223,8 @@ namespace lqnet.Forms
             }
             CheckItem_SelectList(new CheckItemsDTO
             {
-                GroupOrderCode = this.dataGridView1.CurrentRow.Cells[2].Value.ToString()
+                GroupOrderId = this.dataGridView1.CurrentRow.Cells[1].Value.ToString(),
+                ProceCode = this.dataGridView1.CurrentRow.Cells[this.dataGridView1.CurrentRow.Cells.Count-1].Value.ToString()
             });
             this.currentFilePath.Text = "";
         }
@@ -259,24 +265,27 @@ namespace lqnet.Forms
                 MessageBox.Show("请选择要上传的数据文件", "提示", MessageBoxButtons.OK);
                 return;
             }
-            if (string.IsNullOrEmpty(this.currentCheckItem.Text))
+            CheckItem item = getCheckSelectedItem();
+            if (item is null)
             {
                 MessageBox.Show("请选择要上传数据的对应的检验项", "提示", MessageBoxButtons.OK);
                 return;
             }
-            string msg = "确保检查数据以及对应任务后，您确定提交 检验项为 " + this.currentCheckItem.Text + " , 文件名称为 " +
+            string msg = "确保检查数据以及对应任务后，您确定提交 检验项为 " + item.CheckName + " , 文件名称为 " +
             this.currentFilePath.Text.Substring(this.currentFilePath.Text.LastIndexOf(Path.DirectorySeparatorChar) + 1)
              + " 的试验数据吗？";
             if (DialogResult.Yes == MessageBox.Show(msg, "重要提交数据提示", MessageBoxButtons.YesNo))
             {
-                CheckItem item = (CheckItem)this.CheckItemComboBox.SelectedItem;
-
                 R r = CallApi.PostDataFile(new DataFileSubmitDTO
                 {
-                    GroupOrderCode = this.dataGridView1.CurrentRow.Cells[2].Value.ToString(),
+                    //GroupOrderCode = this.dataGridView1.CurrentRow.Cells[2].Value.ToString(),
                     CheckCode = item.CheckCode,
-                    FilePath = this.currentFilePath.Text
-                });
+                    DataFile = this.currentFilePath.Text,
+                    GroupProceId = this.dataGridView1.CurrentRow.Cells[this.dataGridView1.CurrentRow.Cells.Count - 2].Value.ToString(),
+                    ItemNum = this.prodtIdxTextbox.Text.Trim(),
+                    ProdtCodePosition = this.startIdxTextbox.Text.Trim(),
+                    MergeCount = int.Parse(this.mergeCountTextbox.Value.ToString())
+                }) ;
                 if (r.Code == MyConstants.CODE_SUCCESS_200)
                 {
                     Func_My_CheckItemComboBox_ClearAndInit();
@@ -378,12 +387,22 @@ namespace lqnet.Forms
 
             if (!MyConstants.NON_NULL_CHECK_CODE.Equals(item.CheckCode))
             {
-                this.currentCheckItem.Text = item.CheckName;
+                //this.currentCheckItem.Text = item.CheckName;
                 this.version.Focus();
             }
 
         }
 
+        private CheckItem getCheckSelectedItem()
+        {
+            CheckItem item = (CheckItem)this.CheckItemComboBox.SelectedItem;
+            if (!MyConstants.NON_NULL_CHECK_CODE.Equals(item.CheckCode))
+            {
+                return item;
+            }
+            return null;
+        }
+
         /// <summary>
         /// 清理与初始化下拉框
         /// </summary>
@@ -396,9 +415,8 @@ namespace lqnet.Forms
                 CheckName = "请选择检验项"
             });
             this.CheckItemComboBox.SelectedIndex = 0;
-            this.currentCheckItem.Text = null;
+            //this.currentCheckItem.Text = null;
             this.version.Focus();
         }
-
     }
 }

lqnet/Lqnet.csproj

@@ -61,7 +61,7 @@
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>

lqnet/bin/Debug/lqnet.application

@@ -4,17 +4,17 @@
   <description asmv2:publisher="lqnet" asmv2:product="lqnet" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true" />
   <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
-    <framework targetVersion="4.0" profile="Full" supportedRuntime="4.0.30319" />
+    <framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
   </compatibleFrameworks>
   <dependency>
-    <dependentAssembly dependencyType="install" codebase="lqnet.exe.manifest" size="5645">
+    <dependentAssembly dependencyType="install" codebase="lqnet.exe.manifest" size="5717">
       <assemblyIdentity name="lqnet.exe" version="1.0.0.2" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>CM1b35wyTNQIxnItWVzhwt9crZA=</dsig:DigestValue>
+        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+        <dsig:DigestValue>4sKQOrCKAKt0kMzC4RcCysxYI/lkmfCYtCwE2pZOxsg=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

lqnet/bin/Debug/lqnet.exe.config

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

lqnet/bin/Debug/lqnet.exe.manifest

@@ -42,14 +42,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="lqnet.exe" size="474096">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="lqnet.exe" size="479232">
       <assemblyIdentity name="lqnet" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>7iDGjqj34EssfFAi4N75wlcgr5k=</dsig:DigestValue>
+        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+        <dsig:DigestValue>Ccf/HEzkHHK8KpFf51GZ0otXdo2b5vyMVNLNIjRs3gc=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -60,8 +60,8 @@
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>ywj11yQN/NzXfedUJZs2wNmioDQ=</dsig:DigestValue>
+        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+        <dsig:DigestValue>ahaEYcch/RQWN1H3g5+41nSDy1gx8bKxqz6WpouC04Q=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -70,8 +70,8 @@
       <dsig:Transforms>
         <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
       </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>rEivBDmIEk0GSl9S+qL5VryA+As=</dsig:DigestValue>
+      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+      <dsig:DigestValue>+4JI85GPS64q5avXwTgBzC30fheelyuTf93OuSu5Stw=</dsig:DigestValue>
     </hash>
   </file>
   <file name="lqnet.exe.config" size="161">
@@ -79,8 +79,8 @@
       <dsig:Transforms>
         <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
       </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>XhmNWIUSMbaVlaWABznwa4dcyj0=</dsig:DigestValue>
+      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+      <dsig:DigestValue>1hvekB5xicyX1FodTEqjnUxN4raEGXc+x3QzhQbWWa0=</dsig:DigestValue>
     </hash>
   </file>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">

lqnet/obj/Debug/Lqnet.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-ec849436ddd8bc02417d49302b75e34341cdd152
+2827ec95c751b29c73a23d5b8923edb630cd8074

lqnet/obj/Debug/Lqnet.csproj.FileListAbsolute.txt

@@ -35,3 +35,23 @@ D:\workStudy\cs\lqnet\lqnet\obj\Debug\lqnet.application
 D:\workStudy\cs\lqnet\lqnet\obj\Debug\Lqnet.csproj.CopyComplete
 D:\workStudy\cs\lqnet\lqnet\obj\Debug\lqnet.exe
 D:\workStudy\cs\lqnet\lqnet\obj\Debug\lqnet.pdb
+C:\Users\ma\Desktop\lqnet\lqnet\obj\Debug\Lqnet.csproj.AssemblyReference.cache
+C:\Users\ma\Desktop\lqnet\lqnet\obj\Debug\Lqnet.csproj.SuggestedBindingRedirects.cache
+C:\Users\ma\Desktop\lqnet\lqnet\obj\Debug\lqnet.LoginForm.resources
+C:\Users\ma\Desktop\lqnet\lqnet\obj\Debug\lqnet.Forms.MainForm.resources
+C:\Users\ma\Desktop\lqnet\lqnet\obj\Debug\lqnet.Properties.Resources.resources
+C:\Users\ma\Desktop\lqnet\lqnet\obj\Debug\lqnet.Utils.PageHelper.resources
+C:\Users\ma\Desktop\lqnet\lqnet\obj\Debug\Lqnet.csproj.GenerateResource.cache
+C:\Users\ma\Desktop\lqnet\lqnet\obj\Debug\Lqnet.csproj.CoreCompileInputs.cache
+C:\Users\ma\Desktop\lqnet\lqnet\obj\Debug\lqnet.exe
+C:\Users\ma\Desktop\lqnet\lqnet\obj\Debug\lqnet.pdb
+C:\Users\ma\Desktop\lqnet\lqnet\bin\Debug\lqnet.exe.config
+C:\Users\ma\Desktop\lqnet\lqnet\bin\Debug\lqnet.exe.manifest
+C:\Users\ma\Desktop\lqnet\lqnet\bin\Debug\lqnet.application
+C:\Users\ma\Desktop\lqnet\lqnet\bin\Debug\lqnet.exe
+C:\Users\ma\Desktop\lqnet\lqnet\bin\Debug\lqnet.pdb
+C:\Users\ma\Desktop\lqnet\lqnet\bin\Debug\Newtonsoft.Json.dll
+C:\Users\ma\Desktop\lqnet\lqnet\bin\Debug\Newtonsoft.Json.xml
+C:\Users\ma\Desktop\lqnet\lqnet\obj\Debug\lqnet.exe.manifest
+C:\Users\ma\Desktop\lqnet\lqnet\obj\Debug\lqnet.application
+C:\Users\ma\Desktop\lqnet\lqnet\obj\Debug\Lqnet.csproj.CopyComplete

lqnet/obj/Debug/lqnet.application

@@ -4,17 +4,17 @@
   <description asmv2:publisher="lqnet" asmv2:product="lqnet" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true" />
   <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
-    <framework targetVersion="4.0" profile="Full" supportedRuntime="4.0.30319" />
+    <framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
   </compatibleFrameworks>
   <dependency>
-    <dependentAssembly dependencyType="install" codebase="lqnet.exe.manifest" size="5645">
+    <dependentAssembly dependencyType="install" codebase="lqnet.exe.manifest" size="5717">
       <assemblyIdentity name="lqnet.exe" version="1.0.0.2" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>CM1b35wyTNQIxnItWVzhwt9crZA=</dsig:DigestValue>
+        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+        <dsig:DigestValue>4sKQOrCKAKt0kMzC4RcCysxYI/lkmfCYtCwE2pZOxsg=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

lqnet/obj/Debug/lqnet.exe.manifest

@@ -42,14 +42,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="lqnet.exe" size="474096">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="lqnet.exe" size="479232">
       <assemblyIdentity name="lqnet" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>7iDGjqj34EssfFAi4N75wlcgr5k=</dsig:DigestValue>
+        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+        <dsig:DigestValue>Ccf/HEzkHHK8KpFf51GZ0otXdo2b5vyMVNLNIjRs3gc=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -60,8 +60,8 @@
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>ywj11yQN/NzXfedUJZs2wNmioDQ=</dsig:DigestValue>
+        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+        <dsig:DigestValue>ahaEYcch/RQWN1H3g5+41nSDy1gx8bKxqz6WpouC04Q=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -70,8 +70,8 @@
       <dsig:Transforms>
         <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
       </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>rEivBDmIEk0GSl9S+qL5VryA+As=</dsig:DigestValue>
+      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+      <dsig:DigestValue>+4JI85GPS64q5avXwTgBzC30fheelyuTf93OuSu5Stw=</dsig:DigestValue>
     </hash>
   </file>
   <file name="lqnet.exe.config" size="161">
@@ -79,8 +79,8 @@
       <dsig:Transforms>
         <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
       </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>XhmNWIUSMbaVlaWABznwa4dcyj0=</dsig:DigestValue>
+      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+      <dsig:DigestValue>1hvekB5xicyX1FodTEqjnUxN4raEGXc+x3QzhQbWWa0=</dsig:DigestValue>
     </hash>
   </file>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">