From f5b6953a54713be3eea651a608cf4d53181a4ec3 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 05 七月 2023 15:14:39 +0800
Subject: [PATCH] 1
---
WorkM/报表分析/Sc_ICMOWorkCompleteSet.cs | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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 0359e62..61ebfe8 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"
@@ -589,30 +589,48 @@
for(int i = 0; i < DSetResource.Rows.Count;i++)
{
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]["鐗╂枡鍐呯爜"]))
+ if(DSetResource.Rows[i]["鐗╂枡鍐呯爜"].Equals(DSetColumnInfo.Rows[j]["鐗╂枡鍐呯爜"]) && !DSetColumnInfo.Rows[j]["宸ュ簭鍐呯爜"].ToString().Equals(DSetColumnInfo.Rows[j]["瀛愬伐搴忓唴鐮�"].ToString()))
{
if(sHProcID.Equals(DSetColumnInfo.Rows[j]["宸ュ簭鍐呯爜"].ToString()))
{
- sProcSalary = sProcSalary + " " + DSetColumnInfo.Rows[j]["瀛愬伐搴忓悕绉�"] + "锛�" + 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())));
+ sProcSalary = sProcSalary + " " + DSetColumnInfo.Rows[j]["瀛愬伐搴忓悕绉�"] + "(" + 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()))) + " ";
}
else
{
sHProcID = DSetColumnInfo.Rows[j]["宸ュ簭鍐呯爜"].ToString();
if(sProcSalary.Length>0)
{
- sProcSalary = sProcSalary + "锛�" + DSetColumnInfo.Rows[j]["宸ュ簭鍚嶇О"].ToString() + "锛�" + DSetColumnInfo.Rows[j]["瀛愬伐搴忓悕绉�"] + "锛�" + 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())));
-
+ if (iOnlyMainProcBar == 1) //澶т簬0鏄洜涓轰箣鍓嶆嫾鎺ョ殑 鍙樉绀轰富宸ュ簭宸ヤ环 鐨勯儴鍒嗭紝杩欓儴鍒嗗凡缁忔嫾鎺ュ畬鎴愶紝涓嶉渶瑕佸湪鍔�')'
+ {
+ sProcSalary = sProcSalary + DSetColumnInfo.Rows[j]["宸ュ簭鍚嶇О"].ToString() + "(" + DSetColumnInfo.Rows[j]["瀛愬伐搴忓悕绉�"] + "(" + 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 = 2; //
+ }
+ else
+ {
+ sProcSalary = sProcSalary + ")" + DSetColumnInfo.Rows[j]["宸ュ簭鍚嶇О"].ToString() + "(" + DSetColumnInfo.Rows[j]["瀛愬伐搴忓悕绉�"] + "(" + 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()))) + " ";
+ }
}
else
{
- sProcSalary = sProcSalary + DSetColumnInfo.Rows[j]["宸ュ簭鍚嶇О"].ToString() + "锛�"+ DSetColumnInfo.Rows[j]["瀛愬伐搴忓悕绉�"] + "锛�" + 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())));
+ sProcSalary = sProcSalary + DSetColumnInfo.Rows[j]["宸ュ簭鍚嶇О"].ToString() + "("+ DSetColumnInfo.Rows[j]["瀛愬伐搴忓悕绉�"] + "(" + 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()))) + " ";
}
}
}
}
- if(sProcSalary.Length>0)
+ if(sProcSalary.Length>0 && iOnlyMainProcBar !=2 && iOnlyMainProcBar!=1)
{
sProcSalary = sProcSalary + "锛�";
}
--
Gitblit v1.9.1