1.生产进度报表查询参数删减 2.新工单带出历史最新一次工序信息查询接口修改

yl

2024-03-22 dc708ece0dce875d0d296ba56f8b59ae6f392e27

 VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs

@@ -7,6 +7,7 @@
using System.Linq;
using System.Threading.Tasks;
using VueWebCoreApi.Models;
using VueWebCoreApi.Models.ErpOrder;
using VueWebCoreApi.Models.ReportVerify;
using VueWebCoreApi.Models.UpdateReport;
using VueWebCoreApi.Models.WorkData;
@@ -26,7 +27,7 @@


        #region[ERP订单查询]
        public static ToMessage ErpOrderSearch(string erporderstus, string erpordercode, string saleordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
        public static ToMessage ErpOrderSearch(string erporderstus, string wkshopcode, string erpordercode, string saleordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -36,6 +37,11 @@
                {
                    search += "and A.status=@erporderstus ";
                    dynamicParams.Add("@erporderstus", erporderstus);
                }
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and A.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (erpordercode != "" && erpordercode != null)
                {
@@ -87,7 +93,7 @@
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.id, A.status,A.wo,A.materiel_code as partcode,B.partname,B.partspec,A.qty,A.relse_qty,A.wkshp_code,C.torg_name as wkshp_name,
                            A.stck_code,D.name as stck_name,A.saleOrderCode,A.saleOrderDeliveryDate,A.planstartdate,A.planenddate,U.username as createuser,A.createdate,A.sbid 
                            A.stck_code,D.name as stck_name,A.saleOrderCode,A.saleOrderDeliveryDate,A.planstartdate,A.planenddate,U.username as createuser,A.createdate,A.sbid,A.clerkuser
                            from TKimp_Ewo A
                            left join TMateriel_Info B on A.materiel_code=B.partcode
                            left join TOrganization C on A.wkshp_code=C.torg_code
@@ -96,7 +102,7 @@
                            where A.is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.message = "查询成功!";
                mes.count = total;
                mes.data = data.ToList();
            }
@@ -104,7 +110,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -112,7 +118,7 @@
        #endregion

        #region[ERP订单下达]
        public static ToMessage MarkSaveErpOrder(string erporderid, string sbid, string erpordercode, string saleordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string saleOrderDeliveryDate, User us)
        public static ToMessage MarkSaveErpOrder(string erporderid, string sbid, string erpordercode, string saleordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string saleOrderDeliveryDate,string clerkuser, User us)
        {
            var sql = "";
            List<object> list = new List<object>();
@@ -150,7 +156,7 @@
                    }
                    if (i == Convert.ToInt32(ordernum))  //最后一单时
                    {
                        sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,sbid,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate,data_sources,isstep) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@sbid,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate,@data_sources,@isstep)";
                        sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,sbid,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate,data_sources,isstep,clerkuser) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@sbid,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate,@data_sources,@isstep,@clerkuser)";
                        list.Add(new
                        {
                            str = sql,
@@ -171,7 +177,8 @@
                                saleOrderCode = saleordercode,
                                saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate),
                                data_sources = "ERP",
                                isstep = "N"  //是否关联工序
                                isstep = "N",  //是否关联工序
                                clerkuser= clerkuser //销售订单业务员
                            }
                        });
                        sumqty = sumqty + (decimal.Parse(markqty) - sumqty);
@@ -179,7 +186,7 @@
                    else
                    {

                        sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,sbid,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate,data_sources,isstep) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@sbid,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate,@data_sources,@isstep)";
                        sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,sbid,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate,data_sources,isstep,clerkuser) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@sbid,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate,@data_sources,@isstep,@clerkuser)";
                        list.Add(new
                        {
                            str = sql,
@@ -200,7 +207,8 @@
                                saleOrderCode = saleordercode,
                                saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate),
                                data_sources = "ERP",
                                isstep = "N"//是否关联工序
                                isstep = "N",//是否关联工序
                                clerkuser= clerkuser
                            }
                        });
                    }
@@ -242,14 +250,14 @@
                    LogHelper.DbOperateLog(us.usercode, "下达", "下达了工单:" + wo, us.usertype);
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "下达MES工单成功!";
                    mes.message = "下达MES工单成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "下达MES工单成功失败!";
                    mes.message = "下达MES工单成功失败!";
                    mes.data = null;
                }
            }
