yl
2022-07-16 4545b915123fb7b7535b697f6e82b12f525f8b71
VueWebApi/Tools/ScanStartReport.cs
@@ -69,12 +69,12 @@
                    if (dt.Rows.Count > 0) //有下道工序
                    {
                        rt.nextstepcode = dt.Rows[0]["STEPCODE"].ToString();//下道工序编码
                        rt.nextstepcode = dt.Rows[0]["STEPNAME"].ToString();//下道工序名称
                        rt.nextstepname = dt.Rows[0]["STEPNAME"].ToString();//下道工序名称
                    }
                    if (isend == "Y")  //当前工序是末道工序
                    {
                        rt.nextstepcode = data.Rows[0]["STEPCODE"].ToString();//当前工序编码
                        rt.nextstepcode = data.Rows[0]["STEPNAME"].ToString();//当前工序名称
                        rt.nextstepname = data.Rows[0]["STEPNAME"].ToString();//当前工序名称
                    }
                }
                else
@@ -203,7 +203,7 @@
                                                    rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //任务数量
                                                    rt.startqty = sybqty;                                                //开工数量=本道剩余可报数量
                                                    rt.noreportqty = sybqty;                                             //未报数量=本道剩余可报数量
                                                    rt.reportqty = 0;                                                    //已报数量
                                                    rt.reportqty = decimal.Parse(good_qty) + decimal.Parse(ng_qty);      //已报数量=本道报工总数量+本道报工总不良
                                                    mes.code = "200";
                                                    mes.count = 1;
                                                    mes.Message = "弹窗报工界面!";
@@ -245,7 +245,7 @@
                                                    rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //任务数量
                                                    rt.startqty = sybqty;                                                //开工数量=本道剩余可报数量
                                                    rt.noreportqty = sybqty;                                             //未报数量=本道剩余可报数量
                                                    rt.reportqty = 0;                                                    //已报数量
                                                    rt.reportqty = decimal.Parse(good_qty) + decimal.Parse(ng_qty);      //已报数量=本道报工总数量+本道报工总不良
                                                    mes.code = "200";
                                                    mes.count = 1;
                                                    mes.Message = "弹窗报工界面!";
@@ -481,12 +481,12 @@
                    if (dt.Rows.Count > 0) //有下道工序
                    {
                        rt.nextstepcode = dt.Rows[0]["STEPCODE"].ToString();//下道工序编码
                        rt.nextstepcode = dt.Rows[0]["STEPNAME"].ToString();//下道工序名称
                        rt.nextstepname = dt.Rows[0]["STEPNAME"].ToString();//下道工序名称
                    }
                    if (isend == "Y")  //当前工序是末道工序
                    {
                        rt.nextstepcode = data.Rows[0]["STEPCODE"].ToString();//当前工序编码
                        rt.nextstepcode = data.Rows[0]["STEPNAME"].ToString();//当前工序名称
                        rt.nextstepname = data.Rows[0]["STEPNAME"].ToString();//当前工序名称
                    }
                }
                else
@@ -797,7 +797,7 @@
                                                rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString());     //任务数量
                                                rt.noreportqty = ksqty;                                              //未收数量=本道发料数量
                                                rt.reportqty = sqty + ng_qty;                                        //已收数量                                   
                                                rt.startqty = fqty;                                                  //收料数量=本道发料数量
                                                rt.startqty = ksqty;                                                  //收料数量=本道发料数量
                                                mes.code = "200";
                                                mes.count = 3;
@@ -873,7 +873,7 @@
                                                    rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString());     //任务数量
                                                    rt.noreportqty = ksqty;                                              //未收数量=本道发料数量
                                                    rt.reportqty = sqty + ng_qty;                                        //已收数量                                   
                                                    rt.startqty = fqty;                                                  //收料数量=本道发料数量
                                                    rt.startqty = ksqty;                                                  //收料数量=本道发料数量
                                                    mes.code = "200";
                                                    mes.count = 3;
@@ -883,7 +883,7 @@
                                            }
                                            else
                                            {
                                                decimal fqty = data1.AsEnumerable().Select(d => d.Field<Int32>("FQTY")).Sum();//本道发料数量
                                                decimal fqty = data1.AsEnumerable().Select(d => d.Field<decimal>("FQTY")).Sum();  //本道发料数量
                                                rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString());     //任务数量
                                                rt.noreportqty = fqty;                                               //未收数量=本道发料数量