yl
2023-09-22 4e8bb8eaf8c6bb06cdb56c401ead036231651446
VueWebCoreApi/Tools/ScanStartReport.cs
@@ -17,11 +17,10 @@
        /// <summary>
        /// 扫码信息为工单+工序条码
        /// </summary>
        /// <param name="stu_torgcode">所属组织编码</param>
        /// <param name="ordercode">工单编号</param>
        /// <param name="stepcode">工序编码</param>
        /// <returns></returns>
        public static ToMessage ZZEncodingSeach(string stu_torgcode, string ordercode, string stepcode)
        public static ToMessage ZZEncodingSeach(string ordercode, string stepcode)
        {
            var sql = "";
            string flwtype = ""; //工序属性
@@ -34,29 +33,14 @@
            try
            {
                //判断当前工单是否关闭
                sql = @"select *   from TK_Wrk_Man where wo_code=@ordercode and wkshp_code=@stu_torgcode and status='CLOSED'";
                sql = @"select *   from TK_Wrk_Man where wo_code=@ordercode and status='CLOSED'";
                dynamicParams.Add("@ordercode", ordercode);
                dynamicParams.Add("@stu_torgcode", stu_torgcode);
                var da0 = DapperHelper.selectdata(sql, dynamicParams);
                if (da0.Rows.Count > 0)
                if (da0.Rows.Count > 0)
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "当前工单已关闭,不允许开报工操作!";
                    mes.data = null;
                    return mes;
                }
                //0.判断当前工单所属车间是否为当前登录人员车间
                sql = @"select *   from TK_Wrk_Man where wo_code=@ordercode and wkshp_code=@stu_torgcode";
                dynamicParams.Add("@ordercode", ordercode);
                dynamicParams.Add("@stu_torgcode", stu_torgcode);
                var da1 = DapperHelper.selectdata(sql, dynamicParams);
                if (da1.Rows.Count<=0)
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "不是本车间生产任务,不允许操作!";
                    mes.data = null;
                    return mes;
                }
@@ -74,7 +58,7 @@
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0)
                {
                    rt.wkshopcode= data.Rows[0]["org_code"].ToString(); //车间编码
                    rt.wkshopcode = data.Rows[0]["org_code"].ToString(); //车间编码
                    rt.wkshopname = data.Rows[0]["org_name"].ToString(); //车间名称
                    rt.wo_code = data.Rows[0]["WO_CODE"].ToString(); //工单号
                    rt.partnumber = data.Rows[0]["PARTCODE"].ToString(); //产品编码
@@ -112,7 +96,7 @@
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "当前扫码工序任务不存在!";
                    mes.Message = "当前工序任务不存在!";
                    mes.data = null;
                    return mes;
                }