@@ -257,7 +265,110 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion

        #region[订单批量下达]
        public static ToMessage MarkBatchSaveErpOrder(List<ErpOrderBatch> obj, User us)
        {
            var sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();

            try
            {
                list.Clear();
                string result = "";
                //var groupedModels = obj.GroupBy(m => m.erpordercode);
                var groupedModels = obj.GroupBy(s => s.erpordercode).Select(g => new { erpordercode = g.Key }).ToList();
                foreach (var group in groupedModels)
                {
                    string erpordercode = group.erpordercode;
                    int count = 1;
                    foreach (var model in obj.Where(s => s.erpordercode==erpordercode).ToList())
                    {
                        //获取当前最大工单号
                        sql = @"select isnull(max(cast(substring(wo_code,charindex('_',wo_code)+1,len(wo_code)-charindex('_',wo_code)) as numeric)),0) as worknumb   
                                from TK_Wrk_Man where  m_po=@erpordercode";
                        dynamicParams.Add("@erpordercode", model.erpordercode);
                        var data = DapperHelper.selectdata(sql, dynamicParams);
                        int num = Convert.ToInt32(data.Rows[0]["WORKNUMB"].ToString());
                        string wo = model.erpordercode + "_" + (num + count);
                        result += wo.ToString() + ",";
                        //写入工单表
                        sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,sbid,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate,data_sources,isstep,clerkuser) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@sbid,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate,@data_sources,@isstep,@clerkuser)";
                        list.Add(new
                        {
                            str = sql,
                            parm = new
                            {
                                wo_code = wo,
                                wotype = "PO",
                                status = "NEW",
                                wkshp_code = model.wkshopcode,
                                plan_qty = decimal.Parse(model.erpqty),  //订单数量
                                stck_code = model.warehousecode,
                                sbid = model.sbid,
                                materiel_code = model.partcode,
                                sourceid = model.erporderid,
                                m_po = model.erpordercode,
                                username = us.usercode,
                                CreateDate = DateTime.Now.ToString(),
                                saleOrderCode = model.saleordercode,
                                saleOrderDeliveryDate = Convert.ToDateTime(model.saleOrderDeliveryDate),
                                data_sources = "ERP",
                                isstep = "N",  //是否关联工序
                                clerkuser= model.clerkuser //销售订单业务员
                            }
                        });

                        //更新订单状态
                        sql = @"update  TKimp_Ewo set status='CREATED',saleOrderDeliveryDate=@saleOrderDeliveryDate,relse_qty=relse_qty+@sumqty where wo=@wo and id=@erporderid";
                        list.Add(new
                        {
                            str = sql,
                            parm = new
                            {
                                wo = model.erpordercode,
                                erporderid = model.erporderid,
                                sumqty = decimal.Parse(model.markqty),
                                saleOrderDeliveryDate = Convert.ToDateTime(model.saleOrderDeliveryDate)
                            }
                        });
                        count++;
                    }
                }



                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
                    //写入操作记录表
                    LogHelper.DbOperateLog(us.usercode, "批量下达", "批量下达了工单:" + result.TrimEnd(','), us.usertype);
                    mes.code = "200";
                    mes.count = 0;
                    mes.message = "批量下达MES工单成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.message = "批量下达MES工单成功失败!";
                    mes.data = null;
                }

            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -279,7 +390,7 @@
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "当前订单有下达未关闭的MES工单,订单不允许关闭,请先删除或关闭相关工单!";
                    mes.message = "当前订单有下达未关闭的MES工单,订单不允许关闭,请先删除或关闭相关工单!";
                    mes.data = null;
                }
                else
@@ -303,14 +414,14 @@
                    LogHelper.DbOperateLog(us.usercode, "关闭", "关闭了订单:" + erpordercode, us.usertype);
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "订单关闭成功!";
                    mes.message = "订单关闭成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "订单关闭失败!";
                    mes.message = "订单关闭失败!";
                    mes.data = null;
                }
            }
@@ -318,7 +429,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -341,7 +452,7 @@
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "当前订单下有工单已派发或已开工或已完工(关闭),不允许删除!";
                    mes.message = "当前订单下有工单已派发或已开工或已完工(关闭),不允许删除!";
                    mes.data = null;
                    return mes;
                }
@@ -378,14 +489,14 @@
                    LogHelper.DbOperateLog(us.usercode, "删除", "删除了订单:" + erpordercode, us.usertype);
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "订单删除成功!";
                    mes.message = "订单删除成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "订单删除失败!";
                    mes.message = "订单删除失败!";
                    mes.data = null;
                }
            }
