From 264a45362cb8a570d07c7ae1fc68e5d6e52f04b5 Mon Sep 17 00:00:00 2001 From: sunliang <593170460@qq.com> Date: Wed, 6 Mar 2024 15:54:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=92=E6=9D=90=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E8=A6=81=E7=82=B9=E9=94=AD=E5=9D=AF=E5=BD=A2=E5=8D=95?= =?UTF-8?q?=E4=B8=AA=E7=89=8C=E5=8F=B7=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CCFlow/Components/BP.En30/Pub/Engine.cs | 41 ++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/CCFlow/Components/BP.En30/Pub/Engine.cs b/CCFlow/Components/BP.En30/Pub/Engine.cs index 2ae0b032..44fc530e 100644 --- a/CCFlow/Components/BP.En30/Pub/Engine.cs +++ b/CCFlow/Components/BP.En30/Pub/Engine.cs @@ -2630,9 +2630,18 @@ trgaph108\trleft5\trbrdrl\brdrs\brdrw10 \trbrdrt\brdrs\brdrw10 \trbrdrr\brdrs\br { string D4SS = D4date.Split(',')[ford4]; + string d4sssql; //拿到当前牌号有多少条数据然后合并行 //通过牌号和坯型去查数据条数 - string d4sssql = sqls + " and " + D4 + "='" + D4SS + "'"; + if (sqls != "") + { + d4sssql = sqls + " and " + D4 + "='" + D4SS + "'"; + } + else + { + d4sssql = sqls + D4 + "='" + D4SS + "'"; + } + //data.Select(d4sssql).Count(); numD4 = numD4 + data.Select(d4sssql).Count(); //合并单元格 @@ -2649,9 +2658,17 @@ trgaph108\trleft5\trbrdrl\brdrs\brdrw10 \trbrdrt\brdrs\brdrw10 \trbrdrr\brdrs\br else if (W == numD4) { string D4SS = D4date.Split(',')[ford4]; + string d4sssql; //拿到当前牌号有多少条数据然后合并行 //通过牌号和坯型去查数据条数 - string d4sssql = sqls + " and " + D4 + "='" + D4SS + "'"; + if (sqls != "") + { + d4sssql = sqls + " and " + D4 + "='" + D4SS + "'"; + } + else + { + d4sssql = sqls + D4 + "='" + D4SS + "'"; + } //data.Select(d4sssql).Count(); numD4 = numD4 + data.Select(d4sssql).Count(); //合并单元格 @@ -2696,9 +2713,17 @@ trgaph108\trleft5\trbrdrl\brdrs\brdrw10 \trbrdrt\brdrs\brdrw10 \trbrdrr\brdrs\br { arrange = arrange - 1; string D4SS = D4date.Split(',')[ford4]; + string d4sssql; //拿到当前牌号有多少条数据然后合并行 //通过牌号和坯型去查数据条数 - string d4sssql = sqls + " and " + D4 + "='" + D4SS + "'"; + if (sqls != "") + { + d4sssql = sqls + " and " + D4 + "='" + D4SS + "'"; + } + else + { + d4sssql = sqls + D4 + "='" + D4SS + "'"; + } //data.Select(d4sssql).Count(); numD4 = numD4 + data.Select(d4sssql).Count(); //合并单元格 @@ -2717,9 +2742,17 @@ trgaph108\trleft5\trbrdrl\brdrs\brdrw10 \trbrdrt\brdrs\brdrw10 \trbrdrr\brdrs\br { arrange = arrange - 1; string D4SS = D4date.Split(',')[ford4]; + string d4sssql; //拿到当前牌号有多少条数据然后合并行 //通过牌号和坯型去查数据条数 - string d4sssql = sqls + " and " + D4 + "='" + D4SS + "'"; + if (sqls != "") + { + d4sssql = sqls + " and " + D4 + "='" + D4SS + "'"; + } + else + { + d4sssql = sqls + D4 + "='" + D4SS + "'"; + } //data.Select(d4sssql).Count(); numD4 = numD4 + data.Select(d4sssql).Count(); //合并单元格