@@ -121,264 +105,146 @@
                    case "Z":  //自制工序
                        if (isbott == "Y")  //首道工序
                        {
                            //1.首道工序时,判断是否有开工记录
                            sql = @"select *   from TK_Wrk_Record R
                                    left join TEqpInfo E on R.eqp_code=E.code
                                    where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'";
                            //首道工序时,判断是否有报工记录
                            sql = @"select *   from TK_Wrk_Record where wo_code=@ordercode and step_code=@stepcode and style='B'";
                            dynamicParams.Add("@ordercode", ordercode);
                            dynamicParams.Add("@stepcode", stepcode);
                            var data0 = DapperHelper.selectdata(sql, dynamicParams);
                            if (data0.Rows.Count > 0)  //有开工记录
                            var data1 = DapperHelper.selectdata(sql, dynamicParams);
                            if (data1.Rows.Count > 0)
                            {
                                //首道工序时,判断是否有报工记录
                                sql = @"select *   from TK_Wrk_Record where wo_code=@ordercode and step_code=@stepcode and style='B'";
                                dynamicParams.Add("@ordercode", ordercode);
                                dynamicParams.Add("@stepcode", stepcode);
                                var data1 = DapperHelper.selectdata(sql, dynamicParams);
                                if (data1.Rows.Count > 0)
                                decimal good_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum();  //报工总数量
                                decimal ng_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum();  //不良数量
                                decimal laborbad_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("LABORBAD_QTY")).Sum();  //工废数量
                                decimal materielbad_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("MATERIELBAD_QTY")).Sum();  //料废数量
                                //剩余可报工数量=任务数量-(报工数量+不良数量+工废废数量+料废数量)
                                decimal kbqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()) - (good_qty + ng_qty + laborbad_qty + materielbad_qty);
                                if (kbqty <= 0)//无可报工数量
                                {
                                    decimal good_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum();  //报工总数量
                                    decimal ng_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum();  //不良数量
                                    decimal bad_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("BAD_QTY")).Sum();  //报废数量
                                    decimal kbqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()) - (good_qty + ng_qty+bad_qty); //剩余可报工数量=任务数量-(报工数量+不良数量+报废数量)
                                    if (kbqty <= 0)//无可报工数量
                                    {
                                        mes.code = "300";
                                        mes.count = 0;
                                        mes.Message = "当前工序无可报工数量!";
                                        mes.data = null;
                                        return mes;
                                    }
                                    else
                                    {
                                        rt.eqpcode = data0.Rows[0]["code"].ToString();                              //开工设备编码
                                        rt.eqpname = data0.Rows[0]["name"].ToString();                              //开工设备名称
                                        rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString());            //任务数量
                                        rt.startqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString());           //开工数量=任务数量
                                        rt.noreportqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()) - good_qty- ng_qty-bad_qty;  //未报数量=任务数量-已报数量-不良数量-报废数量
                                        rt.reportqty = good_qty + ng_qty+bad_qty;             //已报数量=报工数量+不良数量+报废数量
                                        mes.code = "200";
                                        mes.count = 1;
                                        mes.Message = "弹窗报工界面!";
                                        mes.data = rt;
                                    }
                                    mes.code = "300";
                                    mes.count = 0;
                                    mes.Message = "当前工序无可报工数量!";
                                    mes.data = null;
                                    return mes;
                                }
                                else
                                {
                                    rt.eqpcode = data0.Rows[0]["code"].ToString();                              //开工设备编码
                                    rt.eqpname = data0.Rows[0]["name"].ToString();                              //开工设备名称
                                    rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //任务数量
                                    rt.startqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //开工数量
                                    rt.noreportqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //未报数量
                                    rt.reportqty = 0;                                                    //已报数量
                                    rt.noreportqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()) - good_qty - ng_qty - laborbad_qty - materielbad_qty;  //未报数量=任务数量-已报数量-不良数量-工废数量-料废数量
                                    rt.reportqty = good_qty + ng_qty + laborbad_qty+ materielbad_qty;             //已报数量=报工数量+不良数量+工废数量+料废数量
                                    mes.code = "200";
                                    mes.count = 1;
                                    mes.Message = "弹窗报工界面!";
                                    mes.Message = "查找成功!";
                                    mes.data = rt;
                                }
                            }
                            else
                            {
                                rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //任务数量
                                rt.startqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //开工数量
                                rt.noreportqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //未报数量
                                rt.reportqty = 0;                                                    //已报数量
                                mes.code = "200";
                                mes.count = 0;
                                mes.Message = "弹窗开工界面!";
                                mes.count = 1;
                                mes.Message = "查找成功!";
                                mes.data = rt;
                            }
                        }
                        else   //非首道工序
                        {
                            //查找当前工序上到工序(自制或者外协)
                            sql = @"select A.step_code,S.stepname,S.flwtype  from TFlw_Rtdt A
                                               left join TK_Wrk_Man M on A.rout_code=M.route_code
                                               left join TStep S on A.step_code=S.stepcode
                                               where M.wo_code=@wocode  and A.seq=@seq-1";
                            sql = @"select A.step_code,S.stepname,S.flwtype   from TK_Wrk_Step A
                                    left join TStep S on A.step_code=S.stepcode
                                    where A.wo_code=@wocode  and A.seq=@seq-1";
                            dynamicParams.Add("@wocode", data.Rows[0]["WO_CODE"].ToString());
                            dynamicParams.Add("@seq", decimal.Parse(data.Rows[0]["SEQ"].ToString()));
                            var data0 = DapperHelper.selectdata(sql, dynamicParams);
                            if (data0.Rows.Count > 0)
                            {
                                //1.非首道工序时,判断本道是否有开工记录
                                sql = @"select *   from TK_Wrk_Record R
                                        left join TEqpInfo E on R.eqp_code=E.code
                                        where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'";
                                //非首道工序时,判断本道是否有报工记录
                                sql = @"select *   from TK_Wrk_Record where wo_code=@ordercode and step_code=@stepcode and style='B'";
                                dynamicParams.Add("@ordercode", ordercode);
                                dynamicParams.Add("@stepcode", stepcode);
                                var data1 = DapperHelper.selectdata(sql, dynamicParams);
                                if (data1.Rows.Count > 0)//本道有开工记录
                                var data2 = DapperHelper.selectdata(sql, dynamicParams);
                                if (data2.Rows.Count > 0) //有报工记录
                                {
                                    //非首道工序时,判断本道是否有报工记录
                                    sql = @"select *   from TK_Wrk_Record where wo_code=@ordercode and step_code=@stepcode and style='B'";
                                    dynamicParams.Add("@ordercode", ordercode);
                                    dynamicParams.Add("@stepcode", stepcode);
                                    var data2 = DapperHelper.selectdata(sql, dynamicParams);
                                    if (data2.Rows.Count > 0) //有报工记录
                                    if (data0.Rows[0]["FLWTYPE"].ToString() == "Z")  //判断上道工序属性:自制工序
                                    {
                                        if (data0.Rows[0]["FLWTYPE"].ToString() == "Z")  //判断上道工序属性:自制工序
                                        //查找上到工序报工记录
                                        sql = @"select *   from TK_Wrk_Record where wo_code=@ordercode and step_code=@stepcode and style='B'";
                                        dynamicParams.Add("@ordercode", ordercode);
                                        dynamicParams.Add("@stepcode", data0.Rows[0]["STEP_CODE"].ToString());
                                        var data3 = DapperHelper.selectdata(sql, dynamicParams);
                                        if (data3.Rows.Count > 0) //上道有报工
                                        {
                                            //查找上到工序报工记录
                                            sql = @"select *   from TK_Wrk_Record where wo_code=@ordercode and step_code=@stepcode and style='B'";
                                            dynamicParams.Add("@ordercode", ordercode);
                                            dynamicParams.Add("@stepcode", data0.Rows[0]["STEP_CODE"].ToString());
                                            var data3 = DapperHelper.selectdata(sql, dynamicParams);
                                            if (data3.Rows.Count > 0) //上道有报工
                                            {
                                                decimal sgood_qty = data3.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum();  //上道报工总数量
                                                decimal good_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum();  //本道报工总数量
                                                decimal ng_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum();  //本道不良总数量
                                                decimal bad_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("BAD_QTY")).Sum();  //本道总报废数量
                                                decimal sybqty = sgood_qty - good_qty - ng_qty-bad_qty;//本道剩余可报数量=上道报工总数量-本道报工总数量-本道不良总数量-本道报废总数
                                                if (sybqty <= 0)
                                                {
                                                    mes.code = "300";
                                                    mes.count = 0;
                                                    mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + "无可报数量!";
                                                    mes.data = null;
                                                    return mes;
                                                }
                                                else
                                                {
                                                    if (sgood_qty == null || sgood_qty == 0)
                                                    {
                                                        mes.code = "300";
                                                        mes.count = 0;
                                                        mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序:" + data0.Rows[0]["STEPNAME"].ToString() + " 合格产出为0,本道不允许开报工!";
                                                        mes.data = null;
                                                        return mes;
                                                    }
                                                    rt.eqpcode = data1.Rows[0]["code"].ToString();                              //开工设备编码
                                                    rt.eqpname = data1.Rows[0]["name"].ToString();                              //开工设备名称
                                                    rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //任务数量
                                                    rt.startqty = sybqty;                                                //开工数量=本道剩余可报数量
                                                    rt.noreportqty = sybqty;                                             //未报数量=本道剩余可报数量
                                                    rt.reportqty = good_qty + ng_qty+bad_qty;                            //已报数量=本道报工总数量+本道报工总不良+本道报废总数
                                                    mes.code = "200";
                                                    mes.count = 1;
                                                    mes.Message = "弹窗报工界面!";
                                                    mes.data = rt;
                                                }
                                            }
                                            else
                                            decimal sgood_qty = data3.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum();  //上道报工总数量
                                            decimal good_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum();  //本道报工总数量
                                            decimal ng_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum();  //本道不良总数量
                                            decimal laborbad_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("LABORBAD_QTY")).Sum();  //本道总工废数量
                                            decimal materielbad_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("MATERIELBAD_QTY")).Sum();  //本道总料废数量
                                            //本道剩余可报数量=上道报工总数量-本道报工总数量-本道不良总数量-本道工废总数-本道料废总数
                                            decimal sybqty = sgood_qty - good_qty - ng_qty - laborbad_qty- materielbad_qty;
                                            if (sybqty <= 0)
                                            {
                                                mes.code = "300";
                                                mes.count = 0;
                                                mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序:" + data0.Rows[0]["STEPNAME"].ToString() + " 未报工,本道不允许开报工!";
                                                mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + "无可报数量!";
                                                mes.data = null;
                                                return mes;
                                            }
                                        }
                                        if (data0.Rows[0]["FLWTYPE"].ToString() == "W")  //判断上道工序属性:委外工序
                                        {
                                            //查找上到工序收料记录
                                            sql = @"select *   from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='S'";
                                            dynamicParams.Add("@ordercode", ordercode);
                                            dynamicParams.Add("@stepcode", data0.Rows[0]["STEP_CODE"].ToString());
                                            var data3 = DapperHelper.selectdata(sql, dynamicParams);
                                            if (data3.Rows.Count > 0) //上道有收料
                                            {
                                                decimal sqty = data3.AsEnumerable().Select(d => d.Field<decimal>("SQTY")).Sum();  //上道收料数量
                                                decimal good_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum();  //本道报工总数量
                                                decimal ng_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum();  //本道不良总数量
                                                decimal bad_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("BAD_QTY")).Sum();  //本道总报废数量
                                                decimal sybqty = sqty - good_qty - ng_qty-bad_qty;//本道剩余可报数量=上道收料总数量-本道报工总数量-本道不良总数量-本道总报废数
                                                if (sybqty <= 0)
                                                {
                                                    mes.code = "300";
                                                    mes.count = 0;
                                                    mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + "无可报数量!";
                                                    mes.data = null;
                                                    return mes;
                                                }
                                                else
                                                {
                                                    if (sqty == null || sqty == 0)
                                                    {
                                                        mes.code = "300";
                                                        mes.count = 0;
                                                        mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序:" + data0.Rows[0]["STEPNAME"].ToString() + " 合格收料为0,本道不允许开报工!";
                                                        mes.data = null;
                                                        return mes;
                                                    }
                                                    rt.eqpcode = data1.Rows[0]["code"].ToString();                              //开工设备编码
                                                    rt.eqpname = data1.Rows[0]["name"].ToString();                              //开工设备名称
                                                    rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //任务数量
                                                    rt.startqty = sybqty;                                                //开工数量=本道剩余可报数量
                                                    rt.noreportqty = sybqty;                                             //未报数量=本道剩余可报数量
                                                    rt.reportqty = good_qty + ng_qty+bad_qty;                            //已报数量=本道报工总数量+本道报工总不良+本道总报废数
                                                    mes.code = "200";
                                                    mes.count = 1;
                                                    mes.Message = "弹窗报工界面!";
                                                    mes.data = rt;
                                                }
                                            }
                                            else
                                            {
                                                mes.code = "300";
                                                mes.count = 0;
                                                mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序:" + data0.Rows[0]["STEPNAME"].ToString() + " 未收料,本道不允许开报工,请前往外协操作页执行!";
                                                mes.data = null;
                                                return mes;
                                            }
                                        }
                                    }
                                    else  //本道无报工记录
                                    {
                                        if (data0.Rows[0]["FLWTYPE"].ToString() == "Z")  //自制工序
                                        {
                                            //查找上到工序报工记录
                                            sql = @"select *   from TK_Wrk_Record where wo_code=@ordercode and step_code=@stepcode and style='B'";
                                            dynamicParams.Add("@ordercode", ordercode);
                                            dynamicParams.Add("@stepcode", data0.Rows[0]["STEP_CODE"].ToString());
                                            var data3 = DapperHelper.selectdata(sql, dynamicParams);
                                            if (data3.Rows.Count > 0) //上道有报工
                                            {
                                                decimal sgood_qty = data3.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum();  //上道报工总数量
                                                decimal sybqty = sgood_qty;                                      //本道剩余可报数量=上道报工数量
                                                if (sgood_qty == null || sgood_qty == 0)
                                                {
                                                    mes.code = "300";
                                                    mes.count = 0;
                                                    mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序:" + data0.Rows[0]["STEPNAME"].ToString() + " 合格产出为0,本道不允许开报工!";
                                                    mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序:" + data0.Rows[0]["STEPNAME"].ToString() + " 合格产出为0,本道不允许报工!";
                                                    mes.data = null;
                                                    return mes;
                                                }
                                                rt.eqpcode = data1.Rows[0]["code"].ToString();                              //开工设备编码
                                                rt.eqpname = data1.Rows[0]["name"].ToString();                              //开工设备名称
                                                rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //任务数量
                                                rt.startqty = sybqty;                                                //开工数量=本道剩余可报数量
                                                rt.noreportqty = sybqty;                                             //未报数量=本道剩余可报数量
                                                rt.reportqty = 0;                                                    //已报数量
                                                rt.noreportqty = sybqty;                                         //未报数量=本道剩余可报数量
                                                rt.reportqty = good_qty + ng_qty + laborbad_qty+ materielbad_qty;//已报数量=本道报工总数量+本道报工总不良+本道工废总数+本道料废总数
                                                mes.code = "200";
                                                mes.count = 1;
                                                mes.Message = "弹窗报工界面!";
                                                mes.data = rt;
                                            }
                                            else
                                        }
                                        else
                                        {
                                            mes.code = "300";
                                            mes.count = 0;
                                            mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序:" + data0.Rows[0]["STEPNAME"].ToString() + " 未报工,本道不允许报工!";
                                            mes.data = null;
                                            return mes;
                                        }
                                    }
                                    if (data0.Rows[0]["FLWTYPE"].ToString() == "W")  //判断上道工序属性:委外工序
                                    {
                                        //查找上到工序收料记录
                                        sql = @"select *   from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='S'";
                                        dynamicParams.Add("@ordercode", ordercode);
                                        dynamicParams.Add("@stepcode", data0.Rows[0]["STEP_CODE"].ToString());
                                        var data3 = DapperHelper.selectdata(sql, dynamicParams);
                                        if (data3.Rows.Count > 0) //上道有收料
                                        {
                                            decimal sqty = data3.AsEnumerable().Select(d => d.Field<decimal>("SQTY")).Sum();  //上道收料数量
                                            decimal good_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum();  //本道报工总数量
                                            decimal ng_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum();  //本道不良总数量
                                            decimal laborbad_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("LABORBAD_QTY")).Sum();  //本道总工废数量
                                            decimal materielbad_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("MATERIELBAD_QTY")).Sum();  //本道总料废数量
                                            //本道剩余可报数量=上道收料总数量-本道报工总数量-本道不良总数量-本道总工废数量-本道总料废数量
                                            decimal sybqty = sqty - good_qty - ng_qty - laborbad_qty- materielbad_qty;
                                            if (sybqty <= 0)
                                            {
                                                mes.code = "300";
                                                mes.count = 0;
                                                mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序:" + data0.Rows[0]["STEPNAME"].ToString() + " 未报工,本道不允许开报工!";
                                                mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + "无可报数量!";
                                                mes.data = null;
                                                return mes;
                                            }
                                        }
                                        if (data0.Rows[0]["FLWTYPE"].ToString() == "W")  //委外工序
                                        {
                                            //查找上到工序收料记录
                                            sql = @"select *   from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='S'";
                                            dynamicParams.Add("@ordercode", ordercode);
                                            dynamicParams.Add("@stepcode", data0.Rows[0]["STEP_CODE"].ToString());
                                            var data3 = DapperHelper.selectdata(sql, dynamicParams);
                                            if (data3.Rows.Count > 0) //上道有收料
                                            else
                                            {
                                                decimal sqty = data3.AsEnumerable().Select(d =>d.Field<decimal>("SQTY")).Sum();//上道收料数量
                                                decimal sybqty = sqty;                   //本道剩余可收数量=上道收料数量
                                                if (sqty == null || sqty == 0)
                                                {
                                                    mes.code = "300";
@@ -387,29 +253,26 @@
                                                    mes.data = null;
                                                    return mes;
                                                }
                                                rt.eqpcode = data1.Rows[0]["code"].ToString();                              //开工设备编码
                                                rt.eqpname = data1.Rows[0]["name"].ToString();                              //开工设备名称
                                                rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //任务数量
                                                rt.startqty = sybqty;                                                //开工数量=本道剩余可收数量
                                                rt.noreportqty = sybqty;                                             //未报数量=本道剩余可收数量
                                                rt.reportqty = 0;                                                    //已报数量
                                                rt.noreportqty = sybqty;                                         //未报数量=本道剩余可报数量
                                                rt.reportqty = good_qty + ng_qty + laborbad_qty+materielbad_qty; //已报数量=本道报工总数量+本道报工总不良+本道总工废数+本道总料废数
                                                mes.code = "200";
                                                mes.count = 1;
                                                mes.Message = "弹窗报工界面!";
                                                mes.Message = "查找成功!";
                                                mes.data = rt;
                                            }
                                            else
                                            {
                                                mes.code = "300";
                                                mes.count = 0;
                                                mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序:" + data0.Rows[0]["STEPNAME"].ToString() + " 未收料,本道不允许开报工,请前往外协操作页执行!";
                                                mes.data = null;
                                                return mes;
                                            }
                                        }
                                        else
                                        {
                                            mes.code = "300";
                                            mes.count = 0;
                                            mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序:" + data0.Rows[0]["STEPNAME"].ToString() + " 未收料,本道不允许开报工,请前往外协操作页执行!";
                                            mes.data = null;
                                            return mes;
                                        }
                                    }
                                }
                                else //无开工记录
                                else  //本道无报工记录
                                {
                                    if (data0.Rows[0]["FLWTYPE"].ToString() == "Z")  //自制工序
                                    {
@@ -417,13 +280,12 @@
                                        sql = @"select *   from TK_Wrk_Record where wo_code=@ordercode and step_code=@stepcode and style='B'";
                                        dynamicParams.Add("@ordercode", ordercode);
                                        dynamicParams.Add("@stepcode", data0.Rows[0]["STEP_CODE"].ToString());
                                        var data2 = DapperHelper.selectdata(sql, dynamicParams);
                                        if (data2.Rows.Count > 0) //上到工序有报工
                                        var data3 = DapperHelper.selectdata(sql, dynamicParams);
                                        if (data3.Rows.Count > 0) //上道有报工
                                        {
                                            decimal good_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum();//报工数量
                                            decimal ng_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum();// 不良数量
                                            decimal bad_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("BAD_QTY")).Sum();// 报废数量
                                            if (good_qty == null || good_qty == 0)
                                            decimal sgood_qty = data3.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum();  //上道报工总数量
                                            decimal sybqty = sgood_qty;                                      //本道剩余可报数量=上道报工数量
                                            if (sgood_qty == null || sgood_qty == 0)
                                            {
                                                mes.code = "300";
                                                mes.count = 0;
@@ -431,36 +293,34 @@
                                                mes.data = null;
                                                return mes;
                                            }
                                            rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString());     //任务数量
                                            rt.startqty = good_qty;                               //开工数量=(上一道的报工总数量)
                                            rt.noreportqty = good_qty;                            //未报数量=(上一道的报工总数量)
                                            rt.reportqty = 0;                                                    //已报数量
                                            rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //任务数量
                                            rt.noreportqty = sybqty;                                         //未报数量=本道剩余可报数量
                                            rt.reportqty = 0;                                                //已报数量
                                            mes.code = "200";
                                            mes.count = 0;
                                            mes.Message = "弹窗开工界面!";
                                            mes.count = 1;
                                            mes.Message = "查找成功!";
                                            mes.data = rt;
                                        }
                                        else
                                        {
                                            mes.code = "300";
                                            mes.count = 0;
                                            mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序:" + data0.Rows[0]["STEPNAME"].ToString() + " 未报工,本道不允许开报工!";
                                            mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序:" + data0.Rows[0]["STEPNAME"].ToString() + " 未报工,本道不允许报工!";
                                            mes.data = null;
                                            return mes;
                                        }
                                    }
                                    if (data0.Rows[0]["FLWTYPE"].ToString() == "W")  //委外工序
                                    {
                                        //查找上道工序外协收料记录
                                        //查找上到工序收料记录
                                        sql = @"select *   from TK_Wrk_OutRecord where wo_code=@ordercode and step_code=@stepcode and style='S'";
                                        dynamicParams.Add("@ordercode", ordercode);
                                        dynamicParams.Add("@stepcode", data0.Rows[0]["STEP_CODE"].ToString());
                                        var data2 = DapperHelper.selectdata(sql, dynamicParams);
                                        if (data2.Rows.Count > 0) //上道工序有收料
                                        var data3 = DapperHelper.selectdata(sql, dynamicParams);
                                        if (data3.Rows.Count > 0) //上道有收料
                                        {
                                            decimal sqty = data2.AsEnumerable().Select(d => d.Field<decimal>("SQTY")).Sum();//收料数量
                                            decimal ng_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum();// 不良数量
                                            decimal bad_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("BAD_QTY")).Sum();// 报废数量
                                            decimal sqty = data3.AsEnumerable().Select(d => d.Field<decimal>("SQTY")).Sum();//上道收料数量
                                            decimal sybqty = sqty;                   //本道剩余可收数量=上道收料数量
                                            if (sqty == null || sqty == 0)
                                            {
                                                mes.code = "300";
@@ -469,20 +329,19 @@
                                                mes.data = null;
                                                return mes;
                                            }
                                            rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString());     //任务数量
                                            rt.startqty = sqty;                                                  //开工数量=(上一道的收料数量)
                                            rt.noreportqty = sqty;                                               //未报数量=(上一道的收料数量)
                                            rt.reportqty = 0;                                                    //已报数量
                                            rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //任务数量
                                            rt.noreportqty = sybqty;                                         //未报数量=本道剩余可收数量
                                            rt.reportqty = 0;                                                //已报数量
                                            mes.code = "200";
                                            mes.count = 0;
                                            mes.Message = "弹窗开工界面!";
                                            mes.count = 1;
                                            mes.Message = "查找成功!";
                                            mes.data = rt;
                                        }
                                        else
                                        {
                                            mes.code = "300";
                                            mes.count = 0;
                                            mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序:" + data0.Rows[0]["STEPNAME"].ToString() + " 未收料,本道不允许开报工,请前往外协操作页执行!";
                                            mes.Message = "当前工序:" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序:" + data0.Rows[0]["STEPNAME"].ToString() + " 未收料,本道不允许报工,请前往外协操作页执行!";
                                            mes.data = null;
                                            return mes;
                                        }