@@ -393,7 +504,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -403,7 +514,7 @@


        #region[MES工单查询]
        public static ToMessage MesOrderSearch(string mesorderstus, string mesordercode, string sourceorder, string saleordercode, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        public static ToMessage MesOrderSearch(string mesorderstus, string wkshopcode, string mesordercode, string sourceorder, string saleordercode, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -413,6 +524,11 @@
                {
                    search += "and A.status=@mesorderstus ";
                    dynamicParams.Add("@mesorderstus", mesorderstus);
                }
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and A.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (mesordercode != "" && mesordercode != null)
                {
@@ -467,9 +583,9 @@
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.plan_qty,A.wkshp_code,C.torg_name as wkshp_name,
                            A.stck_code,D.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,A.saleOrderDeliveryDate,W.saleOrderCode,U.username as lm_user,A.lm_date,A.data_sources,A.isstep
                            A.stck_code,D.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,A.saleOrderDeliveryDate,W.saleOrderCode,U.username as lm_user,A.lm_date,A.data_sources,A.isstep,A.clerkuser
                            from TK_Wrk_Man A
                            left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code
                            left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code and A.sbid=W.sbid
                            left join TMateriel_Info B on A.materiel_code=B.partcode
                            left join TOrganization C on A.wkshp_code=C.torg_code
                            left join TSecStck D on A.stck_code=D.code 
@@ -478,7 +594,7 @@
                            where A.is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.message = "查询成功!";
                mes.count = total;
                mes.data = data.ToList();
            }
@@ -486,7 +602,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -494,12 +610,17 @@
        #endregion

        #region[MES报废补单工单查询]
        public static ToMessage MesBadOrderSearch(string mesordercode, string sourceorder, string saleordercode, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        public static ToMessage MesBadOrderSearch(string wkshopcode, string mesordercode, string sourceorder, string saleordercode, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and A.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (mesordercode != "" && mesordercode != null)
                {
                    search += "and A.wo_code like '%'+@mesordercode+'%' ";
@@ -550,7 +671,7 @@
                var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.plan_qty,A.wkshp_code,C.torg_name as wkshp_name,
                            A.stck_code,D.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,A.saleOrderDeliveryDate,W.saleOrderCode,U.username as lm_user,A.lm_date,S.laborbad_qty,S.materielbad_qty
                            from TK_Wrk_Man A
                            left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code
                            left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code and A.sbid=W.sbid
                            left join (select wo_code,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty from  TK_Wrk_Step where (laborbad_qty+materielbad_qty)>0 group by wo_code) S on A.wo_code=S.wo_code
                            left join TMateriel_Info B on A.materiel_code=B.partcode
                            left join TOrganization C on A.wkshp_code=C.torg_code
@@ -559,7 +680,7 @@
                            where A.is_delete<>'1'  and (S.laborbad_qty+S.materielbad_qty)>0 " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.message = "查询成功!";
                mes.count = total;
                mes.data = data.ToList();
            }
@@ -567,7 +688,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -587,14 +708,14 @@
                        FROM TK_Wrk_Man where wo_code like '%SGPO%'";
                var data = DapperHelper.selecttable(sql);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.message = "查询成功!";
                mes.data = data.Rows[0]["numct"].ToString();
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -656,14 +777,14 @@
                dir.Add("stepdata", data1);
                mes.code = "200";
                mes.count = data1.Rows.Count;
                mes.Message = "查询成功";
                mes.message = "查询成功";
                mes.data = dir;
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -735,14 +856,14 @@
                        LogHelper.DbOperateLog(us.usercode, "新增", "新增了工单:" + json.wocode, us.usertype);
                        mes.code = "200";
                        mes.count = 0;
                        mes.Message = "MES工单新建成功!";
                        mes.message = "MES工单新建成功!";
                        mes.data = null;
                    }
                    else
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "MES工单新建失败!";
                        mes.message = "MES工单新建失败!";
                        mes.data = null;
                    }
                }
@@ -811,14 +932,14 @@
                        LogHelper.DbOperateLog(us.usercode, "修改", "修改了工单:" + json.wocode, us.usertype);
                        mes.code = "200";
                        mes.count = 0;
                        mes.Message = "修改操作成功!";
                        mes.message = "修改操作成功!";
                        mes.data = null;
                    }
                    else
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "修改操作失败!";
                        mes.message = "修改操作失败!";
                        mes.data = null;
                    }
                }
@@ -827,7 +948,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -885,7 +1006,7 @@
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "工单执行中或已关闭，不允许删除!";
                    mes.message = "工单执行中或已关闭，不允许删除!";
                    mes.data = null;
                }
                bool aa = DapperHelper.DoTransaction(list);
@@ -895,14 +1016,14 @@
                    LogHelper.DbOperateLog(us.usercode, "删除", "删除了工单:" + wocode, us.usertype);
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "删除成功!";
                    mes.message = "删除成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "删除失败!";
                    mes.message = "删除失败!";
                    mes.data = null;
                }
            }
