1

duhe

2023-07-17 1d31e0c2fb82d052e928ecfe43d03b8f53f212ad

1

 WorkM/±¨±í·ÖÎö/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()))
                        {