@@ -503,7 +362,7 @@
                    case "W":  //外协工序
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "当前标签为外协标签,请前往外协操作标签页扫码!";
                        mes.Message = "当前工单工序任务为外协,请前往外协操作标签页操作!";
                        mes.data = null;
                        break;
                    default:   //自制+外协工序
@@ -527,12 +386,11 @@
        /// <summary>
        /// 生产开报工:外协工序任务开报工判断:工单号+工序
        /// </summary>
        /// <param name="stu_torgcode">所属组织编码</param>
        /// <param name="SelectType">操作类型</param>
        /// <param name="ordercode">工单编号</param>
        /// <param name="stepcode">工序编码</param>
        /// <returns></returns>
        public static ToMessage WXEncodingSeach(string stu_torgcode, string SelectType, string ordercode, string stepcode)
        public static ToMessage WXEncodingSeach(string SelectType, string ordercode, string stepcode)
        {
            var sql = "";
            string flwtype = ""; //工序属性
@@ -545,29 +403,14 @@
            try
            {
                //判断当前工单是否关闭
                sql = @"select *   from TK_Wrk_Man where wo_code=@ordercode and wkshp_code=@stu_torgcode and status='CLOSED'";
                sql = @"select *   from TK_Wrk_Man where wo_code=@ordercode and status='CLOSED'";
                dynamicParams.Add("@ordercode", ordercode);
                dynamicParams.Add("@stu_torgcode", stu_torgcode);
                var da0 = DapperHelper.selectdata(sql, dynamicParams);
                if (da0.Rows.Count > 0)
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "当前工单已关闭,不允许开报工操作!";
                    mes.data = null;
                    return mes;
                }
                //0.判断当前工单所属车间是否为当前登录人员车间
                sql = @"select *   from TK_Wrk_Man where wo_code=@ordercode and wkshp_code=@stu_torgcode";
                dynamicParams.Add("@ordercode", ordercode);
                dynamicParams.Add("@stu_torgcode", stu_torgcode);
                var da1 = DapperHelper.selectdata(sql, dynamicParams);
                if (da1.Rows.Count <= 0)
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "不是本车间生产任务,不允许操作!";
                    mes.data = null;
                    return mes;
                }