@@ -910,7 +1031,45 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion

        #region[MES工单查找历史引用最新工序信息]
        public static ToMessage MesOrderNewStepContent(string wkshopcode, string partcode, User us)
        {
            var sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                //MES工单查找历史引用最新工序信息
                sql = @"select S.wo_code,S.seq,S.step_code,S.stepprice,isbott,isend
                        from TK_Wrk_Step S
                        inner join (
                        select top 1 A.wo_code   from TK_Wrk_Man A
                        inner join TK_Wrk_Step S on A.wo_code=S.wo_code
                        where A.materiel_code=@partcode and A.wkshp_code=@wkshopcode
                        order by A.lm_date desc
                        ) as W on S.wo_code=W.wo_code
                        left join TStep  T on S.step_code=T.stepcode
                        order by S.seq";
                dynamicParams.Add("@wkshopcode", wkshopcode);
                dynamicParams.Add("@partcode", partcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
                mes.count = data.Rows.Count;
                mes.data = data;
                mes.message = "查询成功!";
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -954,14 +1113,14 @@
                    LogHelper.DbOperateLog(us.usercode, "派发", "派发了工单:" + string.Join(",", wocodelist), us.usertype);
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "MES工单派发成功!";
                    mes.message = "MES工单派发成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "MES工建派发失败!";
                    mes.message = "MES工建派发失败!";
                    mes.data = null;
                }

@@ -970,7 +1129,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -979,7 +1138,7 @@


        #region[工单关闭列表查询]
        public static ToMessage MesOrderClosedSearch(string mesorderstus, string mesordercode, string sourceorder, string saleordercode, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        public static ToMessage MesOrderClosedSearch(string mesorderstus, string wkshopcode, string mesordercode, string sourceorder, string saleordercode, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -994,6 +1153,11 @@
                {
                    search += "and A.status<>@mesorderstus ";
                    dynamicParams.Add("@mesorderstus", "CLOSED");
                }
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and A.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (mesordercode != "" && mesordercode != null)
                {
@@ -1059,7 +1223,7 @@
                            where A.is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.message = "查询成功!";
                mes.count = total;
                mes.data = data.ToList();
            }
@@ -1067,7 +1231,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -1098,14 +1262,14 @@
                    LogHelper.DbOperateLog(us.usercode, "关闭", "关闭了工单:" + string.Join(",", wocodelist), us.usertype);
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "工单关闭成功!";
                    mes.message = "工单关闭成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "工单关闭失败!";
                    mes.message = "工单关闭失败!";
                    mes.data = null;
                }
            }
@@ -1113,7 +1277,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -1122,7 +1286,7 @@


        #region[生产开报工扫码获取工单对应工序任务(自制)]
        public static ToMessage MesOrderStepSearch(string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
        public static ToMessage MesOrderStepSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
        {
            var sql = "";
            string search = "";
@@ -1132,6 +1296,11 @@
            var total = 0; //总条数
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and B.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (wocode != "" && wocode != null)
                {
                    string[] arra = wocode.Split(';');
@@ -1170,7 +1339,7 @@
                        {
                            mes.code = "300";
                            mes.count = 0;
                            mes.Message = "当前工序任务为外协工序任务,请前往外协操作页签执行!";
                            mes.message = "当前工序任务为外协工序任务,请前往外协操作页签执行!";
                            mes.data = null;
                            return mes;
                        }
@@ -1192,17 +1361,18 @@
                    dynamicParams.Add("@partspec", partspec);
                }
                //根据条件查询工单工序任务(自制工序)
                sql = @"select A.id,A.status,A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
                sql = @"select A.id,A.status,B.wkshp_code,T.torg_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
                        S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.laborbad_qty,A.materielbad_qty,B.lm_date
                        from TK_Wrk_Step A
                        left join TK_Wrk_Man B on A.wo_code=B.wo_code
                        left join TMateriel_Info M on B.materiel_code=M.partcode
                        left join TStep S on A.step_code=S.stepcode
                        left join TOrganization T on B.wkshp_code=T.torg_code
                        where A.status in('ALLO','START') and S.flwtype='Z'  " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.count = total;
                mes.Message = "查询成功!";
                mes.message = "查询成功!";
                mes.data = data.ToList();
                return mes;
            }
@@ -1210,7 +1380,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -1218,7 +1388,7 @@
        #endregion

        #region[生产开报工扫码获取工单对应工序任务(外协)]
        public static ToMessage MesOrderWxStepSearch(string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
        public static ToMessage MesOrderWxStepSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
        {
            var sql = "";
            string search = "";
@@ -1228,6 +1398,11 @@
            var total = 0; //总条数
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and B.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (wocode != "" && wocode != null)
                {
                    string[] arra = wocode.Split(';');
@@ -1266,7 +1441,7 @@
                        {
                            mes.code = "300";
                            mes.count = 0;
                            mes.Message = "当前工序任务为自制工序任务,请前往自制操作页签执行!";
                            mes.message = "当前工序任务为自制工序任务,请前往自制操作页签执行!";
                            mes.data = null;
                            return mes;
                        }
@@ -1288,7 +1463,7 @@
                    dynamicParams.Add("@partspec", partspec);
                }
                //根据条件查询工单工序任务(自制工序)
                sql = @"select A.id,A.status,A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
                sql = @"select A.id,A.status,B.wkshp_code,T.torg_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
                        S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,
                        (select isnull(sum(fqty),0) as fqty   from TK_Wrk_OutRecord where wo_code=A.wo_code and step_code=A.step_code and style='F') as fqty,
                        A.laborbad_qty,A.materielbad_qty,A.plan_startdate,A.plan_enddate,B.lm_date
@@ -1296,11 +1471,12 @@
                        left join TK_Wrk_Man B on A.wo_code=B.wo_code
                        left join TMateriel_Info M on B.materiel_code=M.partcode
                        left join TStep S on A.step_code=S.stepcode
                        left join TOrganization T on B.wkshp_code=T.torg_code
                        where A.status in('ALLO','START') and S.flwtype='W'  " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.count = total;
                mes.Message = "查询成功!";
                mes.message = "查询成功!";
                mes.data = data.ToList();
                return mes;

@@ -1309,7 +1485,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -1317,7 +1493,7 @@
        #endregion

        #region[生产开报工扫码获取工单对应工序任务(不良)]
        public static ToMessage MesOrderNgStepSearch(string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
        public static ToMessage MesOrderNgStepSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
        {
            var sql = "";
            string search = "";
@@ -1327,6 +1503,11 @@
            var total = 0; //总条数
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and B.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (wocode != "" && wocode != null)
                {
                    string[] arra = wocode.Split(';');
@@ -1364,7 +1545,7 @@
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "当前工序任务不存在,无效条码!";
                        mes.message = "当前工序任务不存在,无效条码!";
                        mes.data = null;
                        return mes;
                    }
@@ -1385,17 +1566,18 @@
                    dynamicParams.Add("@partspec", partspec);
                }
                //根据条件查询工单工序任务(自制工序)
                sql = @"select A.id,A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isend,
                sql = @"select A.id,B.wkshp_code,T.torg_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isend,
                        S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.laborbad_qty,A.materielbad_qty,B.lm_date
                        from TK_Wrk_Step A
                        left join TK_Wrk_Man B on A.wo_code=B.wo_code
                        left join TMateriel_Info M on B.materiel_code=M.partcode
                        left join TStep S on A.step_code=S.stepcode
                        left join TOrganization T on B.wkshp_code=T.torg_code
                        where A.status in('ALLO','START') and A.ng_qty>0  " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.count = total;
                mes.Message = "查询成功!";
                mes.message = "查询成功!";
                mes.data = data.ToList();
                return mes;
            }
@@ -1403,7 +1585,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -1468,7 +1650,7 @@
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "当前工序任务不存在!";
                    mes.message = "当前工序任务不存在!";
                    mes.data = null;
                    return mes;
                }
@@ -1484,14 +1666,14 @@
                    list.Add("data2", dt);
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "查询成功!";
                    mes.message = "查询成功!";
                    mes.data = list;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "无可执行的生产任务,任务已完成或已关闭!";
                    mes.message = "无可执行的生产任务,任务已完成或已关闭!";
                    mes.data = null;
                }
            }
@@ -1499,7 +1681,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -1528,7 +1710,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -1588,14 +1770,14 @@
                        LogHelper.DbOperateLog(us.usercode, "开工", "开工了工单:" + mesordercode + "工序:" + stepcode, us.usertype);
                        mes.code = "200";
                        mes.count = 0;
                        mes.Message = "操作成功!";
                        mes.message = "操作成功!";
                        mes.data = null;
                    }
                    else
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "操作失败!";
                        mes.message = "操作失败!";
                        mes.data = null;
                    }
                }
