black-goat-me
2023-05-25 7bcb050792e8af11c5c1d8209c0bbc6eb2194ad5
配套表查询-发料清单:问题解决
1个文件已修改
21 ■■■■ 已修改文件
WorkM/报表分析/Sc_ICMOWorkCompleteSet.cs 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/±¨±í·ÖÎö/Sc_ICMOWorkCompleteSet.cs
@@ -232,8 +232,8 @@
            }
            //
            //Sub_AddProcSalaryColumn(DSet);
            Sub_AddProcSalaryColumn(DSet.Tables[0], DSet.Tables[3]);
            Sub_AddProcSalaryColumn(DSet.Tables[1], DSet.Tables[3]);
            Sub_AddProcSalaryColumn(DSet.Tables[0], DSet.Tables[3],1);
            Sub_AddProcSalaryColumn(DSet.Tables[1], DSet.Tables[3],2);
            grdMain.DataSource = DSet.Tables[0].DefaultView;
            grdSub.DataSource = DSet.Tables[1].DefaultView;
            //获取动态列 ï¼ˆç‰©æ–™ä¿¡æ¯ï¼‰
@@ -567,8 +567,17 @@
        //}
        private void Sub_AddProcSalaryColumn(DataTable DSetResource,DataTable DSetColumnInfo)
        private void Sub_AddProcSalaryColumn(DataTable DSetResource,DataTable DSetColumnInfo,int OperatorTableType)
        {
            string realAmount = "";       //用于标记不同表中需要的数量的名称
            if (OperatorTableType == 1)
            {
                realAmount = "总需求量";
            }
            else if(OperatorTableType==2)
            {
                realAmount = "生产数量";
            }
            //工序工价变量
            string sProcSalary = "";
            //为数据表添加工序工价列
@@ -586,19 +595,19 @@
                    {
                       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]["总需求量"].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]["总需求量"].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())));
                            }
                            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]["总需求量"].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())));
                            }
                        }
                    }