@@ -651,9 +494,10 @@
                                    if (data0.Rows.Count > 0)  //有发料记录
                                    {
                                        decimal fqty = data0.AsEnumerable().Select(d => d.Field<decimal>("FQTY")).Sum();  //发料数量
                                        decimal ng_qty =data0.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum();// 不良数量
                                        decimal bad_qty = data0.AsEnumerable().Select(d => d.Field<decimal>("BAD_QTY")).Sum();  //报废数量
                                        decimal kfqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()) - fqty - ng_qty- bad_qty;  //剩余可发数量
                                        decimal ng_qty = data0.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum();// 不良数量
                                        decimal laborbad_qty = data0.AsEnumerable().Select(d => d.Field<decimal>("LABORBAD_QTY")).Sum();  //工废数量
                                        decimal materielbad_qty = data0.AsEnumerable().Select(d => d.Field<decimal>("MATERIELBAD_QTY")).Sum();  //料废数量
                                        decimal kfqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()) - fqty - ng_qty - laborbad_qty-materielbad_qty; //剩余可发数量
                                        if (kfqty <= 0)
                                        {
                                            mes.code = "300";
@@ -670,7 +514,7 @@
                                            rt.startqty = kfqty;                                                 //发料数量=剩余可发数量      
                                            mes.code = "200";
                                            mes.count = 2;
                                            mes.Message = "弹窗发料界面!";
                                            mes.Message = "查询成功!";
                                            mes.data = rt;
                                        }
                                    }