@@ -1617,7 +1799,7 @@
                //{
                //    mes.code = "300";
                //    mes.count = 0;
                //    mes.Message = "操作失败,当前报工产线应为：" + da.Rows[0]["NAME"].ToString() + "!";
                //    mes.message = "操作失败,当前报工产线应为：" + da.Rows[0]["NAME"].ToString() + "!";
                //    mes.data = null;
                //    return mes;
                //}
@@ -1731,14 +1913,14 @@
                    LogHelper.DbOperateLog(us.usercode, "报工", "报工了工单:" + mesordercode + "工序:" + stepcode, us.usertype);
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "操作成功!";
                    mes.message = "操作成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "操作失败!";
                    mes.message = "操作失败!";
                    mes.data = null;
                }
            }
@@ -1746,7 +1928,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -1810,14 +1992,14 @@
                    LogHelper.DbOperateLog(us.usercode, "外协发料", "外协发料工单:" + mesordercode + "工序:" + stepcode, us.usertype);
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "发料成功!";
                    mes.message = "发料成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "发料失败!";
                    mes.message = "发料失败!";
                    mes.data = null;
                }
            }
@@ -1825,7 +2007,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -1883,7 +2065,7 @@
                    string wxstring = (string.Join(",", dr.Select(x => x.ToString()).ToArray()));
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "操作失败,当前收料外协供方与发料外协供应商不匹配,应为：【" + wxstring + "】!";
                    mes.message = "操作失败,当前收料外协供方与发料外协供应商不匹配,应为：【" + wxstring + "】!";
                    mes.data = null;
                    return mes;
                }
