JCApi.git - Gitblit

			@@ -104,7 +104,8 @@
			// --------------查询指定数据--------------
			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.clerkuser
			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,
			B.priuserdefnvc1,B.priuserdefnvc2,B.priuserdefnvc3,B.priuserdefnvc4,B.priuserdefnvc5,B.priuserdefnvc6
			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
			@@ -624,8 +625,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.route_code,R.name as route_name,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.clerkuser
			var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.route_code,B.default_route,R.name as route_name,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.clerkuser,
			B.priuserdefnvc1,B.priuserdefnvc2,B.priuserdefnvc3,B.priuserdefnvc4,B.priuserdefnvc5,B.priuserdefnvc6,A.printcount
			from TK_Wrk_Man A
			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
			@@ -712,7 +714,8 @@
			// --------------查询指定数据--------------
			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,S.laborbad_qty,S.materielbad_qty
			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,
			B.priuserdefnvc1,B.priuserdefnvc2,B.priuserdefnvc3,B.priuserdefnvc4,B.priuserdefnvc5,B.priuserdefnvc6
			from TK_Wrk_Man A
			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
			@@ -1054,6 +1057,345 @@
			}
			#endregion

			#region[MES工单批量绑定获取工序数据]
			public static ToMessage UpdateMesOrderStepListSearch(List<WorkStepList> worksteplist)
			{
			string sql = ""; decimal canupdate_qty = 0;
			var dynamicParams = new DynamicParameters();
			List<Dictionary<object, object>> dir = new List<Dictionary<object, object>>();
			try
			{
			for (int i = 0; i < worksteplist.Count; i++)
			{
			// 创建一个新的字典
			Dictionary<object, object> dict = new Dictionary<object, object>();

			if (worksteplist[i].data_sources == "ERP") //数据来源ERP
			{

			//查询当前工单可修改数量=订单总数-已下达工单总数
			sql = @"select isnull(plan_qty,0) as plan_qty from TK_Wrk_Man
			where sourceid=@sourceid and m_po=@sourcewo and wo_code=@wocode";
			dynamicParams.Add("@sourceid", worksteplist[i].sourceid);
			dynamicParams.Add("@sourcewo", worksteplist[i].sourcewo);
			dynamicParams.Add("@wocode", worksteplist[i].wocode);
			var data = DapperHelper.selectdata(sql, dynamicParams);
			//当前工单数量
			canupdate_qty = decimal.Parse(data.Rows[0]["plan_qty"].ToString());
			}
			if (worksteplist[i].data_sources == "MES") //数据来源MES
			{
			if (worksteplist[i].sourceid == "" \|\| worksteplist[i].sourceid == null) //无源单
			{
			//查询当前工单可修改数量=工单总数
			sql = @"select plan_qty from TK_Wrk_Man where wo_code=@wo_code";
			dynamicParams.Add("@wo_code", worksteplist[i].wocode);
			var data = DapperHelper.selectdata(sql, dynamicParams);
			//当前工单工单数量
			canupdate_qty = decimal.Parse(data.Rows[0]["plan_qty"].ToString());
			}
			else //有源单(报废补单)
			{
			//不控制标识为-1
			canupdate_qty = -1;
			}
			}
			//获取工序信息
			sql = @"select S.wo_code,S.seq,S.step_code as stepcode,T.stepname,S.stepprice,(isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0)) as produceq_qty,
			S.good_qty,S.ng_qty,S.laborbad_qty,S.materielbad_qty,(isnull(S.plan_qty,0)-(isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0))) as delive_qty,S.isbott,S.isend
			from TK_Wrk_Step S
			left join TStep T on S.step_code=T.stepcode
			where S.wo_code=@wocode order by S.seq ";
			dynamicParams.Add("@wocode", worksteplist[i].wocode);
			var data1 = DapperHelper.selectdata(sql, dynamicParams);

			// 向字典中添加数据
			dict.Add("canupdate_qty", canupdate_qty);
			dict.Add("stepdata", data1);
			// 将字典添加到列表中
			dir.Add(dict);
			mes.code = "200";
			mes.count = dir.Count;
			mes.message = "查询成功";
			mes.data = dir;
			}
			}
			catch (Exception e)
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			}
			#endregion

			#region[MES工单新增、编辑批量绑定提交]
			public static ToMessage AddUpdateMesOrderList(string operType, List<WorkList> json, User us)
			{
			string sql = "", route_code = "";
			var dynamicParams = new DynamicParameters();
			List<object> list = new List<object>();
			try
			{
			dynamic dynObj = JObject.Parse(us.mesSetting);
			bool route = dynObj.route;
			if (!route) //工序版
			{
			route_code = null;
			}
			if (operType == "Add")
			{
			for (int i = 0; i < json.Count; i++)
			{
			route_code = json[i].routecode;
			//写入工单表
			sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,lm_user,lm_date,materiel_code,route_code,sourceid,m_po,saleOrderDeliveryDate,plan_startdate,plan_enddate,piroque,isaps,data_sources,isstep)
			values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@lm_user,@lm_date,@materiel_code,@route_code,@sourceid,@m_po,@saleOrderDeliveryDate,@plan_startdate,@plan_enddate,@orderlev,@isaps,@data_sources,@isstep)";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			wo_code = json[i].wocode,
			wotype = json[i].wotype,
			status = json[i].wostatus,
			wkshp_code = json[i].wkshopcode,
			plan_qty = json[i].woqty,
			lm_user = us.usercode,
			lm_date = DateTime.Now.ToString(),
			materiel_code = json[i].partcode,
			route_code = route_code,
			sourceid = json[i].sourceid == "" ? null : json[i].sourceid, //无源单时赋值NULL
			m_po = json[i].sourcewo,
			saleOrderDeliveryDate = json[i].deliverydate,
			plan_startdate = json[i].paystartdate,
			plan_enddate = json[i].payenddate,
			orderlev = "3",//优先级：特级（1）紧急（2）正常（3）
			isaps = "N", //是否排产,默认N Y=是 N=否
			data_sources = json[i].data_sources,
			isstep = json[i].isstep //是否关联工序
			}
			});
			//写入工序任务表
			for (int j = 0; j < json[i].WorkListSub.Count; j++)
			{
			sql = @"insert into TK_Wrk_Step(wo_code,seq,step_code,route_code,stepprice,plan_qty,status,isbott,isend,lm_user,lm_date)
			values(@wo_code,@seq,@step_code,@route_code,@stepprice,@plan_qty,@status,@isbott,@isend,@lm_user,@lm_date)";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			wo_code = json[i].wocode,
			seq = json[i].WorkListSub[j].stepseq,
			step_code = json[i].WorkListSub[j].stepcode,
			route_code = route_code,
			stepprice = json[i].WorkListSub[j].stepprice,
			plan_qty = json[i].woqty,
			status = json[i].wostatus,
			isbott = json[i].WorkListSub[j].isbott,
			isend = json[i].WorkListSub[j].isend,
			lm_user = us.usercode,
			lm_date = DateTime.Now.ToString()
			}
			});
			}
			}
			bool aa = DapperHelper.DoTransaction(list);
			if (aa)
			{
			//写入操作记录表
			LogHelper.DbOperateLog(us.usercode, "新增", "新增了工单:" + json[0].wocode, 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;
			}
			}
			if (operType == "Update")
			{
			for (int i = 0; i < json.Count; i++)
			{
			route_code = json[i].routecode;
			//修改工单表
			sql = @"update TK_Wrk_Man set wotype=@wotype,wkshp_code=@wkshp_code,plan_qty=@plan_qty,lm_user=@lm_user,lm_date=@lm_date,
			materiel_code=@materiel_code,route_code=@route_code,sourceid=@sourceid,m_po=@m_po,saleOrderDeliveryDate=@saleOrderDeliveryDate,plan_startdate=@plan_startdate,plan_enddate=@plan_enddate,isstep=@isstep
			where wo_code=@wo_code";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			wo_code = json[i].wocode,
			wotype = json[i].wotype,
			wkshp_code = json[i].wkshopcode,
			plan_qty = json[i].woqty,
			materiel_code = json[i].partcode,
			route_code = route_code,
			sourceid = json[i].sourceid == "" ? null : json[i].sourceid, //无源单时赋值NULL
			m_po = json[i].sourcewo,
			saleOrderDeliveryDate = json[i].deliverydate,
			plan_startdate = json[i].paystartdate,
			plan_enddate = json[i].payenddate,
			lm_user = us.usercode,
			lm_date = DateTime.Now.ToString(),
			isstep = json[i].isstep //是否关联工序
			}
			});
			//删除工单工序表
			sql = @"delete TK_Wrk_Step where wo_code=@wo_code";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			wo_code = json[i].wocode
			}
			});
			//写入工单工序表
			for (int j = 0; j < json[i].WorkListSub.Count; j++)
			{
			sql = @"insert into TK_Wrk_Step(wo_code,seq,step_code,route_code,stepprice,plan_qty,status,isbott,isend,lm_user,lm_date)
			values(@wo_code,@seq,@step_code,@route_code,@stepprice,@plan_qty,@status,@isbott,@isend,@lm_user,@lm_date)";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			wo_code = json[i].wocode,
			seq = json[i].WorkListSub[j].stepseq,
			step_code = json[i].WorkListSub[j].stepcode,
			route_code = route_code,
			stepprice = json[i].WorkListSub[j].stepprice,
			plan_qty = json[i].woqty,
			status = json[i].wostatus,
			isbott = json[i].WorkListSub[j].isbott,
			isend = json[i].WorkListSub[j].isend,
			lm_user = us.usercode,
			lm_date = DateTime.Now.ToString()
			}
			});
			}
			//判断源头单据是否来源ERP
			if (json[i].data_sources == "ERP")
			{
			//判断工单修改数量差值是否为0
			if (json[i].difference != "0")
			{
			string staus = "";
			//查询订单总数,已下达数量
			sql = @"select qty,relse_qty from TKimp_Ewo where id=@sourceid and wo=@sourcewo";
			dynamicParams.Add("@sourceid", json[i].sourceid);
			dynamicParams.Add("@sourcewo", json[i].sourcewo);
			var data0 = DapperHelper.selectdata(sql, dynamicParams);
			//当前工单可修改数量=订单数量-非当前工单总下达工单数量
			decimal qty = decimal.Parse(data0.Rows[0]["qty"].ToString());//订单总数
			decimal relse_qty = decimal.Parse(data0.Rows[0]["relse_qty"].ToString());//订单已下达总数
			relse_qty = relse_qty + decimal.Parse(json[i].difference);//新的下达数量=原始下达数量+差值(正负)
			if (qty == relse_qty)
			{
			staus = "CREATED"; //全部下达
			}
			else
			{
			staus = "CREATING";//部分下达
			}
			//更新订单表状态、已下达数量
			sql = @"update TKimp_Ewo set status=@status,relse_qty=@relse_qty where id=@sourceid and wo=@sourcewo";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			status = staus,
			relse_qty = relse_qty,
			sourceid = json[i].sourceid,
			sourcewo = json[i].sourcewo
			}
			});
			}
			}
			}
			bool aa = DapperHelper.DoTransaction(list);
			if (aa)
			{
			//写入操作记录表
			LogHelper.DbOperateLog(us.usercode, "修改", "修改了工单:" + string.Join(",", json.Select(j => j.wocode.ToString())), 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;
			}
			#endregion

			#region[MES工单打印更新打印次数]
			public static ToMessage UpdateMesOrderPrintCount(string wo_code)
			{
			var sql = "";
			List<object> list = new List<object>();
			var dynamicParams = new DynamicParameters();
			try
			{
			//更新工单打印次数
			sql = @"update TK_Wrk_Man set printcount=printcount+1 where wo_code=@wo_code";
			list.Add(new { str = sql, parm = new { wo_code = wo_code } });

			bool aa = DapperHelper.DoTransaction(list);
			if (aa)
			{
			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;
			}
			#endregion



			#region[MES工单删除]
			public static ToMessage DeleteMesOrder(string souceid, string wocode, string m_po, string orderqty, User us)
			{
			@@ -1150,7 +1492,7 @@
			if (route) //工艺路线版
			{
			//MES工单查找历史引用最新工序信息
			sql = @"select S.wo_code,S.seq,S.step_code,S.stepprice,isbott,isend
			sql = @"select S.wo_code,S.seq,S.step_code,T.stepname as step_name,S.stepprice,isbott,isend
			from TK_Wrk_Step S
			inner join (
			select top 1 A.wo_code,A.route_code from TK_Wrk_Man A
			@@ -1167,7 +1509,7 @@
			else
			{
			//MES工单查找历史引用最新工序信息
			sql = @"select S.wo_code,S.seq,S.step_code,S.stepprice,isbott,isend
			sql = @"select S.wo_code,S.seq,S.step_code,T.stepname as step_name,S.stepprice,isbott,isend
			from TK_Wrk_Step S
			inner join (
			select top 1 A.wo_code from TK_Wrk_Man A
			@@ -1419,7 +1761,8 @@
			// --------------查询指定数据--------------
			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.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,
			B.priuserdefnvc1,B.priuserdefnvc2,B.priuserdefnvc3,B.priuserdefnvc4,B.priuserdefnvc5,B.priuserdefnvc6
			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 TMateriel_Info B on A.materiel_code=B.partcode
			@@ -1569,7 +1912,8 @@
			}
			//根据条件查询工单工序任务(自制工序)
			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
			S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.laborbad_qty,A.materielbad_qty,B.lm_date,
			M.priuserdefnvc1,M.priuserdefnvc2,M.priuserdefnvc3,M.priuserdefnvc4,M.priuserdefnvc5,M.priuserdefnvc6
			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
			@@ -1673,7 +2017,8 @@
			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
			A.laborbad_qty,A.materielbad_qty,A.plan_startdate,A.plan_enddate,B.lm_date,
			M.priuserdefnvc1,M.priuserdefnvc2,M.priuserdefnvc3,M.priuserdefnvc4,M.priuserdefnvc5,M.priuserdefnvc6
			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
			@@ -1774,7 +2119,8 @@
			}
			//根据条件查询工单工序任务(自制工序)
			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
			S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.laborbad_qty,A.materielbad_qty,B.lm_date,
			M.priuserdefnvc1,M.priuserdefnvc2,M.priuserdefnvc3,M.priuserdefnvc4,M.priuserdefnvc5,M.priuserdefnvc6
			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
			@@ -1811,7 +2157,7 @@
			{
			//1.根据工单+工序查找当前工序是否首道工序
			sql = @"select A.wo_code,P.partcode,P.partname,P.partspec, T.stepcode,T.stepname,A.seq,T.flwtype,T.descr,A.status,
			A.plan_qty,A.good_qty,A.ng_qty,A.laborbad_qty,A.materielbad_qty,A.isbott,A.isend
			A.plan_qty,A.good_qty,A.ng_qty,A.laborbad_qty,A.materielbad_qty,A.isbott,A.isend
			from TK_Wrk_Step A
			left join TStep T on A.step_code=T.stepcode
			left join TK_Wrk_Man M on A.wo_code=M.wo_code
			@@ -1941,7 +2287,7 @@
			#endregion

			#region[生产开报工,报工提交]
			public static ToMessage SavaMesOrderStepReport(string mesordercode, string partcode, string stepseq, string stepcode, string stepprice, string eqpcode, string inbarcode, string reckway, string usergroupcode, string reportuser, string taskqty, string startqty, string reportqty, List<ReportDefectList> defectobjs, string remarks, User us)
			public static ToMessage SavaMesOrderStepReport(string mesordercode, string partcode, string stepseq, string stepcode, string stepprice, string eqpcode, string inbarcode, string reckway, string usergroupcode, string reportuser,string payrate, string taskqty, string startqty, string reportqty, List<ReportDefectList> defectobjs, string remarks, User us)
			{
			var sql = "";
			decimal ngqty = 0;
			@@ -2038,8 +2384,8 @@
			list.Add(new { str = sql, parm = new { mesordercode = mesordercode, stepseq = stepseq, stepcode = stepcode, step_price = stepprice, eqpcode = eqpcode, partcode = partcode, taskqty = taskqty, startqty = startqty, reportqty = reportqty, ngqty = ngqty, style = "B", lm_user = us.usercode, lm_date = date, inbarcode = inbarcode } });

			//写入子表
			sql = @"insert into TK_Wrk_RecordSub(m_id,eqp_code,report_person,report_date,report_qty,reckway,usergroup_code,ratio,ng_qty,style,lm_user,lm_date)
			values(@m_id,@eqp_code,@report_person,@report_date,@report_qty,@reckway,@usergroup_code,@ratio,@ng_qty,@style,@lm_user,@lm_date)";
			sql = @"insert into TK_Wrk_RecordSub(m_id,eqp_code,payrate,report_person,report_date,report_qty,reckway,usergroup_code,ratio,ng_qty,style,lm_user,lm_date)
			values(@m_id,@eqp_code,@payrate,@report_person,@report_date,@report_qty,@reckway,@usergroup_code,@ratio,@ng_qty,@style,@lm_user,@lm_date)";
			list.Add(new
			{
			str = sql,
			@@ -2047,6 +2393,7 @@
			{
			m_id = int.Parse(dt.Rows[0]["ID"].ToString()),
			eqp_code = eqpcode,
			payrate= payrate,
			report_person = reportuser,
			report_date = date,
			report_qty = reportqty,
			@@ -2082,8 +2429,8 @@
			list.Add(new { str = sql, parm = new { mesordercode = mesordercode, stepseq = stepseq, stepcode = stepcode, step_price = stepprice, eqpcode = eqpcode, partcode = partcode, taskqty = taskqty, startqty = startqty, reportqty = reportqty, ngqty = ngqty, style = "B", lm_user = us.usercode, lm_date = date, inbarcode = inbarcode } });

			//写入子表
			sql = @"insert into TK_Wrk_RecordSub(m_id,eqp_code,report_person,report_date,report_qty,reckway,usergroup_code,ratio,ng_qty,style,lm_user,lm_date)
			values(@m_id,@eqp_code,@report_person,@report_date,@report_qty,@reckway,@usergroup_code,@ratio,@ng_qty,@style,@lm_user,@lm_date)";
			sql = @"insert into TK_Wrk_RecordSub(m_id,eqp_code,payrate,report_person,report_date,report_qty,reckway,usergroup_code,ratio,ng_qty,style,lm_user,lm_date)
			values(@m_id,@eqp_code,@payrate,@report_person,@report_date,@report_qty,@reckway,@usergroup_code,@ratio,@ng_qty,@style,@lm_user,@lm_date)";
			list.Add(new
			{
			str = sql,
			@@ -2091,6 +2438,7 @@
			{
			m_id = int.Parse(dt.Rows[0]["ID"].ToString()),
			eqp_code = eqpcode,
			payrate= payrate,
			report_person = reportuser,
			report_date = date,
			report_qty = reportqty,