JLApi.git - Gitblit

			@@ -7,6 +7,8 @@
			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;
			using VueWebCoreApi.Tools;
			@@ -17,6 +19,7 @@
			{
			public static DataTable dt; //定义全局变量dt
			public static bool res; //定义全局变量dt

			public static ToMessage mes = new ToMessage(); //定义全局返回信息对象
			public static string strProcName = ""; //定义全局sql变量
			public static List<SqlParameter> listStr = new List<SqlParameter>(); //定义全局参数集合
			@@ -24,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 = "";
			@@ -34,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)
			{
			@@ -85,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
			@@ -94,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();
			}
			@@ -102,7 +110,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -110,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>();
			@@ -148,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,
			@@ -169,7 +177,8 @@
			saleOrderCode = saleordercode,
			saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate),
			data_sources = "ERP",
			isstep = "N" //是否关联工序
			isstep = "N", //是否关联工序
			clerkuser= clerkuser //销售订单业务员
			}
			});
			sumqty = sumqty + (decimal.Parse(markqty) - sumqty);
			@@ -177,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,
			@@ -198,7 +207,8 @@
			saleOrderCode = saleordercode,
			saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate),
			data_sources = "ERP",
			isstep = "N"//是否关联工序
			isstep = "N",//是否关联工序
			clerkuser= clerkuser
			}
			});
			}
			@@ -240,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;
			}
			}
			@@ -255,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;
			@@ -277,7 +390,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前订单有下达未关闭的MES工单,订单不允许关闭,请先删除或关闭相关工单!";
			mes.message = "当前订单有下达未关闭的MES工单,订单不允许关闭,请先删除或关闭相关工单!";
			mes.data = null;
			}
			else
			@@ -301,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;
			}
			}
			@@ -316,7 +429,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -339,7 +452,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前订单下有工单已派发或已开工或已完工(关闭),不允许删除!";
			mes.message = "当前订单下有工单已派发或已开工或已完工(关闭),不允许删除!";
			mes.data = null;
			return mes;
			}
			@@ -376,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;
			}
			}
			@@ -391,7 +504,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -401,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 = "";
			@@ -411,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)
			{
			@@ -465,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
			@@ -476,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();
			}
			@@ -484,7 +602,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -492,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+'%' ";
			@@ -548,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
			@@ -557,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();
			}
			@@ -565,7 +688,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -585,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;
			@@ -654,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;
			@@ -733,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;
			}
			}
			@@ -809,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;
			}
			}
			@@ -825,7 +948,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -883,7 +1006,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "工单执行中或已关闭，不允许删除!";
			mes.message = "工单执行中或已关闭，不允许删除!";
			mes.data = null;
			}
			bool aa = DapperHelper.DoTransaction(list);
			@@ -893,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;
			}
			}
			@@ -908,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;
			@@ -952,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;
			}

			@@ -968,7 +1129,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -977,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 = "";
			@@ -992,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)
			{
			@@ -1057,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();
			}
			@@ -1065,7 +1231,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1096,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;
			}
			}
			@@ -1111,7 +1277,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1120,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 = "";
			@@ -1130,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(';');
			@@ -1168,7 +1339,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序任务为外协工序任务,请前往外协操作页签执行!";
			mes.message = "当前工序任务为外协工序任务,请前往外协操作页签执行!";
			mes.data = null;
			return mes;
			}
			@@ -1190,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;
			}
			@@ -1208,7 +1380,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1216,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 = "";
			@@ -1226,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(';');
			@@ -1264,7 +1441,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序任务为自制工序任务,请前往自制操作页签执行!";
			mes.message = "当前工序任务为自制工序任务,请前往自制操作页签执行!";
			mes.data = null;
			return mes;
			}
			@@ -1286,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
			@@ -1294,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;

			@@ -1307,7 +1485,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1315,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 = "";
			@@ -1325,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(';');
			@@ -1362,7 +1545,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序任务不存在,无效条码!";
			mes.message = "当前工序任务不存在,无效条码!";
			mes.data = null;
			return mes;
			}
			@@ -1383,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;
			}
			@@ -1401,7 +1585,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1466,7 +1650,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序任务不存在!";
			mes.message = "当前工序任务不存在!";
			mes.data = null;
			return mes;
			}
			@@ -1482,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;
			}
			}
			@@ -1497,7 +1681,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1526,7 +1710,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1586,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;
			}
			}
			@@ -1615,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;
			//}
			@@ -1729,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;
			}
			}
			@@ -1744,7 +1928,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1808,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;
			}
			}
			@@ -1823,7 +2007,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1881,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;
			}
			@@ -1889,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;
			}
			@@ -1897,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;
			//}
			@@ -1909,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;
			}
			@@ -1987,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;
			}
			}
			@@ -2002,7 +2186,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2257,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;
			}
			}
			@@ -2272,7 +2456,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2282,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+'%' ";
			@@ -2328,47 +2517,48 @@
			search = search.Substring(3);//截取索引2后面的字符
			// --------------查询指定自制报工外协收料数据--------------
			var total = 0; //总条数
			var sql = @" select * from(
			select A.id,B.id as sbid,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,A.task_qty,M.wkshp_code,T.torg_name as wkshp_name,A.eqp_code,E.name as eqp_name,
			A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,k.isbott as first_choke,k.isend as last_choke,A.step_price,B.reckway,B.usergroup_code,G.usergroupname as usergroup_name,
			B.report_person as usercode,
			STUFF((SELECT ',' + U.username
			FROM TUser U
			WHERE CHARINDEX(',' + U.usercode + ',', ',' + B.report_person + ',') > 0
			FOR XML PATH('')), 1, 1, '') AS username,
			B.report_date,B.report_qty,B.ng_qty,B.laborbad_qty,B.materielbad_qty
			from TK_Wrk_Record A
			inner join TK_Wrk_RecordSub B on A.id=B.m_id
			left join TK_Wrk_Man M on A.wo_code=M.wo_code
			left join TK_Wrk_Step K on M.wo_code=K.wo_code and A.step_code=K.step_code
			left join TStep S on A.step_code=S.stepcode
			left join TMateriel_Info P on A.materiel_code=P.partcode
			left join TOrganization T on M.wkshp_code=T.torg_code
			left join TEqpInfo E on A.eqp_code=E.code
			left join TGroup G on G.usergroupcode=B.usergroup_code
			where A.style='B' and B.style='B' and M.status<>'CLOSED' and B.verify='N'
			union all
			select A.id,B.id as sbid,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,M.plan_qty as task_qty,M.wkshp_code,T.torg_name as wkshp_name,A.wx_code as eqp_code,E.name as eqp_name,
			A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,k.isbott as first_choke,k.isend as last_choke,A.step_price,'person' as reckway,'' as usergroup_code,'' as usergroup_name,
			B.in_person as usercode,
			var sql = @"select * from(
			select A.id,B.id as sbid,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,A.task_qty,M.wkshp_code,T.torg_name as wkshp_name,A.eqp_code,E.name as eqp_name,
			A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,k.isbott as first_choke,k.isend as last_choke,A.step_price,B.reckway,B.usergroup_code,G.usergroupname as usergroup_name,
			B.report_person as usercode,
			STUFF((SELECT ',' + U.username
			FROM TUser U
			WHERE CHARINDEX(',' + U.usercode + ',', ',' + B.in_person + ',') > 0
			FOR XML PATH('')), 1, 1, '') AS username,
			B.in_time as report_date,B.sqty as report_qty,B.ng_qty,B.laborbad_qty,B.materielbad_qty
			from TK_Wrk_OutRecord A
			inner join TK_Wrk_OutRecordSub B on A.id = B.m_id
			left join TK_Wrk_Man M on A.wo_code = M.wo_code
			left join TK_Wrk_Step K on M.wo_code=K.wo_code and A.step_code=K.step_code
			left join TStep S on A.step_code = S.stepcode
			left join TMateriel_Info P on A.materiel_code = P.partcode
			left join TOrganization T on M.wkshp_code = T.torg_code
			left join TCustomer E on A.wx_code = E.code
			where A.style = 'S' and B.style = 'S' and M.status<>'CLOSED' and B.verify='N'
			) as AA where" + search;
			FROM TUser U
			WHERE CHARINDEX(',' + U.usercode + ',', ',' + B.report_person + ',') > 0
			FOR XML PATH('')), 1, 1, '') AS username,
			B.report_date,B.report_qty,B.ng_qty,B.laborbad_qty,B.materielbad_qty,'' as wx_code,'' as wx_name
			from TK_Wrk_Record A
			inner join TK_Wrk_RecordSub B on A.id=B.m_id
			left join TK_Wrk_Man M on A.wo_code=M.wo_code
			left join TK_Wrk_Step K on M.wo_code=K.wo_code and A.step_code=K.step_code
			left join TStep S on A.step_code=S.stepcode
			left join TMateriel_Info P on A.materiel_code=P.partcode
			left join TOrganization T on M.wkshp_code=T.torg_code
			left join TEqpInfo E on A.eqp_code=E.code
			left join TGroup G on G.usergroupcode=B.usergroup_code
			where A.style='B' and B.style='B' and M.status<>'CLOSED' and A.verify='N'
			union all
			select A.id,B.id as sbid,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,M.plan_qty as task_qty,M.wkshp_code,T.torg_name as wkshp_name,A.wx_code as eqp_code,E.name as eqp_name,
			A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,k.isbott as first_choke,k.isend as last_choke,A.step_price,'person' as reckway,'' as usergroup_code,'' as usergroup_name,
			B.in_person as usercode,
			STUFF((SELECT ',' + U.username
			FROM TUser U
			WHERE CHARINDEX(',' + U.usercode + ',', ',' + B.in_person + ',') > 0
			FOR XML PATH('')), 1, 1, '') AS username,
			B.in_time as report_date,B.sqty as report_qty,B.ng_qty,B.laborbad_qty,B.materielbad_qty,A.wx_code,C.name as wx_name
			from TK_Wrk_OutRecord A
			inner join TK_Wrk_OutRecordSub B on A.id = B.m_id
			left join TK_Wrk_Man M on A.wo_code = M.wo_code
			left join TK_Wrk_Step K on M.wo_code=K.wo_code and A.step_code=K.step_code
			left join TStep S on A.step_code = S.stepcode
			left join TMateriel_Info P on A.materiel_code = P.partcode
			left join TOrganization T on M.wkshp_code = T.torg_code
			left join TCustomer E on A.wx_code = E.code
			left join TCustomer C on A.wx_code=C.code
			where A.style = 'S' and B.style = 'S' and M.status<>'CLOSED' and A.verify='N'
			) 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();
			}
			@@ -2376,7 +2566,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2407,7 +2597,7 @@
			var data = DapperHelper.selectdata(sql, dynamicParams);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.data = data;

			}
			@@ -2427,7 +2617,7 @@
			var data = DapperHelper.selectdata(sql, dynamicParams);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.data = data;
			}
			}
			@@ -2435,7 +2625,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2450,8 +2640,27 @@
			var dynamicParams = new DynamicParameters();
			try
			{
			//控制逻辑：首道工序调整-> 本道工序当前调整总数(合格+不良+报废)+本道工序非当前报工总数(合格+不良+报废)>任务数量 ==不能大于任务数量
			//控制逻辑：首道工序调整-> (本道工序当前调整合格数+本道工序非当前报工合格总数)<下道工序报工总数(合格+不良+报废) ==不能小于下道报工总数
			//控制逻辑：末道工序调整-> 本道工序当前调整总数(合格+不良+报废)+本道工序非当前报工总数(合格+不良+报废)>上道工序报工合格总数 ==不能大于上道工序报工合格总数
			//控制逻辑：中间工序调整-> 本道工序当前调整总数(合格+不良+报废)+本道工序非当前报工总数(合格+不良+报废)>上道工序报工合格总数 ==不能大于上道工序报工合格总数
			//控制逻辑：中间工序调整-> (本道工序当前调整合格数+本道工序非当前报工合格总数)<下道工序报工总数(合格+不良+报废) ==不能小于下道报工总数
			string date = DateTime.Now.ToString(); //获取系统时间
			list.Clear();
			//获取当前工序上道工序及属性
			sql = @"select T.stepcode,T.stepname,T.flwtype from TK_Wrk_Step A
			left join TStep T on A.step_code=T.stepcode
			where A.wo_code=@ordercode and A.seq=@seq-1 ";
			dynamicParams.Add("@ordercode", json[0].wo_code);
			dynamicParams.Add("@seq", json[0].step_seq);
			var pre = DapperHelper.selectdata(sql, dynamicParams);
			//获取当前工序下道工序及属性
			sql = @"select T.stepcode,T.stepname,T.flwtype from TK_Wrk_Step A
			left join TStep T on A.step_code=T.stepcode
			where A.wo_code=@ordercode and A.seq=@seq+1 ";
			dynamicParams.Add("@ordercode", json[0].wo_code);
			dynamicParams.Add("@seq", json[0].step_seq);
			var next = DapperHelper.selectdata(sql, dynamicParams);
			//判断当前工序是自制工序还是外协工序
			if (json[0].flw_type.ToString() == "Z")//自制工序
			{
			@@ -2483,34 +2692,65 @@
			{
			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;
			}
			//查询当前工序下道工序：总报工数量、总不良数量、总报废数量
			sql = @"select isnull(sum(good_qty),0) as good_qty,isnull(sum(ng_qty),0) as ng_qty,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty
			from TK_Wrk_Record where wo_code=@wo_code and style='B' and step_seq=@step_seq+1";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@step_seq", json[0].step_seq);
			var dt0 = DapperHelper.selectdata(sql, dynamicParams);
			if (dt0.Rows.Count > 0)
			//判断是否存在下道工序及属性
			if (next.Rows.Count > 0)
			{
			//判断当前工序：报工总数数量+不良总数数量+工废总数量+料废总数量<下道工序报工总数量+下道工序不良总数量+下道工序工废总数量+下道工序料废总数量
			decimal last_reportqty = decimal.Parse(dt0.Rows[0]["good_qty"].ToString()); //下道工序报工总数量
			decimal last_ngqty = decimal.Parse(dt0.Rows[0]["ng_qty"].ToString()); //下道工序不良总数量
			decimal last_laborbad_qty = decimal.Parse(dt0.Rows[0]["laborbad_qty"].ToString()); //下道工序工废总数量
			decimal last_materielbad_qty = decimal.Parse(dt0.Rows[0]["materielbad_qty"].ToString()); //下道工序料废总数量
			decimal last_updatereportsumqty = last_reportqty + last_ngqty + last_laborbad_qty + last_materielbad_qty;
			//判断（当前非本次报工总合格数+本次报工调整合格数）<下道工序报工总数
			if ((notthis_reportqty + decimal.Parse(json[0].report_qty) < last_updatereportsumqty))
			if (next.Rows[0]["flwtype"].ToString() == "Z")
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "自制首道工序修改报工总合格数量：【" + (notthis_reportqty + decimal.Parse(json[0].report_qty)) + "】不能小于下道工序报工总数量：【" + last_updatereportsumqty + "】,请输入合法数值或先修改下道工序报工数量!";
			mes.data = null;
			return mes;
			//查询当前工序下道工序：总报工数量、总不良数量、总报废数量
			sql = @"select isnull(sum(good_qty),0) as good_qty,isnull(sum(ng_qty),0) as ng_qty,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty
			from TK_Wrk_Record where wo_code=@wo_code and style='B' and step_seq=@step_seq+1";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@step_seq", json[0].step_seq);
			var dt0 = DapperHelper.selectdata(sql, dynamicParams);
			if (dt0.Rows.Count > 0)
			{
			//判断当前工序：报工总数数量+不良总数数量+工废总数量+料废总数量<下道工序报工总数量+下道工序不良总数量+下道工序工废总数量+下道工序料废总数量
			decimal last_reportqty = decimal.Parse(dt0.Rows[0]["good_qty"].ToString()); //下道工序报工总数量
			decimal last_ngqty = decimal.Parse(dt0.Rows[0]["ng_qty"].ToString()); //下道工序不良总数量
			decimal last_laborbad_qty = decimal.Parse(dt0.Rows[0]["laborbad_qty"].ToString()); //下道工序工废总数量
			decimal last_materielbad_qty = decimal.Parse(dt0.Rows[0]["materielbad_qty"].ToString()); //下道工序料废总数量
			decimal last_updatereportsumqty = last_reportqty + last_ngqty + last_laborbad_qty + last_materielbad_qty;
			//判断（当前非本次报工总合格数+本次报工调整合格数）<下道工序报工总数
			if ((notthis_reportqty + this_reportqty) < last_updatereportsumqty)
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = "当前首道工序修改报工总合格数量：【" + (notthis_reportqty + this_reportqty) + "】不能小于下道自制工序报工总数量：【" + last_updatereportsumqty + "】!";
			mes.data = null;
			return mes;
			}
			}
			}
			else
			{
			//查询当前工序下道工序：总发料数量
			sql = @"select isnull(sum(fqty),0) as good_qty
			from TK_Wrk_OutRecord where wo_code=@wo_code and style='S' and step_seq=@step_seq+1";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@step_seq", json[0].step_seq);
			var dt0 = DapperHelper.selectdata(sql, dynamicParams);
			if (dt0.Rows.Count > 0)
			{
			//判断当前工序：发料总数数量
			decimal last_reportqty = decimal.Parse(dt0.Rows[0]["good_qty"].ToString()); //下道工序发料总数量
			//判断（当前非本次报工总合格数+本次报工调整合格数）<下道工序发料总数
			if ((notthis_reportqty + this_reportqty) < last_reportqty)
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = "当前首道工序修改报工总合格数量：【" + (notthis_reportqty + this_reportqty) + "】不能小于下道外协工序发料总数量：【" + last_reportqty + "】!";
			mes.data = null;
			return mes;
			}
			}
			}
			}

			}
			//末道工序的报工
			else if (json[0].last_choke == "Y")
			@@ -2529,33 +2769,63 @@
			//获取当前末道工序报工总数量：本次修改报工数量+本次修改不良数量+本次修改工废数量+本次修改报工料废数量+当前末道工序非本次报工总数+当前末道工序非本次不良总数+当前末道工序非本次工废总数+当前末道工序非本次料废总数
			decimal updatereportsumqty = this_reportqty + this_ngqty + this_laborbadqty + this_materielbadqty + notthis_reportqty + notthis_ngqty + notthis_laborbad_qty + notthis_materielbad_qty;

			//查询当前末道工序上道工序：总报工数量、总不良数量、总报废数量
			sql = @"select isnull(sum(good_qty),0) as good_qty,isnull(sum(ng_qty),0) as ng_qty,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty
			from TK_Wrk_Record where wo_code=@wo_code and style='B' and step_seq=@step_seq-1";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@step_seq", json[0].step_seq);
			var dt0 = DapperHelper.selectdata(sql, dynamicParams);
			if (dt0.Rows.Count > 0)
			//判断是否存在上道工序及属性
			if (pre.Rows.Count > 0)
			{
			decimal last_reportqty = decimal.Parse(dt0.Rows[0]["good_qty"].ToString()); //上道工序报工总数量
			decimal last_ngqty = decimal.Parse(dt0.Rows[0]["ng_qty"].ToString()); //上道工序不良总数量
			decimal last_laborbad_qty = decimal.Parse(dt0.Rows[0]["laborbad_qty"].ToString()); //上道工序工废总数量
			decimal last_materielbad_qty = decimal.Parse(dt0.Rows[0]["materielbad_qty"].ToString()); //上道工序料废总数量
			decimal last_updatereportsumqty = last_reportqty + last_ngqty + last_laborbad_qty + last_materielbad_qty;
			//判断：当前末道工序报工记录：当前末道工序报工总数量>上道工序报工合格总数
			if (updatereportsumqty > last_reportqty)
			if (pre.Rows[0]["flwtype"].ToString() == "Z")
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "自制末道工序修改报工总数量：【" + updatereportsumqty + "】不能大于上道工序报工总合格数量：【" + last_reportqty + "】,请输入合法数值或先修改上道工序报工数量!";
			mes.data = null;
			return mes;
			//查询当前末道工序上道工序：总报工数量、总不良数量、总报废数量
			sql = @"select isnull(sum(good_qty),0) as good_qty,isnull(sum(ng_qty),0) as ng_qty,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty
			from TK_Wrk_Record where wo_code=@wo_code and style='B' and step_seq=@step_seq-1";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@step_seq", json[0].step_seq);
			var dt0 = DapperHelper.selectdata(sql, dynamicParams);
			if (dt0.Rows.Count > 0)
			{
			decimal last_reportqty = decimal.Parse(dt0.Rows[0]["good_qty"].ToString()); //上道工序报工总数量
			decimal last_ngqty = decimal.Parse(dt0.Rows[0]["ng_qty"].ToString()); //上道工序不良总数量
			decimal last_laborbad_qty = decimal.Parse(dt0.Rows[0]["laborbad_qty"].ToString()); //上道工序工废总数量
			decimal last_materielbad_qty = decimal.Parse(dt0.Rows[0]["materielbad_qty"].ToString()); //上道工序料废总数量
			decimal last_updatereportsumqty = last_reportqty + last_ngqty + last_laborbad_qty + last_materielbad_qty;
			//判断：当前末道工序报工记录：当前末道工序报工总数量>上道工序报工合格总数
			if (updatereportsumqty > last_reportqty)
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = "当前末道工序修改报工总数量：【" + updatereportsumqty + "】不能大于上道工序报工总合格数量：【" + last_reportqty + "】!";
			mes.data = null;
			return mes;
			}
			}
			}
			else
			{
			//查询当前工序上道工序：总收料数量
			sql = @"select isnull(sum(sqty),0) as good_qty
			from TK_Wrk_OutRecord where wo_code=@wo_code and style='S' and step_seq=@step_seq-1";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@step_seq", json[0].step_seq);
			var dt0 = DapperHelper.selectdata(sql, dynamicParams);
			if (dt0.Rows.Count > 0)
			{
			//判断当前工序：收料总数数量
			decimal last_reportqty = decimal.Parse(dt0.Rows[0]["good_qty"].ToString()); //下道工序发料总数量
			//判断：当前末道工序报工记录：当前末道工序报工总数量>上道工序收料合格总数
			if (updatereportsumqty > last_reportqty)
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = "当前末道工序修改报工总数量：【" + updatereportsumqty + "】不能大于上道工序收料总合格数量：【" + last_reportqty + "】!";
			mes.data = null;
			return mes;
			}
			}
			}
			}
			}
			else //中间工序的报工
			{
			//查询当前中间报工工序非此次报工：总报工数量、总不良数量、总报废数量
			//查询当前中间报工工序非此次报工：总报工数量、总不良数量、总报废数量
			sql = @"select isnull(sum(good_qty),0) as good_qty,isnull(sum(ng_qty),0) as ng_qty,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty
			from TK_Wrk_Record where wo_code=@wo_code and style='B' and id<>@id and step_code=@step_code";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			@@ -2568,51 +2838,111 @@
			decimal notthis_materielbad_qty = decimal.Parse(dt.Rows[0]["materielbad_qty"].ToString()); //当前工序非本次报工料废总数
			//获取当前中间工序报工总数量：本次修改报工数量+本次修改不良数量+本次修改工废数量+本次修改料废总数+当前工序非本次报工总数+当前工序非本次不良总数+当前工序非本次工废总数+当前工序非本次料废总数
			decimal updatereportsumqty = this_reportqty + this_ngqty + this_laborbadqty + this_materielbadqty + notthis_reportqty + notthis_ngqty + notthis_laborbad_qty + notthis_materielbad_qty;
			//查询当前工序上道工序：总报工数量、总不良数量、总工废数量、总料废数量
			sql = @"select isnull(sum(good_qty),0) as good_qty,isnull(sum(ng_qty),0) as ng_qty,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty
			from TK_Wrk_Record where wo_code=@wo_code and style='B' and step_seq=@step_seq-1";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@step_seq", json[0].step_seq);
			var dt0 = DapperHelper.selectdata(sql, dynamicParams);
			if (dt0.Rows.Count > 0)

			//判断是否存在上道工序及属性
			if (pre.Rows.Count > 0)
			{
			decimal last_reportqty = decimal.Parse(dt0.Rows[0]["good_qty"].ToString()); //上道工序报工总合格数量
			decimal last_ngqty = decimal.Parse(dt0.Rows[0]["ng_qty"].ToString()); //上道工序不良总数量
			decimal last_laborbad_qty = decimal.Parse(dt0.Rows[0]["laborbad_qty"].ToString()); //上道工序工废总数量
			decimal last_materielbad_qty = decimal.Parse(dt0.Rows[0]["materielbad_qty"].ToString());//上道工序料废总数量
			decimal last_updatereportsumqty = last_reportqty + last_ngqty + last_laborbad_qty + last_materielbad_qty;
			//判断：当前工序报工记录：当前工序报工总数>上道工序报工总合格数
			if (updatereportsumqty > last_reportqty)
			if (pre.Rows[0]["flwtype"].ToString() == "Z")
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "自制工序修改报工总数量：【" + updatereportsumqty + "】不能大于上道工序报工总合格数量：【" + last_reportqty + "】,请输入合法数值或先修改上道工序报工数量!";
			mes.data = null;
			return mes;
			//查询当前工序上道工序：总报工数量、总不良数量、总工废数量、总料废数量
			sql = @"select isnull(sum(good_qty),0) as good_qty,isnull(sum(ng_qty),0) as ng_qty,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty
			from TK_Wrk_Record where wo_code=@wo_code and style='B' and step_seq=@step_seq-1";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@step_seq", json[0].step_seq);
			var dt0 = DapperHelper.selectdata(sql, dynamicParams);
			if (dt0.Rows.Count > 0)
			{
			decimal last_reportqty = decimal.Parse(dt0.Rows[0]["good_qty"].ToString()); //上道工序报工总合格数量
			decimal last_ngqty = decimal.Parse(dt0.Rows[0]["ng_qty"].ToString()); //上道工序不良总数量
			decimal last_laborbad_qty = decimal.Parse(dt0.Rows[0]["laborbad_qty"].ToString()); //上道工序工废总数量
			decimal last_materielbad_qty = decimal.Parse(dt0.Rows[0]["materielbad_qty"].ToString());//上道工序料废总数量
			decimal last_updatereportsumqty = last_reportqty + last_ngqty + last_laborbad_qty + last_materielbad_qty;
			//判断：当前工序报工记录：当前工序报工总数>上道工序报工总合格数
			if (updatereportsumqty > last_reportqty)
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = "当前工序修改报工总数量：【" + updatereportsumqty + "】不能大于上道工序报工总合格数量：【" + last_reportqty + "】!";
			mes.data = null;
			return mes;
			}
			}
			}
			else
			{
			//查询当前工序上道工序：总收料数量
			sql = @"select isnull(sum(sqty),0) as good_qty
			from TK_Wrk_OutRecord where wo_code=@wo_code and style='S' and step_seq=@step_seq-1";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@step_seq", json[0].step_seq);
			var dt0 = DapperHelper.selectdata(sql, dynamicParams);
			if (dt0.Rows.Count > 0)
			{
			//判断当前工序：收料总数数量
			decimal last_reportqty = decimal.Parse(dt0.Rows[0]["good_qty"].ToString()); //上道工序收料总合格数量
			//判断：当前末道工序报工记录：当前工序报工总数量>上道工序收料总合格数量
			if (updatereportsumqty > last_reportqty)
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = "当前工序修改报工总数量：【" + updatereportsumqty + "】不能大于上道工序收料总合格数量：【" + last_reportqty + "】!";
			mes.data = null;
			return mes;
			}
			}
			}
			}
			//查询当前工序下道工序：总报工数量、总不良数量、总报废数量
			sql = @"select isnull(sum(good_qty),0) as good_qty,isnull(sum(ng_qty),0) as ng_qty,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty
			from TK_Wrk_Record where wo_code=@wo_code and style='B' and step_seq=@step_seq+1";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@step_seq", json[0].step_seq);
			var dt1 = DapperHelper.selectdata(sql, dynamicParams);
			if (dt1.Rows.Count > 0)
			//判断是否存在下道工序属性
			if (next.Rows.Count > 0)
			{
			decimal last_reportqty = decimal.Parse(dt1.Rows[0]["good_qty"].ToString()); //下道工序报工总数量
			decimal last_ngqty = decimal.Parse(dt1.Rows[0]["ng_qty"].ToString()); //下道工序不良总数量
			decimal last_laborbad_qty = decimal.Parse(dt1.Rows[0]["laborbad_qty"].ToString()); //下道工序工废总数量
			decimal last_materielbad_qty = decimal.Parse(dt1.Rows[0]["materielbad_qty"].ToString()); //下道工序料废总数量
			decimal last_updatereportsumqty = last_reportqty + last_ngqty + last_laborbad_qty + last_materielbad_qty;
			//判断：当前工序报工记录：当前工序报工总数<下道工序报工总数(合格+不良+工废+料废)
			//判断（当前非本次报工总合格数+本次报工调整合格数）<下道工序报工总数
			if ((notthis_reportqty + decimal.Parse(json[0].report_qty)< last_updatereportsumqty))
			if (next.Rows[0]["flwtype"].ToString() == "Z")
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "自制工序修改报工总合格数量：【" + (notthis_reportqty + decimal.Parse(json[0].report_qty)) + "】不能小于下道工序报工总数量：【" + last_updatereportsumqty + "】,请输入合法数值或先修改下道工序报工数量!";
			mes.data = null;
			return mes;
			//查询当前工序下道工序：总报工数量、总不良数量、总报废数量
			sql = @"select isnull(sum(good_qty),0) as good_qty,isnull(sum(ng_qty),0) as ng_qty,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty
			from TK_Wrk_Record where wo_code=@wo_code and style='B' and step_seq=@step_seq+1";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@step_seq", json[0].step_seq);
			var dt1 = DapperHelper.selectdata(sql, dynamicParams);
			if (dt1.Rows.Count > 0)
			{
			decimal last_reportqty = decimal.Parse(dt1.Rows[0]["good_qty"].ToString()); //下道工序报工总数量
			decimal last_ngqty = decimal.Parse(dt1.Rows[0]["ng_qty"].ToString()); //下道工序不良总数量
			decimal last_laborbad_qty = decimal.Parse(dt1.Rows[0]["laborbad_qty"].ToString()); //下道工序工废总数量
			decimal last_materielbad_qty = decimal.Parse(dt1.Rows[0]["materielbad_qty"].ToString()); //下道工序料废总数量
			decimal last_updatereportsumqty = last_reportqty + last_ngqty + last_laborbad_qty + last_materielbad_qty;
			//判断（当前非本次报工总合格数+本次报工调整合格数）<下道工序报工总数
			if ((notthis_reportqty + this_reportqty) < last_updatereportsumqty)
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = "当前工序修改报工总合格数量：【" + (notthis_reportqty + this_reportqty) + "】不能小于下道工序报工总数量：【" + last_updatereportsumqty + "】!";
			mes.data = null;
			return mes;
			}
			}
			}
			else
			{
			//查询当前工序下道工序：总发料数量
			sql = @"select isnull(sum(fqty),0) as good_qty
			from TK_Wrk_OutRecord where wo_code=@wo_code and style='F' and step_seq=@step_seq+1";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@step_seq", json[0].step_seq);
			var dt0 = DapperHelper.selectdata(sql, dynamicParams);
			if (dt0.Rows.Count > 0)
			{
			//判断当前工序：发料总数数量
			decimal last_reportqty = decimal.Parse(dt0.Rows[0]["good_qty"].ToString()); //下道工序发料总合格数量
			//判断（当前非本次报工总合格数+本次报工调整合格数）<下道工序发料总数
			if ((notthis_reportqty + this_reportqty) < last_reportqty)
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = "当前工序修改报工总数量：【" + (notthis_reportqty + this_reportqty) + "】不能大于下道工序发料总数量：【" + last_reportqty + "】!";
			mes.data = null;
			return mes;
			}
			}
			}
			}
			}
			@@ -2640,7 +2970,8 @@
			}
			});
			//回写对应的报工记录主表合格数量、不良数量、报废数量
			sql = @"update TK_Wrk_Record set start_qty=start_qty+@good_qty, good_qty=good_qty+@good_qty,ng_qty=ng_qty+@ng_qty,laborbad_qty=laborbad_qty+@laborbad_qty,materielbad_qty=materielbad_qty+@materielbad_qty
			sql = @"update TK_Wrk_Record set start_qty=start_qty+@good_qty, good_qty=good_qty+@good_qty,ng_qty=ng_qty+@ng_qty,laborbad_qty=laborbad_qty+@laborbad_qty,materielbad_qty=materielbad_qty+@materielbad_qty,
			updatereportuser=@updatereportuser,updatereportdate=@updatereportdate
			where wo_code=@wo_code and step_code=@step_code and id=@id and style='B'";
			list.Add(new
			{
			@@ -2653,7 +2984,9 @@
			materielbad_qty = this_materielbad_dvalue,
			wo_code = json[0].wo_code,
			step_code = json[0].step_code,
			id = int.Parse(json[0].id)
			id = int.Parse(json[0].id),
			updatereportuser = us.usercode,
			updatereportdate = date
			}
			});
			//回写工单工序表
			@@ -2672,7 +3005,7 @@
			step_code = json[0].step_code
			}
			});


			for (int i = 0; i < json[0].children.Count; i++)
			{
			//回写不良
			@@ -2716,22 +3049,337 @@
			}
			if (json[0].flw_type.ToString() == "W")//外协工序
			{
			//查询当前首道工序非此次供应商收料：总收料数量
			sql = @"select isnull(sum(sqty),0) as sqty
			from TK_Wrk_OutRecord where wo_code=@wo_code and style='S' and id<>@id and step_code=@step_code and wx_code<>@wx_code";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@id", json[0].id);
			dynamicParams.Add("@step_code", json[0].step_code);
			dynamicParams.Add("@wx_code", json[0].wxcode);
			var dt_c = DapperHelper.selectdata(sql, dynamicParams);
			//获取此次报工调整提交的数据(收料数量、不良数量、工废数量、料废数量)
			decimal this_reportqty = decimal.Parse(json[0].report_qty.ToString()); //收料数量
			decimal this_ngqty = json[0].children.Sum(item => decimal.Parse(item.ng_qty));//不良数量汇总
			decimal this_laborbadqty = json[0].children.Sum(item => decimal.Parse(item.laborbad_qty));//工废数量汇总
			decimal this_materielbadqty = json[0].children.Sum(item => decimal.Parse(item.materielbad_qty));//料废数量汇总
			decimal this_ng_dvalue = json[0].children.Sum(item => decimal.Parse(item.ng_dvalue));//不良数量差值汇总
			decimal this_laborbad_dvalue = json[0].children.Sum(item => decimal.Parse(item.laborbad_dvalue));//工废数量差值汇总
			decimal this_materielbad_dvalue = json[0].children.Sum(item => decimal.Parse(item.materielbad_dvalue));//料废数量差值汇总
			//获取当前工序、供应商对应的发料数量
			sql = @"select isnull(sum(fqty),0) as fqty
			from TK_Wrk_OutRecord where wo_code=@wo_code and style='F' and id<>@id and step_code=@step_code and wx_code=@wx_code";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@id", json[0].id);
			dynamicParams.Add("@step_code", json[0].step_code);
			dynamicParams.Add("@wx_code", json[0].wxcode);
			var dt_0 = DapperHelper.selectdata(sql, dynamicParams);
			//首道工序的收料
			if (json[0].first_choke == "Y")
			{
			//查询当前首道工序非此次收料：总收料数量、总不良数量、总工废数量、总料废数量
			sql = @"select isnull(sum(sqty),0) as good_qty,isnull(sum(ng_qty),0) as ng_qty,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty
			from TK_Wrk_OutRecord where wo_code=@wo_code and style='S' and id<>@id and step_code=@step_code and wx_code=@wx_code";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@id", json[0].id);
			dynamicParams.Add("@step_code", json[0].step_code);
			dynamicParams.Add("@wx_code", json[0].wxcode);
			var dt = DapperHelper.selectdata(sql, dynamicParams);
			decimal notthis_reportqty = decimal.Parse(dt.Rows[0]["good_qty"].ToString()); //当前工序非本次收料总数
			decimal notthis_ngqty = decimal.Parse(dt.Rows[0]["ng_qty"].ToString()); //当前工序非本次报工总不良数
			decimal notthis_laborbadqty = decimal.Parse(dt.Rows[0]["laborbad_qty"].ToString()); //当前工序非本次报工总工废数
			decimal notthis_materielbadqty = decimal.Parse(dt.Rows[0]["materielbad_qty"].ToString()); //当前工序非本次报工总料废数
			//判断：当前工序报工记录：本次收料数量+本次不良数量+本次工废数量+本次料废数量+当前工序非本次收料总数+当前工序非本次不良总数+当前工序非本次工废总数+当前工序非本次料废总数>发料数量
			decimal updatereportsumqty = this_reportqty + this_ngqty + this_laborbadqty + this_materielbadqty + notthis_reportqty + notthis_ngqty + notthis_laborbadqty + notthis_materielbadqty;
			if (updatereportsumqty > decimal.Parse(dt_0.Rows[0]["fqty"].ToString()))
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = "当前首道工序对应供应商收料总数量：【" + updatereportsumqty + "】不能大于发料数量：【" + decimal.Parse(dt_0.Rows[0]["fqty"].ToString()) + "】!";
			mes.data = null;
			return mes;
			}
			//判断是否存在下道工序及属性
			if (next.Rows.Count > 0)
			{
			if (next.Rows[0]["flwtype"].ToString() == "Z")
			{
			//查询当前工序下道工序：总报工数量、总不良数量、总报废数量
			sql = @"select isnull(sum(good_qty),0) as good_qty,isnull(sum(ng_qty),0) as ng_qty,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty
			from TK_Wrk_Record where wo_code=@wo_code and style='B' and step_seq=@step_seq+1";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@step_seq", json[0].step_seq);
			var dt0 = DapperHelper.selectdata(sql, dynamicParams);
			if (dt0.Rows.Count > 0)
			{
			//判断当前工序：报工总数数量+不良总数数量+工废总数量+料废总数量<下道工序报工总数量+下道工序不良总数量+下道工序工废总数量+下道工序料废总数量
			decimal last_reportqty = decimal.Parse(dt0.Rows[0]["good_qty"].ToString()); //下道工序报工总数量
			decimal last_ngqty = decimal.Parse(dt0.Rows[0]["ng_qty"].ToString()); //下道工序不良总数量
			decimal last_laborbad_qty = decimal.Parse(dt0.Rows[0]["laborbad_qty"].ToString()); //下道工序工废总数量
			decimal last_materielbad_qty = decimal.Parse(dt0.Rows[0]["materielbad_qty"].ToString()); //下道工序料废总数量
			decimal last_updatereportsumqty = last_reportqty + last_ngqty + last_laborbad_qty + last_materielbad_qty;
			//判断（当前非本次收料数+本次收料调整数+非当前供应商同工序收料总数）<下道工序报工总数
			if ((notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) < last_updatereportsumqty)
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = "当前首道工序收料数量：【" + (notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) + "】不能小于下道自制工序报工总数量：【" + last_updatereportsumqty + "】!";
			mes.data = null;
			return mes;
			}
			}
			}
			else
			{
			//查询当前工序下道工序：总发料数量
			sql = @"select isnull(sum(fqty),0) as good_qty
			from TK_Wrk_OutRecord where wo_code=@wo_code and style='F' and step_seq=@step_seq+1";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@step_seq", json[0].step_seq);
			var dt0 = DapperHelper.selectdata(sql, dynamicParams);
			if (dt0.Rows.Count > 0)
			{
			//判断当前工序：发料总数数量
			decimal last_reportqty = decimal.Parse(dt0.Rows[0]["good_qty"].ToString()); //下道工序发料总数量
			//判断（当前非本次收料数+本次报工调整收料数）<下道工序发料总数
			if ((notthis_reportqty + this_reportqty) < last_reportqty)
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = "当前首道工序收料总数量：【" + (notthis_reportqty + this_reportqty) + "】不能小于下道外协工序发料总数量：【" + last_reportqty + "】!";
			mes.data = null;
			return mes;
			}
			}
			}
			}

			}
			//末道工序的报工
			else if (json[0].last_choke == "Y")
			{
			//查询当前末道报工工序非此次收料：总收料数量、总不良数量、总工废数量、总料废数量
			sql = @"select isnull(sum(sqty),0) as good_qty,isnull(sum(ng_qty),0) as ng_qty,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty
			from TK_Wrk_OutRecord where wo_code=@wo_code and style='S' and id<>@id and step_code=@step_code and wx_code=@wx_code";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@id", json[0].id);
			dynamicParams.Add("@step_code", json[0].step_code);
			var dt = DapperHelper.selectdata(sql, dynamicParams);
			decimal notthis_reportqty = decimal.Parse(dt.Rows[0]["good_qty"].ToString()); //当前末道工序非本次收料总数
			decimal notthis_ngqty = decimal.Parse(dt.Rows[0]["ng_qty"].ToString()); //当前末道工序非本次报工总数
			decimal notthis_laborbad_qty = decimal.Parse(dt.Rows[0]["laborbad_qty"].ToString()); //当前末道工序非本次报工工废总数
			decimal notthis_materielbad_qty = decimal.Parse(dt.Rows[0]["materielbad_qty"].ToString()); //当前末道工序非本次报工料废总数
			//获取当前末道工序收料总数量：本次修改收料数量+本次修改不良数量+本次修改工废数量+本次修改报工料废数量+当前末道工序非本次收料总数+当前末道工序非本次不良总数+当前末道工序非本次工废总数+当前末道工序非本次料废总数
			decimal updatereportsumqty = this_reportqty + this_ngqty + this_laborbadqty + this_materielbadqty + notthis_reportqty + notthis_ngqty + notthis_laborbad_qty + notthis_materielbad_qty;
			//判断当前工序供应商收料总数>当前工序供应商对应发料数量
			if (updatereportsumqty > decimal.Parse(dt_0.Rows[0]["fqty"].ToString()))
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = "当前工序供应商收料总数量：【" + updatereportsumqty + "】不能大于工序供应商发料总数量：【" + decimal.Parse(dt_0.Rows[0]["fqty"].ToString()) + "】!";
			mes.data = null;
			return mes;
			}

			}
			else //中间工序的报工
			{

			//查询当前首道工序供应商非此次收料：总收料数量、总不良数量、总工废数量、总料废数量
			sql = @"select isnull(sum(sqty),0) as good_qty,isnull(sum(ng_qty),0) as ng_qty,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty
			from TK_Wrk_OutRecord where wo_code=@wo_code and style='S' and id<>@id and step_code=@step_code and wx_code=@wx_code";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@id", json[0].id);
			dynamicParams.Add("@step_code", json[0].step_code);
			dynamicParams.Add("@wx_code", json[0].wxcode);
			var dt = DapperHelper.selectdata(sql, dynamicParams);
			decimal notthis_reportqty = decimal.Parse(dt.Rows[0]["good_qty"].ToString()); //当前工序非本次收料总数
			decimal notthis_ngqty = decimal.Parse(dt.Rows[0]["ng_qty"].ToString()); //当前工序非本次报工总不良数
			decimal notthis_laborbadqty = decimal.Parse(dt.Rows[0]["laborbad_qty"].ToString()); //当前工序非本次报工总工废数
			decimal notthis_materielbadqty = decimal.Parse(dt.Rows[0]["materielbad_qty"].ToString()); //当前工序非本次报工总料废数
			//判断：当前工序报工记录：本次收料数量+本次不良数量+本次工废数量+本次料废数量+当前工序非本次收料总数+当前工序非本次不良总数+当前工序非本次工废总数+当前工序非本次料废总数>发料数量
			decimal updatereportsumqty = this_reportqty + this_ngqty + this_laborbadqty + this_materielbadqty + notthis_reportqty + notthis_ngqty + notthis_laborbadqty + notthis_materielbadqty;
			if (updatereportsumqty > decimal.Parse(dt_0.Rows[0]["fqty"].ToString()))
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = "当前首道工序对应供应商收料总数量：【" + updatereportsumqty + "】不能大于发料数量：【" + decimal.Parse(dt_0.Rows[0]["fqty"].ToString()) + "】!";
			mes.data = null;
			return mes;
			}
			//判断是否存在下道工序及属性
			if (next.Rows.Count > 0)
			{
			if (next.Rows[0]["flwtype"].ToString() == "Z")
			{
			//查询当前工序下道工序：总报工数量、总不良数量、总报废数量
			sql = @"select isnull(sum(good_qty),0) as good_qty,isnull(sum(ng_qty),0) as ng_qty,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty
			from TK_Wrk_Record where wo_code=@wo_code and style='B' and step_seq=@step_seq+1";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@step_seq", json[0].step_seq);
			var dt0 = DapperHelper.selectdata(sql, dynamicParams);
			if (dt0.Rows.Count > 0)
			{
			//判断当前工序：报工总数数量+不良总数数量+工废总数量+料废总数量<下道工序报工总数量+下道工序不良总数量+下道工序工废总数量+下道工序料废总数量
			decimal last_reportqty = decimal.Parse(dt0.Rows[0]["good_qty"].ToString()); //下道工序报工总数量
			decimal last_ngqty = decimal.Parse(dt0.Rows[0]["ng_qty"].ToString()); //下道工序不良总数量
			decimal last_laborbad_qty = decimal.Parse(dt0.Rows[0]["laborbad_qty"].ToString()); //下道工序工废总数量
			decimal last_materielbad_qty = decimal.Parse(dt0.Rows[0]["materielbad_qty"].ToString()); //下道工序料废总数量
			decimal last_updatereportsumqty = last_reportqty + last_ngqty + last_laborbad_qty + last_materielbad_qty;
			//判断（当前非本次收料数+本次收料调整数+非当前供应商同工序收料总数）<下道工序报工总数
			if ((notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) < last_updatereportsumqty)
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = "当前首道工序收料数量：【" + (notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) + "】不能小于下道自制工序报工总数量：【" + last_updatereportsumqty + "】!";
			mes.data = null;
			return mes;
			}
			}
			}
			else
			{
			//查询当前工序下道工序：总发料数量
			sql = @"select isnull(sum(fqty),0) as good_qty
			from TK_Wrk_OutRecord where wo_code=@wo_code and style='F' and step_seq=@step_seq+1";
			dynamicParams.Add("@wo_code", json[0].wo_code);
			dynamicParams.Add("@step_seq", json[0].step_seq);
			var dt0 = DapperHelper.selectdata(sql, dynamicParams);
			if (dt0.Rows.Count > 0)
			{
			//判断当前工序：发料总数数量
			decimal last_reportqty = decimal.Parse(dt0.Rows[0]["good_qty"].ToString()); //下道工序发料总数量
			//判断（当前非本次收料数+本次报工调整收料数+非当前供应商同工序收料总数）<下道工序发料总数
			if ((notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) < last_reportqty)
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = "当前首道工序收料总数量：【" + (notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) + "】不能小于下道外协工序发料总数量：【" + last_reportqty + "】!";
			mes.data = null;
			return mes;
			}
			}
			}
			}
			}

			///////////////////////////////修改报工//////////////////////////////

			//回写对应的外协记录子表收料数量、不良数量、报废数量
			sql = @"update TK_Wrk_OutRecordSub set sqty=sqty+@repair_qty,ng_qty=ng_qty+@ng_qty,laborbad_qty=laborbad_qty+@laborbad_qty,materielbad_qty=materielbad_qty+@materielbad_qty,
			updatereportuser=@updatereportuser,updatereportdate=@updatereportdate
			where m_id=@m_id and id=@id and style='S' and wx_code=@wx_code";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			m_id = int.Parse(json[0].id),
			id = int.Parse(json[0].sbid),
			repair_qty = decimal.Parse(json[0].report_dvalue),
			ng_qty = this_ng_dvalue,
			laborbad_qty = this_laborbad_dvalue,
			materielbad_qty = this_materielbad_dvalue,
			wx_code = json[0].wxcode,
			//bad_money = decimal.Parse(json[i].badmoney_dvalue),
			updatereportuser = us.usercode,
			updatereportdate = date
			}
			});
			//回写对应的收料记录主表收料数量、不良数量、报废数量
			sql = @"update TK_Wrk_OutRecord set sqty=sqty+@good_qty,ng_qty=ng_qty+@ng_qty,laborbad_qty=laborbad_qty+@laborbad_qty,materielbad_qty=materielbad_qty+@materielbad_qty,
			updatereportuser=@updatereportuser,updatereportdate=@updatereportdate
			where wo_code=@wo_code and step_code=@step_code and id=@id and style='S' and wx_code=@wx_code";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			good_qty = decimal.Parse(json[0].report_dvalue),
			ng_qty = this_ng_dvalue,
			laborbad_qty = this_laborbad_dvalue,
			materielbad_qty = this_materielbad_dvalue,
			wx_code = json[0].wxcode,
			wo_code = json[0].wo_code,
			step_code = json[0].step_code,
			id = int.Parse(json[0].id),
			updatereportuser = us.usercode,
			updatereportdate = date
			}
			});
			//回写工单工序表
			sql = @"update TK_Wrk_Step set good_qty=good_qty+@good_qty,ng_qty=ng_qty+@ng_qty,laborbad_qty=laborbad_qty+@laborbad_qty,materielbad_qty=materielbad_qty+@materielbad_qty
			where wo_code=@wo_code and step_code=@step_code";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			good_qty = decimal.Parse(json[0].report_dvalue),
			ng_qty = this_ng_dvalue,
			laborbad_qty = this_laborbad_dvalue,
			materielbad_qty = this_materielbad_dvalue,
			wo_code = json[0].wo_code,
			step_code = json[0].step_code
			}
			});

			for (int i = 0; i < json[0].children.Count; i++)
			{
			//回写不良
			sql = @"update CSR_WorkRecord_Defect set defect_qty=defect_qty+@ng_qty,defect_pendqty=defect_pendqty+@ng_qty,laborbad_qty=laborbad_qty+@laborbad_qty,materielbad_qty=materielbad_qty+@materielbad_qty,
			updatereportuser=@updatereportuser,updatereportdate=@updatereportdate
			where wo_code=@wo_code and step_code=@step_code and id=@ng_id and record_id=@record_id and style='S'";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			ng_qty = decimal.Parse(json[0].children[i].ng_dvalue),
			laborbad_qty = decimal.Parse(json[0].children[i].laborbad_dvalue),
			materielbad_qty = decimal.Parse(json[0].children[i].materielbad_dvalue),
			wo_code = json[0].wo_code,
			step_code = json[0].step_code,
			ng_id = int.Parse(json[0].children[i].ng_id),
			record_id = json[0].id,
			updatereportuser = us.usercode,
			updatereportdate = date
			}
			});
			//回写不良处理
			sql = @"update CSR_WorkRecord_DefectHandle set laborbad_qty=laborbad_qty+@laborbad_qty,materielbad_qty=materielbad_qty+@materielbad_qty
			where wo_code=@wo_code and step_code=@step_code and defect_id=@defect_id and style='S'";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			laborbad_qty = decimal.Parse(json[0].children[i].laborbad_dvalue),
			materielbad_qty = decimal.Parse(json[0].children[i].materielbad_dvalue),
			wo_code = json[0].wo_code,
			step_code = json[0].step_code,
			defect_id = int.Parse(json[0].children[i].ng_id),
			updatereportuser = us.usercode,
			updatereportdate = date
			}
			});
			}
			}

			bool aa = DapperHelper.DoTransaction(list);
			if (aa)
			{
			//写入操作记录表
			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;
			}
			}
			@@ -2739,7 +3387,178 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			}
			#endregion



			#region[生产执行,报工审核列表数据查询接口]
			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+'%' ";
			dynamicParams.Add("@wo_code", wo_code);
			}
			if (partnumber != "" && partnumber != null)
			{
			search += "and AA.partnumber like '%'+@partnumber+'%' ";
			dynamicParams.Add("@partnumber", partnumber);
			}
			if (partname != "" && partname != null)
			{
			search += "and AA.partname like '%'+@partname+'%' ";
			dynamicParams.Add("@partname", partname);
			}
			if (partspec != "" && partspec != null)
			{
			search += "and AA.partspec like '%'+@partspec+'%' ";
			dynamicParams.Add("@partspec", partspec);
			}
			if (stepname != "" && stepname != null)
			{
			search += "and AA.stepname like '%'+@stepname+'%' ";
			dynamicParams.Add("@stepname", stepname);
			}
			if (reportuser != "" && reportuser != null)
			{
			search += "and AA.usercode like '%'+@reportuser+'%' ";
			dynamicParams.Add("@reportuser", reportuser);
			}
			if (reportdateopendate != "" && reportdateopendate != null)
			{
			search += "and AA.report_date between @reportdateopendate and @reportdateclosedate ";
			dynamicParams.Add("@reportdateopendate", reportdateopendate + " 00:00:00");
			dynamicParams.Add("@reportdateclosedate", reportdateclosedate + " 23:59:59");
			}


			if (search == "")
			{
			search = "and 1=1 ";
			}
			search = search.Substring(3);//截取索引2后面的字符
			// --------------查询指定自制报工外协收料数据--------------
			var total = 0; //总条数
			var sql = @"select * from(
			select A.id,B.id as sbid,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,A.task_qty,M.wkshp_code,T.torg_name as wkshp_name,A.eqp_code,E.name as eqp_name,
			A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,k.isbott as first_choke,k.isend as last_choke,A.step_price,B.reckway,B.usergroup_code,G.usergroupname as usergroup_name,
			B.report_person as usercode,
			STUFF((SELECT ',' + U.username
			FROM TUser U
			WHERE CHARINDEX(',' + U.usercode + ',', ',' + B.report_person + ',') > 0
			FOR XML PATH('')), 1, 1, '') AS username,
			B.report_date,B.report_qty,B.ng_qty,B.laborbad_qty,B.materielbad_qty,'' as wx_code,'' as wx_name,A.verify
			from TK_Wrk_Record A
			inner join TK_Wrk_RecordSub B on A.id=B.m_id
			left join TK_Wrk_Man M on A.wo_code=M.wo_code
			left join TK_Wrk_Step K on M.wo_code=K.wo_code and A.step_code=K.step_code
			left join TStep S on A.step_code=S.stepcode
			left join TMateriel_Info P on A.materiel_code=P.partcode
			left join TOrganization T on M.wkshp_code=T.torg_code
			left join TEqpInfo E on A.eqp_code=E.code
			left join TGroup G on G.usergroupcode=B.usergroup_code
			where A.style='B' and B.style='B' and M.status<>'CLOSED'
			union all
			select A.id,B.id as sbid,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,M.plan_qty as task_qty,M.wkshp_code,T.torg_name as wkshp_name,A.wx_code as eqp_code,E.name as eqp_name,
			A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,k.isbott as first_choke,k.isend as last_choke,A.step_price,'person' as reckway,'' as usergroup_code,'' as usergroup_name,
			B.in_person as usercode,
			STUFF((SELECT ',' + U.username
			FROM TUser U
			WHERE CHARINDEX(',' + U.usercode + ',', ',' + B.in_person + ',') > 0
			FOR XML PATH('')), 1, 1, '') AS username,
			B.in_time as report_date,B.sqty as report_qty,B.ng_qty,B.laborbad_qty,B.materielbad_qty,A.wx_code,C.name as wx_name,A.verify
			from TK_Wrk_OutRecord A
			inner join TK_Wrk_OutRecordSub B on A.id = B.m_id
			left join TK_Wrk_Man M on A.wo_code = M.wo_code
			left join TK_Wrk_Step K on M.wo_code=K.wo_code and A.step_code=K.step_code
			left join TStep S on A.step_code = S.stepcode
			left join TMateriel_Info P on A.materiel_code = P.partcode
			left join TOrganization T on M.wkshp_code = T.torg_code
			left join TCustomer E on A.wx_code = E.code
			left join TCustomer C on A.wx_code=C.code
			where A.style = 'S' and B.style = 'S' and M.status<>'CLOSED'
			) as AA where" + search;
			var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			mes.message = "查询成功!";
			mes.count = total;
			mes.data = data.ToList();
			}
			catch (Exception e)
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			}
			#endregion

			#region[生产执行,报工审核数据提交]
			public static ToMessage MesOrderStepReportVerifySeave(User us, DataModel json)
			{
			var sql = "";
			List<object> list = new List<object>();
			var dynamicParams = new DynamicParameters();
			try
			{
			if (json.zdata.Count > 0)
			{
			//回写报工记录主表审核状态、审核人、审核时间
			sql = @"update TK_Wrk_Record set verify='Y',verifyuser=@verifyuser,verifydate=@verifydate where id in @id";
			list.Add(new { str = sql, parm = new { verifyuser = us.usercode, verifydate = DateTime.Now.ToString(), id = json.zdata } });
			//回写报工记录子表审核状态、审核人、审核时间
			sql = @"update TK_Wrk_RecordSub set verify='Y',verifyuser=@verifyuser,verifydate=@verifydate where m_id in @id";
			list.Add(new { str = sql, parm = new { verifyuser = us.usercode, verifydate = DateTime.Now.ToString(), id = json.zdata } });
			}
			if (json.wdata.Count > 0)
			{
			//回写外协记录主表审核状态、审核人、审核时间
			sql = @"update TK_Wrk_OutRecord set verify='Y',verifyuser=@verifyuser,verifydate=@verifydate where id in @id";
			list.Add(new { str = sql, parm = new { verifyuser = us.usercode, verifydate = DateTime.Now.ToString(), id = json.wdata } });
			//回写外协记录子表审核状态、审核人、审核时间
			sql = @"update TK_Wrk_OutRecordSub set verify='Y',verifyuser=@verifyuser,verifydate=@verifydate where m_id in @id";
			list.Add(new { str = sql, parm = new { verifyuser = us.usercode, verifydate = DateTime.Now.ToString(), id = json.wdata } });
			}
			bool aa = DapperHelper.DoTransaction(list);
			if (aa)
			{
			//写入操作记录表
			LogHelper.DbOperateLog(us.usercode, "报工审核", "自制报工记录id:" + string.Join(",", json.zdata), us.usertype);
			LogHelper.DbOperateLog(us.usercode, "报工审核", "外协收料记录id:" + string.Join(",", json.wdata), us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.message = "审核成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = "审核失败!";
			mes.data = null;
			}
			}
			catch (Exception e)
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;