@@ -1891,7 +2073,7 @@
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "操作失败,当前收料数量+不良数量,不能大于发料数量:" + da.Rows[0]["FQTY"].ToString() + "!";
                    mes.message = "操作失败,当前收料数量+不良数量,不能大于发料数量:" + da.Rows[0]["FQTY"].ToString() + "!";
                    mes.data = null;
                    return mes;
                }
@@ -1899,7 +2081,7 @@
                //{
                //    mes.code = "300";
                //    mes.count = 0;
                //    mes.Message = "操作失败,当前收料外协供方应为：" + da.Rows[0]["NAME"].ToString() + "!";
                //    mes.message = "操作失败,当前收料外协供方应为：" + da.Rows[0]["NAME"].ToString() + "!";
                //    mes.data = null;
                //    return mes;
                //}
@@ -1911,7 +2093,7 @@
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "操作失败,当前收料数量+不良数量,不能大于待收数量:" + (sum_fqty - sum_sqty) + "!";
                        mes.message = "操作失败,当前收料数量+不良数量,不能大于待收数量:" + (sum_fqty - sum_sqty) + "!";
                        mes.data = null;
                        return mes;
                    }
@@ -1989,14 +2171,14 @@
                    LogHelper.DbOperateLog(us.usercode, "外协收料", "外协收料工单:" + mesordercode + "工序:" + stepcode, us.usertype);
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "收成功!";
                    mes.message = "收成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "收料失败!";
                    mes.message = "收料失败!";
                    mes.data = null;
                }
            }
@@ -2004,7 +2186,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -2259,14 +2441,14 @@
                    LogHelper.DbOperateLog(us.usercode, "不良处理", "工单:" + json.Data.Rows[0]["WO_CODE"].ToString() + "工序:" + json.Data.Rows[0]["STEP_CODE"].ToString(), us.usertype);
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "操作成功!";
                    mes.message = "操作成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "操作失败!";
                    mes.message = "操作失败!";
                    mes.data = null;
                }
            }
@@ -2274,7 +2456,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -2284,12 +2466,17 @@


        #region[生产执行,报工调整数据查询接口]
        public static ToMessage MesOrderStepVerifySearch(string wo_code, string partnumber, string partname, string partspec, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
        public static ToMessage MesOrderStepVerifySearch(string wkshopcode, string wo_code, string partnumber, string partname, string partspec, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and AA.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (wo_code != "" && wo_code != null)
                {
                    search += "and AA.wo_code like '%'+@wo_code+'%' ";
@@ -2371,7 +2558,7 @@
                            ) as AA where" + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.message = "查询成功!";
                mes.count = total;
                mes.data = data.ToList();
            }
@@ -2379,7 +2566,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -2410,7 +2597,7 @@
                    var data = DapperHelper.selectdata(sql, dynamicParams);
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "查询成功!";
                    mes.message = "查询成功!";
                    mes.data = data;

                }
@@ -2430,7 +2617,7 @@
                    var data = DapperHelper.selectdata(sql, dynamicParams);
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "查询成功!";
                    mes.message = "查询成功!";
                    mes.data = data;
                }
            }
@@ -2438,7 +2625,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -2505,7 +2692,7 @@
                        {
                            mes.code = "300";
                            mes.count = 0;
                            mes.Message = "当前首道工序修改报工总数量：【" + updatereportsumqty + "】不能大于工单任务数量：【" + json[0].task_qty.ToString() + "】!";
                            mes.message = "当前首道工序修改报工总数量：【" + updatereportsumqty + "】不能大于工单任务数量：【" + json[0].task_qty.ToString() + "】!";
                            mes.data = null;
                            return mes;
                        }
@@ -2533,7 +2720,7 @@
                                    {
                                        mes.code = "300";
                                        mes.count = 0;
                                        mes.Message = "当前首道工序修改报工总合格数量：【" + (notthis_reportqty + this_reportqty) + "】不能小于下道自制工序报工总数量：【" + last_updatereportsumqty + "】!";
                                        mes.message = "当前首道工序修改报工总合格数量：【" + (notthis_reportqty + this_reportqty) + "】不能小于下道自制工序报工总数量：【" + last_updatereportsumqty + "】!";
                                        mes.data = null;
                                        return mes;
                                    }