@@ -689,10 +533,9 @@
                                else //非首道
                                {
                                    //查找当前工序上到工序(自制或者外协)
                                    sql = @"select A.step_code,S.stepname,S.flwtype  from TFlw_Rtdt A
                                               left join TK_Wrk_Man M on A.rout_code=M.route_code
                                               left join TStep S on A.step_code=S.stepcode
                                               where M.wo_code=@wocode  and A.seq=@seq-1";
                                    sql = @"select A.step_code,S.stepname,S.flwtype   from TK_Wrk_Step A
                                            left join TStep S on A.step_code=S.stepcode
                                            where A.wo_code=@wocode  and A.seq=@seq-1";
                                    dynamicParams.Add("@wocode", data.Rows[0]["WO_CODE"].ToString());
                                    dynamicParams.Add("@seq", decimal.Parse(data.Rows[0]["SEQ"].ToString()));
                                    var data0 = DapperHelper.selectdata(sql, dynamicParams);
@@ -719,9 +562,10 @@
                                                    decimal sgood_qty = data3.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum();  //本道报工总数量
                                                    decimal sqty = data1.AsEnumerable().Select(d => d.Field<decimal>("FQTY")).Sum();//本道发料数量
                                                    decimal ng_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum();// 本道不良数量
                                                    decimal bad_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("BAD_QTY")).Sum();  //本道报废数量
                                                    decimal sybqty =sgood_qty - sqty - ng_qty- bad_qty;//本道剩余可发数量=上道报工数量-本道发料数量-本道不良数量-本道报废数量
                                                    decimal laborbad_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("LABORBAD_QTY")).Sum();  //本道工废数量
                                                    decimal materielbad_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("MATERIELBAD_QTY")).Sum();  //本道料废数量
                                                    //本道剩余可发数量=上道报工数量-本道发料数量-本道不良数量-本道工废数量-本道料废数量
                                                    decimal sybqty = sgood_qty - sqty - ng_qty - laborbad_qty- materielbad_qty;
                                                    if (sybqty <= 0)
                                                    {
                                                        mes.code = "300";
@@ -742,7 +586,7 @@
                                                        }
                                                        rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString());     //任务数量
                                                        rt.noreportqty = sybqty;                                             //未发数量=剩余可发数量
                                                        rt.reportqty = sqty + ng_qty+bad_qty;                                //已发数量= 本道发料数量+本道不良数量+本道报废数量
                                                        rt.reportqty = sqty + ng_qty + laborbad_qty+ materielbad_qty;       //已发数量= 本道发料数量+本道不良数量+本道工废数量+本道料废数量
                                                        rt.startqty = sybqty;                                                //收料数量=剩余可发数量      
                                                        mes.code = "200";
