From 0d59b3fd8050b0f0766be47ed5527d96bd4bf2f7 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 07 四月 2025 09:38:43 +0800
Subject: [PATCH] 斯莫尔插件优化
---
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCoordinateExcelFrom.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCoordinateExcelFrom.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCoordinateExcelFrom.cs
index c65b49c..d6f430a 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCoordinateExcelFrom.cs
+++ b/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();
- dt.Rows.Add(dr);
+ if (dt2.Rows[i][dt2.Columns[j]].ToString() != "") {
+ 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)
{
--
Gitblit v1.9.1