@@ -2556,7 +2743,7 @@
                                    {
                                        mes.code = "300";
                                        mes.count = 0;
                                        mes.Message = "当前首道工序修改报工总合格数量：【" + (notthis_reportqty + this_reportqty) + "】不能小于下道外协工序发料总数量：【" + last_reportqty + "】!";
                                        mes.message = "当前首道工序修改报工总合格数量：【" + (notthis_reportqty + this_reportqty) + "】不能小于下道外协工序发料总数量：【" + last_reportqty + "】!";
                                        mes.data = null;
                                        return mes;
                                    }
@@ -2605,7 +2792,7 @@
                                    {
                                        mes.code = "300";
                                        mes.count = 0;
                                        mes.Message = "当前末道工序修改报工总数量：【" + updatereportsumqty + "】不能大于上道工序报工总合格数量：【" + last_reportqty + "】!";
                                        mes.message = "当前末道工序修改报工总数量：【" + updatereportsumqty + "】不能大于上道工序报工总合格数量：【" + last_reportqty + "】!";
                                        mes.data = null;
                                        return mes;
                                    }
@@ -2628,7 +2815,7 @@
                                    {
                                        mes.code = "300";
                                        mes.count = 0;
                                        mes.Message = "当前末道工序修改报工总数量：【" + updatereportsumqty + "】不能大于上道工序收料总合格数量：【" + last_reportqty + "】!";
                                        mes.message = "当前末道工序修改报工总数量：【" + updatereportsumqty + "】不能大于上道工序收料总合格数量：【" + last_reportqty + "】!";
                                        mes.data = null;
                                        return mes;
                                    }
@@ -2675,7 +2862,7 @@
                                    {
                                        mes.code = "300";
                                        mes.count = 0;
                                        mes.Message = "当前工序修改报工总数量：【" + updatereportsumqty + "】不能大于上道工序报工总合格数量：【" + last_reportqty + "】!";
                                        mes.message = "当前工序修改报工总数量：【" + updatereportsumqty + "】不能大于上道工序报工总合格数量：【" + last_reportqty + "】!";
                                        mes.data = null;
                                        return mes;
                                    }
@@ -2698,7 +2885,7 @@
                                    {
                                        mes.code = "300";
                                        mes.count = 0;
                                        mes.Message = "当前工序修改报工总数量：【" + updatereportsumqty + "】不能大于上道工序收料总合格数量：【" + last_reportqty + "】!";
                                        mes.message = "当前工序修改报工总数量：【" + updatereportsumqty + "】不能大于上道工序收料总合格数量：【" + last_reportqty + "】!";
                                        mes.data = null;
                                        return mes;
                                    }
@@ -2728,7 +2915,7 @@
                                    {
                                        mes.code = "300";
                                        mes.count = 0;
                                        mes.Message = "当前工序修改报工总合格数量：【" + (notthis_reportqty + this_reportqty) + "】不能小于下道工序报工总数量：【" + last_updatereportsumqty + "】!";
                                        mes.message = "当前工序修改报工总合格数量：【" + (notthis_reportqty + this_reportqty) + "】不能小于下道工序报工总数量：【" + last_updatereportsumqty + "】!";
                                        mes.data = null;
                                        return mes;
                                    }
@@ -2751,7 +2938,7 @@
                                    {
                                        mes.code = "300";
                                        mes.count = 0;
                                        mes.Message = "当前工序修改报工总数量：【" + (notthis_reportqty + this_reportqty) + "】不能大于下道工序发料总数量：【" + last_reportqty + "】!";
                                        mes.message = "当前工序修改报工总数量：【" + (notthis_reportqty + this_reportqty) + "】不能大于下道工序发料总数量：【" + last_reportqty + "】!";
                                        mes.data = null;
                                        return mes;
                                    }
@@ -2907,7 +3094,7 @@
                        {
                            mes.code = "300";
                            mes.count = 0;
                            mes.Message = "当前首道工序对应供应商收料总数量：【" + updatereportsumqty + "】不能大于发料数量：【" + decimal.Parse(dt_0.Rows[0]["fqty"].ToString()) + "】!";
                            mes.message = "当前首道工序对应供应商收料总数量：【" + updatereportsumqty + "】不能大于发料数量：【" + decimal.Parse(dt_0.Rows[0]["fqty"].ToString()) + "】!";
                            mes.data = null;
                            return mes;
                        }
@@ -2935,7 +3122,7 @@
                                    {
                                        mes.code = "300";
                                        mes.count = 0;
                                        mes.Message = "当前首道工序收料数量：【" + (notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) + "】不能小于下道自制工序报工总数量：【" + last_updatereportsumqty + "】!";
                                        mes.message = "当前首道工序收料数量：【" + (notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) + "】不能小于下道自制工序报工总数量：【" + last_updatereportsumqty + "】!";
                                        mes.data = null;
                                        return mes;
                                    }
