yangle
2025-04-07 0d59b3fd8050b0f0766be47ed5527d96bd4bf2f7
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCoordinateExcelFrom.cs
@@ -176,15 +176,17 @@
                            if (nums == 1)
                            {
                                dr["Characteristic"] = "FAI 3-16-3-" + (i + 1);
                                dr["Actual"] = dt2.Rows[0][dt2.Columns[j]].ToString();
                            }
                            else
                            {
                                dr["Characteristic"] = "FAI 3-16-1-" + (i + 1);
                                dr["Actual"] = dt2.Rows[0][dt2.Columns[j]].ToString();
                            }
                            dr["Actual"] = dt2.Rows[i][dt2.Columns[j]].ToString();
                            if (dt2.Rows[i][dt2.Columns[j]].ToString() != "") {
                                dt.Rows.Add(dr);
                            }
                            dt.Rows.Add(dr);
                            nums++;
                            if (nums == 2)
@@ -330,6 +332,7 @@
        //把数据显示在页面上
        public void ShowData(DataSet ds,string HNumber) {
            string HProcID = this.cmbPro.SelectedValue.ToString();
            //清空网格内容
            ListData.Items.Clear();
            //清空表格内容
@@ -355,7 +358,7 @@
inner join Gy_InspectInstruMent men  with(nolock) on b.HInspectInstruMentID=men.HItemID   and men.HNumber='"+ HNumber + @"'  
left join Gy_Material m with(nolock) on a.HMaterID=m.HItemID
left join Gy_QCCheckItem ch with(nolock) on b.HQCCheckItemID=ch.HItemID  
where pr.HBillNo='" + this.txtLzk.Text + "'", "Gy_QCCheckProjectMain");
where pr.HBillNo='" + this.txtLzk.Text + "' and a.HProcID="+ HProcID, "Gy_QCCheckProjectMain");
                if (dataSet.Tables[0].Rows.Count == 0)
                {