From 1d31e0c2fb82d052e928ecfe43d03b8f53f212ad Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 17 七月 2023 11:15:51 +0800
Subject: [PATCH] 1
---
WorkM/报表分析/Sc_ICMOWorkCompleteSet.cs | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ICMOWorkCompleteSet.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ICMOWorkCompleteSet.cs"
index 61ebfe8..b02ccd1 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ICMOWorkCompleteSet.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ICMOWorkCompleteSet.cs"
@@ -591,18 +591,21 @@
string sHProcID = "";
//鎷兼帴 鍙樉绀轰富宸ュ簭宸ヤ环 鐨勯儴鍒�
int iOnlyMainProcBar = 0; //鏍囪鏄惁鏈夊彧鏄剧ず涓诲伐搴忓伐浠� 鐨勯儴鍒嗚鎷兼帴 [0:鏃犲彧鏄剧ず涓诲伐搴忓伐浠� 鐨勯儴鍒嗚鎷兼帴锛�1:鏈夊彧鏄剧ず涓诲伐搴忓伐浠� 鐨勯儴鍒嗚鎷兼帴锛�2:鏈夊彧鏄剧ず涓诲伐搴忓伐浠� 鐨勯儴鍒嗚鎷兼帴涓斿凡缁忓彂鎸ヨ繃浣滅敤]
- for (int j = 0; j < DSetColumnInfo.Rows.Count; j++)
- {
- if (DSetResource.Rows[i]["鐗╂枡鍐呯爜"].Equals(DSetColumnInfo.Rows[j]["鐗╂枡鍐呯爜"]) && DSetColumnInfo.Rows[j]["宸ュ簭鍐呯爜"].ToString().Equals(DSetColumnInfo.Rows[j]["瀛愬伐搴忓唴鐮�"].ToString()))
- {
- sProcSalary = sProcSalary + DSetColumnInfo.Rows[j]["宸ュ簭鍚嶇О"].ToString() + "(" + string.Format("{0:F4}", Double.Parse(DSetColumnInfo.Rows[j]["鍗曚环"].ToString())) + ")" + string.Format("{0:F4}", (Double.Parse(DSetResource.Rows[i][realAmount].ToString()) * Double.Parse(DSetColumnInfo.Rows[j]["鍗曚环"].ToString()))) + " ";
- iOnlyMainProcBar = 1;
- }
- }
+ //for (int j = 0; j < DSetColumnInfo.Rows.Count; j++)
+ //{
+ // if (DSetResource.Rows[i]["鐗╂枡鍐呯爜"].Equals(DSetColumnInfo.Rows[j]["鐗╂枡鍐呯爜"]) && DSetColumnInfo.Rows[j]["宸ュ簭鍐呯爜"].ToString().Equals(DSetColumnInfo.Rows[j]["瀛愬伐搴忓唴鐮�"].ToString()))
+ // {
+ // sProcSalary = sProcSalary + DSetColumnInfo.Rows[j]["宸ュ簭鍚嶇О"].ToString() + "(" + string.Format("{0:F4}", Double.Parse(DSetColumnInfo.Rows[j]["鍗曚环"].ToString())) + ")" + string.Format("{0:F4}", (Double.Parse(DSetResource.Rows[i][realAmount].ToString()) * Double.Parse(DSetColumnInfo.Rows[j]["鍗曚环"].ToString()))) + " ";
+ // iOnlyMainProcBar = 1;
+ // }
+ //}
//鎷兼帴 闇�瑕佹樉绀轰富宸ュ簭涓瓙宸ュ簭宸ヤ环 鐨勯儴鍒�
for (int j=0;j<DSetColumnInfo.Rows.Count;j++)
{
- if(DSetResource.Rows[i]["鐗╂枡鍐呯爜"].Equals(DSetColumnInfo.Rows[j]["鐗╂枡鍐呯爜"]) && !DSetColumnInfo.Rows[j]["宸ュ簭鍐呯爜"].ToString().Equals(DSetColumnInfo.Rows[j]["瀛愬伐搴忓唴鐮�"].ToString()))
+ string biaotou = DSetResource.Rows[i]["宸ヨ壓娴佺▼"].ToString().Split(';')[0];
+ biaotou = biaotou.Replace(" ","");
+ string beizhu = DSetColumnInfo.Rows[j]["澶囨敞"].ToString();
+ if (DSetResource.Rows[i]["鐗╂枡鍐呯爜"].Equals(DSetColumnInfo.Rows[j]["鐗╂枡鍐呯爜"]) && biaotou.Equals(beizhu))
{
if(sHProcID.Equals(DSetColumnInfo.Rows[j]["宸ュ簭鍐呯爜"].ToString()))
{
--
Gitblit v1.9.1