1

duhe

2023-07-05 f5b6953a54713be3eea651a608cf4d53181a4ec3

1

 WorkM/±¨±í·ÖÎö/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 + "）";
                }