@@ -2958,7 +3145,7 @@
                                    {
                                        mes.code = "300";
                                        mes.count = 0;
                                        mes.Message = "当前首道工序收料总数量：【" + (notthis_reportqty + this_reportqty) + "】不能小于下道外协工序发料总数量：【" + last_reportqty + "】!";
                                        mes.message = "当前首道工序收料总数量：【" + (notthis_reportqty + this_reportqty) + "】不能小于下道外协工序发料总数量：【" + last_reportqty + "】!";
                                        mes.data = null;
                                        return mes;
                                    }
@@ -2988,7 +3175,7 @@
                        {
                            mes.code = "300";
                            mes.count = 0;
                            mes.Message = "当前工序供应商收料总数量：【" + updatereportsumqty + "】不能大于工序供应商发料总数量：【" + decimal.Parse(dt_0.Rows[0]["fqty"].ToString()) + "】!";
                            mes.message = "当前工序供应商收料总数量：【" + updatereportsumqty + "】不能大于工序供应商发料总数量：【" + decimal.Parse(dt_0.Rows[0]["fqty"].ToString()) + "】!";
                            mes.data = null;
                            return mes;
                        }
@@ -3015,7 +3202,7 @@
                        {
                            mes.code = "300";
                            mes.count = 0;
                            mes.Message = "当前首道工序对应供应商收料总数量：【" + updatereportsumqty + "】不能大于发料数量：【" + decimal.Parse(dt_0.Rows[0]["fqty"].ToString()) + "】!";
                            mes.message = "当前首道工序对应供应商收料总数量：【" + updatereportsumqty + "】不能大于发料数量：【" + decimal.Parse(dt_0.Rows[0]["fqty"].ToString()) + "】!";
                            mes.data = null;
                            return mes;
                        }
@@ -3043,7 +3230,7 @@
                                    {
                                        mes.code = "300";
                                        mes.count = 0;
                                        mes.Message = "当前首道工序收料数量：【" + (notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) + "】不能小于下道自制工序报工总数量：【" + last_updatereportsumqty + "】!";
                                        mes.message = "当前首道工序收料数量：【" + (notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) + "】不能小于下道自制工序报工总数量：【" + last_updatereportsumqty + "】!";
                                        mes.data = null;
                                        return mes;
                                    }
@@ -3066,7 +3253,7 @@
                                    {
                                        mes.code = "300";
                                        mes.count = 0;
                                        mes.Message = "当前首道工序收料总数量：【" + (notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) + "】不能小于下道外协工序发料总数量：【" + last_reportqty + "】!";
                                        mes.message = "当前首道工序收料总数量：【" + (notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) + "】不能小于下道外协工序发料总数量：【" + last_reportqty + "】!";
                                        mes.data = null;
                                        return mes;
                                    }
@@ -3185,14 +3372,14 @@
                    LogHelper.DbOperateLog(us.usercode, "报工调整", "工单:" + json[0].wo_code + "工序:" + json[0].step_code, us.usertype);
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "修改报工成功!";
                    mes.message = "修改报工成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "修改报工失败!";
                    mes.message = "修改报工失败!";
                    mes.data = null;
                }
            }
@@ -3200,7 +3387,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -3210,12 +3397,17 @@


        #region[生产执行,报工审核列表数据查询接口]
        public static ToMessage MesOrderStepReportVerifySearch(string wo_code, string partnumber, string partname, string partspec, string stepname, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
        public static ToMessage MesOrderStepReportVerifySearch(string wkshopcode, string wo_code, string partnumber, string partname, string partspec, string stepname, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (wkshopcode != "" && wkshopcode != null)
                {
                    search += "and AA.wkshp_code=@wkshopcode ";
                    dynamicParams.Add("@wkshopcode", wkshopcode);
                }
                if (wo_code != "" && wo_code != null)
                {
                    search += "and AA.wo_code like '%'+@wo_code+'%' ";
@@ -3302,7 +3494,7 @@
                            ) as AA where" + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.message = "查询成功!";
                mes.count = total;
                mes.data = data.ToList();
            }
@@ -3310,7 +3502,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;
@@ -3351,14 +3543,14 @@
                    LogHelper.DbOperateLog(us.usercode, "报工审核", "外协收料记录id:" + string.Join(",", json.wdata), us.usertype);
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "审核成功!";
                    mes.message = "审核成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "审核失败!";
                    mes.message = "审核失败!";
                    mes.data = null;
                }
            }
@@ -3366,7 +3558,7 @@
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.message = e.Message;
                mes.data = null;
            }
            return mes;