@@ -772,9 +616,10 @@
                                                    decimal ssqty = data3.AsEnumerable().Select(d => d.Field<decimal>("SQTY")).Sum();//上道收料数量
                                                    decimal sqty = data1.AsEnumerable().Select(d => d.Field<decimal>("FQTY")).Sum();//本道发料数量
                                                    decimal ng_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum();// 本道不良数量
                                                    decimal bad_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("BAD_QTY")).Sum();  //本道报废数量
                                                    decimal sybqty = ssqty - sqty - ng_qty-bad_qty;//本道剩余可发数量=上道收料数量-本道发料数量-本道不良数量-本道报废数量
                                                    decimal laborbad_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("LABORBAD_QTY")).Sum();  //本道工废数量
                                                    decimal materielbad_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("MATERIELBAD_QTY")).Sum();  //本道料废数量
                                                    //本道剩余可发数量=上道收料数量-本道发料数量-本道不良数量-本道工废数量-本道料废数量
                                                    decimal sybqty = ssqty - sqty - ng_qty - laborbad_qty-materielbad_qty;
                                                    if (sybqty <= 0)
                                                    {
                                                        mes.code = "300";
@@ -795,7 +640,7 @@
                                                        }
                                                        rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString());     //任务数量
                                                        rt.noreportqty = sybqty;                                             //未发数量=剩余可发数量
                                                        rt.reportqty = sqty + ng_qty+bad_qty;                                //已发数量= 本道发料数量+本道不良数量+本道报废数量
                                                        rt.reportqty = sqty + ng_qty + laborbad_qty+materielbad_qty;         //已发数量= 本道发料数量+本道不良数量+本道工废数量+本道料废数量
                                                        rt.startqty = sybqty;                                                //收料数量=剩余可发数量      
                                                        mes.code = "200";
@@ -962,8 +807,10 @@
                                            decimal fqty = data0.AsEnumerable().Select(d => d.Field<decimal>("FQTY")).Sum();//本道发料数量
                                            decimal sqty = data1.AsEnumerable().Select(d => d.Field<decimal>("SQTY")).Sum();//本道收料数量
                                            decimal ng_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum();//本道不良数量
                                            decimal bad_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("BAD_QTY")).Sum();  //本道报废数量
                                            decimal ksqty = fqty - sqty - ng_qty-bad_qty;  //剩余可发数量=本道发料数量-本道收料数量-本道不良数量-本道报废数量
                                            decimal laborbad_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("LABORBAD_QTY")).Sum();  //本道工废数量
                                            decimal materielbad_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("MATERIELBAD_QTY")).Sum();  //本道料废数量
                                            //剩余可发数量=本道发料数量-本道收料数量-本道不良数量-本道工废数量-本道料废数量
                                            decimal ksqty = fqty - sqty - ng_qty - laborbad_qty-materielbad_qty;
                                            if (ksqty <= 0)
                                            {
                                                mes.code = "300";
@@ -976,16 +823,18 @@
                                            {
                                                rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString());     //任务数量
                                                rt.noreportqty = ksqty;                                              //未收数量=本道发料数量
                                                rt.reportqty = sqty + ng_qty+bad_qty;                                //已收数量
                                                rt.reportqty = sqty + ng_qty + laborbad_qty+materielbad_qty;          //已收数量
                                                rt.startqty = ksqty;                                                  //收料数量=本道发料数量      
                                                data0.Merge(data1);//将指定的dt合并                                                 
                                                rt.list = data0.AsEnumerable().GroupBy(r => new {
                                                rt.list = data0.AsEnumerable().GroupBy(r => new
                                                {
                                                    wo_code = r["wo_code"],
                                                    step_code = r["step_code"],
                                                    code = r["code"],
                                                    name = r["name"]
                                                }).Select(g => new {
                                                }).Select(g => new
                                                {
                                                    Name = g.Key.code,
                                                    tp = g.Key.name,
                                                    fqty = g.Sum(i => (decimal)i["fqty"]),
@@ -1010,12 +859,14 @@
                                            rt.startqty = fqty;                                                  //收料数量=本道发料数量
                                                                                                                 //
                                            data0.Merge(data1);//将指定的dt合并                                                 
                                            rt.list = data0.AsEnumerable().GroupBy(r => new {
                                            rt.list = data0.AsEnumerable().GroupBy(r => new
                                            {
                                                wo_code = r["wo_code"],
                                                step_code = r["step_code"],
                                                code = r["code"],
                                                name = r["name"]
                                            }).Select(g => new {
                                            }).Select(g => new
                                            {
                                                Name = g.Key.code,
                                                tp = g.Key.name,
                                                fqty = g.Sum(i => (decimal)i["fqty"]),
@@ -1042,10 +893,9 @@
                                else //非首道
                                {
                                    //查找当前工序上到工序(自制或者外协)
                                    sql = @"select A.step_code,S.stepname,S.flwtype  from TFlw_Rtdt A
                                               left join TK_Wrk_Man M on A.rout_code=M.route_code
                                               left join TStep S on A.step_code=S.stepcode
                                               where M.wo_code=@wocode  and A.seq=@seq-1";
                                    sql = @"select A.step_code,S.stepname,S.flwtype   from TK_Wrk_Step A
                                            left join TStep S on A.step_code=S.stepcode
                                            where A.wo_code=@wocode  and A.seq=@seq-1";
                                    dynamicParams.Add("@wocode", data.Rows[0]["WO_CODE"].ToString());
                                    dynamicParams.Add("@seq", decimal.Parse(data.Rows[0]["SEQ"].ToString()));
                                    var data0 = DapperHelper.selectdata(sql, dynamicParams);
@@ -1078,8 +928,10 @@
                                                decimal fqty = data1.AsEnumerable().Select(d => d.Field<decimal>("FQTY")).Sum();//本道发料数量
                                                decimal sqty = data2.AsEnumerable().Select(d => d.Field<decimal>("SQTY")).Sum();//本道收料数量
                                                decimal ng_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum();//本道不良数量
                                                decimal bad_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("BAD_QTY")).Sum();  //本道报废数量
                                                decimal ksqty = fqty - sqty - ng_qty-bad_qty;//剩余可发数量=本道发料数量-本道收料数量-本道不良数量-本道报废数量
                                                decimal laborbad_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("LABORBAD_QTY")).Sum();  //本道工废数量
                                                decimal materielbad_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("MATERIELBAD_QTY")).Sum();  //本道料废数量
                                                //剩余可发数量=本道发料数量-本道收料数量-本道不良数量-本道工废数量-本道料废数量
                                                decimal ksqty = fqty - sqty - ng_qty - laborbad_qty- materielbad_qty;
                                                if (ksqty <= 0)
                                                {
                                                    mes.code = "300";
@@ -1092,24 +944,26 @@
                                                {
                                                    rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString());     //任务数量
                                                    rt.noreportqty = ksqty;                                              //未收数量=本道发料数量
                                                    rt.reportqty = sqty + ng_qty+bad_qty;                                 //已收数量
                                                    rt.reportqty = sqty + ng_qty + laborbad_qty+materielbad_qty;         //已收数量
                                                    rt.startqty = ksqty;                                                  //收料数量=本道发料数量      
                                                    data1.Merge(data2);//将指定的dt合并                                                 
                                                    rt.list = data1.AsEnumerable().GroupBy(r => new {
                                                        wo_code = r["wo_code"],
                                                    rt.list = data1.AsEnumerable().GroupBy(r => new
                                                    {
                                                        wo_code = r["wo_code"],
                                                        step_code = r["step_code"],
                                                        code= r["code"],
                                                        code = r["code"],
                                                        name = r["name"]
                                                    }).Select(g => new {
                                                        Name = g.Key.code,
                                                        tp = g.Key.name,
                                                    }).Select(g => new
                                                    {
                                                        Name = g.Key.code,
                                                        tp = g.Key.name,
                                                        fqty = g.Sum(i => (decimal)i["fqty"]),
                                                        sqty = g.Sum(i => (decimal)i["sqty"]),
                                                        ng_qty = g.Sum(i => (decimal)i["ng_qty"]),
                                                        bad_qty = g.Sum(i => (decimal)i["bad_qty"])
                                                    }).ToList();
                                                    mes.code = "200";
                                                    mes.count = 3;
                                                    mes.Message = "弹窗收料界面!";
@@ -1124,12 +978,14 @@
                                                rt.reportqty = 0;                                                    //已收数量                                   
                                                rt.startqty = fqty;                                                  //收料数量=本道发料数量      
                                                data1.Merge(data2);//将指定的dt合并                                                 
                                                rt.list = data1.AsEnumerable().GroupBy(r => new {
                                                rt.list = data1.AsEnumerable().GroupBy(r => new
                                                {
                                                    wo_code = r["wo_code"],
                                                    step_code = r["step_code"],
                                                    code = r["code"],
                                                    name = r["name"]
                                                }).Select(g => new {
                                                }).Select(g => new
                                                {
                                                    Name = g.Key.code,
                                                    tp = g.Key.name,
                                                    fqty = g.Sum(i => (decimal)i["fqty"]),