ZQHApi.git - Gitblit

			@@ -22,7 +22,7 @@


			#region[ERP订单查询]
			public static ToMessage ErpOrderSearch(string stu_torgcode,string stu_torgtypecode,string erporderstus, string erpordercode, 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 stu_torgcode,string stu_torgtypecode,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)
			{
			var dynamicParams = new DynamicParameters();
			string search = "";
			@@ -52,6 +52,11 @@
			{
			search += "and A.wo like '%'+@erpordercode+'%' ";
			dynamicParams.Add("@erpordercode", erpordercode);
			}
			if (saleordercode != "" && saleordercode != null)
			{
			search += "and A.saleOrderCode like '%'+@saleordercode+'%' ";
			dynamicParams.Add("@saleordercode", saleordercode);
			}
			if (partcode != "" && partcode != null)
			{
			@@ -93,7 +98,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.org_name as wkshp_name,
			A.stck_code,D.name as stck_name,saleOrderDeliveryDate,A.planstartdate,A.planenddate,U.username as createuser,A.createdate
			A.stck_code,D.name as stck_name,A.saleOrderCode,A.saleOrderDeliveryDate,A.planstartdate,A.planenddate,U.username as createuser,A.createdate,A.sbid
			from TKimp_Ewo A
			left join TMateriel_Info B on A.materiel_code=B.partcode
			left join TOrganization C on A.wkshp_code=C.org_code
			@@ -119,7 +124,7 @@
			#endregion

			#region[ERP订单下达]
			public static ToMessage MarkSaveErpOrder(string erporderid, string erpordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string saleOrderDeliveryDate, string username)
			public static ToMessage MarkSaveErpOrder(string erporderid, string erpordercode,string saleordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string saleOrderDeliveryDate, string username)
			{
			var sql = "";
			List<object> list = new List<object>();
			@@ -144,7 +149,7 @@
			if (i == 1) //首单获取工单号
			{
			sql = @"select isnull(max(cast(substring(wo_code,charindex('_',wo_code)+1,len(wo_code)-charindex('_',wo_code)) as numeric)),0)+1 as worknumb
			from TK_Wrk_Man where m_po=@erpordercode";
			from TK_Wrk_Man where m_po=@erpordercode";
			dynamicParams.Add("@erpordercode", erpordercode);
			var data = DapperHelper.selectdata(sql, dynamicParams);
			num = Convert.ToInt32(data.Rows[0]["WORKNUMB"].ToString());
			@@ -157,7 +162,7 @@
			}
			if (i == Convert.ToInt32(ordernum)) //最后一单时
			{
			sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderDeliveryDate)";
			sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate)";
			list.Add(new
			{
			str = sql,
			@@ -174,6 +179,7 @@
			m_po = erpordercode,
			username = username,
			CreateDate = DateTime.Now.ToString(),
			saleOrderCode=saleordercode,
			saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate)
			}
			});
			@@ -182,7 +188,7 @@
			else
			{

			sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderDeliveryDate)";
			sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate)";
			list.Add(new
			{
			str = sql,
			@@ -199,6 +205,7 @@
			m_po = erpordercode,
			username = username,
			CreateDate = DateTime.Now.ToString(),
			saleOrderCode=saleordercode,
			saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate)
			}
			});
			@@ -320,10 +327,83 @@
			}
			#endregion

			#region[ERP订单删除]
			public static ToMessage DeleteErpOrder(string erporderid, string erpordercode, string username)
			{
			var sql = "";
			List<object> list = new List<object>();
			var dynamicParams = new DynamicParameters();
			try
			{
			sql = @"select * from TK_Wrk_Man where m_po=@erpordercode and sourceid=@erporderid and status<>'NEW'";
			dynamicParams.Add("@erpordercode", erpordercode);
			dynamicParams.Add("@erporderid", erporderid);
			var data = DapperHelper.selectdata(sql, dynamicParams);
			if (data.Rows.Count > 0)
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前订单下有工单已派发或已开工或已完工(关闭),不允许删除!";
			mes.data = null;
			return mes;
			}
			else
			{
			//删除工单
			sql = @"delete TK_Wrk_Man where m_po=@wo and sourceid=@erporderid";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			wo = erpordercode,
			erporderid = erporderid
			}
			});
			//删除订单
			sql = @"delete TKimp_Ewo where wo=@wo and id=@erporderid";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			wo = erpordercode,
			erporderid = erporderid
			}
			});
			}
			bool aa = DapperHelper.DoTransaction(list);
			LogHelper.WriteLogData(aa.ToString());
			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 MesOrderSearch(string stu_torgcode,string stu_torgtypecode,string mesorderstus, string mesordercode, string sourceorder, 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 stu_torgcode,string stu_torgtypecode,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)
			{
			var dynamicParams = new DynamicParameters();
			string search = "";
			@@ -358,6 +438,11 @@
			{
			search += "and A.m_po like '%'+@sourceorder+'%' ";
			dynamicParams.Add("@sourceorder", sourceorder);
			}
			if (saleordercode != "" && saleordercode != null)
			{
			search += "and W.saleOrderCode like '%'+@saleordercode+'%' ";
			dynamicParams.Add("@saleordercode", saleordercode);
			}
			if (ordertype != "" && ordertype != null)
			{
			@@ -397,8 +482,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.org_name as wkshp_name,
			A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,U.username as lm_user,A.lm_date
			A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,W.saleOrderCode,U.username as lm_user,A.lm_date
			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
			left join TOrganization C on A.wkshp_code=C.org_code
			left join T_Sec_Stck D on A.stck_code=D.code
			@@ -425,7 +511,7 @@
			#endregion

			#region[MES报废补单工单查询]
			public static ToMessage MesBadOrderSearch(string mesordercode, string sourceorder, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
			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)
			{
			var dynamicParams = new DynamicParameters();
			string search = "";
			@@ -440,6 +526,11 @@
			{
			search += "and A.m_po like '%'+@sourceorder+'%' ";
			dynamicParams.Add("@sourceorder", sourceorder);
			}
			if (saleordercode != "" && saleordercode != null)
			{
			search += "and W.saleOrderCode like '%'+@saleordercode+'%' ";
			dynamicParams.Add("@saleordercode", saleordercode);
			}
			if (partcode != "" && partcode != null)
			{
			@@ -474,8 +565,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.org_name as wkshp_name,
			A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,U.username as lm_user,A.lm_date,S.bad_qty
			A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,W.saleOrderCode,U.username as lm_user,A.lm_date,S.bad_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 (select wo_code,sum(bad_qty) as bad_qty from TK_Wrk_Step where bad_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.org_code
			@@ -1848,7 +1940,7 @@
			switch (OperType)
			{
			case "ZZ":
			mes = ScanStartReport.ZZEncodingSeach(stu_torgcode,ordercode, stepcode);
			mes = ScanStartReport.ZZEncodingSeach(stu_torgcode, SelectType,ordercode, stepcode);
			break;
			case "WX":
			mes = ScanStartReport.WXEncodingSeach(stu_torgcode,SelectType, ordercode, stepcode);
			@@ -1988,7 +2080,11 @@
			try
			{
			//班组获取人员列表
			sql = @"select usercode,username from TUser where stu_torgcode=@stu_torgcode and usergroup_code=@usergroupcode and is_delete<>'1'";
			sql = @"select U.usercode,U.username
			from TGroup G
			inner join TGroupUser T on G.group_code=T.group_code
			left join TUser U on T.user_code=U.usercode
			where G.torg_code=@stu_torgcode and G.group_code=@usergroupcode";
			dynamicParams.Add("@stu_torgcode", stu_torgcode);
			dynamicParams.Add("@usergroupcode", usergroupcode);
			var data = DapperHelper.selectdata(sql, dynamicParams);
			@@ -2152,15 +2248,16 @@
			string date = DateTime.Now.ToString(); //获取系统时间
			list.Clear();
			//判断是否有开工记录
			sql = @"select * from TK_Wrk_Record where wo_code=@wo_code and step_code=@step_code and style='S'";
			sql = @"select * from TK_Wrk_Record where wo_code=@wo_code and step_code=@step_code and eqp_code=@eqpcode and style='S'";
			dynamicParams.Add("@wo_code", mesordercode);
			dynamicParams.Add("@step_code", stepcode);
			dynamicParams.Add("@eqpcode", eqpcode);
			var data = DapperHelper.selectdata(sql, dynamicParams);
			if (data.Rows.Count > 0)
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序任务已开工!";
			mes.Message = "当前工序任务设备已开工!";
			mes.data = null;
			return mes;
			}
			@@ -2208,10 +2305,10 @@
			#endregion

			#region[生产开报工,报工提交]
			public static ToMessage SavaMesOrderStepReport(string mesordercode, string partcode, string stepseq, string stepcode, string eqpcode, string inbarcode, string reckway, string usergroupcode, string reportuser, string taskqty, string startqty, string reportqty, string ngqty, string badcode, string remarks, string username)
			public static ToMessage SavaMesOrderStepReport(string mesordercode, string partcode, string stepseq, string stepcode, string eqpcode, string inbarcode, string reckway, string usergroupcode, string reportuser, string taskqty, string startqty, string reportqty, List<ReportDefectList> defectobjs, string remarks, string username)
			{
			var sql = "";
			//string[] arra = new string[] { };
			decimal ngqty = 0;
			string[] arra1 = new string[] { };
			List<object> list = new List<object>();
			var dynamicParams = new DynamicParameters();
			@@ -2220,12 +2317,18 @@
			string date = DateTime.Now.ToString(); //获取系统时间
			//获取报工人员、分配比例
			JArray arra = (JArray)Newtonsoft.Json.JsonConvert.DeserializeObject(reportuser);
			if (ngqty != "" \|\| ngqty != "0")
			//判断是否有不良数据
			var groupedItems = defectobjs.GroupBy(item => item.defect_code) // 按编码code分组
			.Select(group => new { defect_code = group.Key, badqty = group.Sum(item =>Convert.ToDecimal(item.badqty)) }).ToList(); // 汇总数量qty
			if (groupedItems.Count <= 0)
			{
			//截取不良原因
			arra1 = badcode.Split(';');
			ngqty = 0;
			}

			else
			{
			//汇总不良数量
			ngqty = groupedItems.Sum(item => Convert.ToDecimal(item.badqty));
			}
			list.Clear();
			//判断是否有报工记录(有：修改无：新增)
			sql = @"select * from TK_Wrk_Record where wo_code=@wo_code and step_code=@step_code and style='B'";
			@@ -2235,9 +2338,10 @@
			//获取开工记录的默认选中的设备(产线)与报工时的设备产线做对比判断
			sql = @"select A.eqp_code,B.name from TK_Wrk_Record A
			inner join TEqpInfo B on A.eqp_code=B.code
			where A.wo_code=@wo_code and A.step_code=@step_code and A.style='S'";
			where A.wo_code=@wo_code and A.step_code=@step_code and eqp_code=@eqpcode and A.style='S'";
			dynamicParams.Add("@wo_code", mesordercode);
			dynamicParams.Add("@step_code", stepcode);
			dynamicParams.Add("@eqpcode", eqpcode);
			var da = DapperHelper.selectdata(sql, dynamicParams);
			if (da.Rows[0]["EQP_CODE"].ToString() != eqpcode)
			{
			@@ -2252,6 +2356,7 @@
			//获取主表最大ID
			sql = @"select ISNULL(IDENT_CURRENT('TK_Wrk_Record')+1,1) as id";
			var dt = DapperHelper.selecttable(sql);

			//写入开报工记录表
			sql = @"insert into TK_Wrk_Record(wo_code,step_seq,step_code,eqp_code,materiel_code,task_qty,start_qty,good_qty,ng_qty,style,lm_user,lm_date,inbarcode)
			values(@mesordercode,@stepseq,@stepcode,@eqpcode,@partcode,@taskqty,@startqty,@reportqty,@ngqty,@style,@lm_user,@lm_date,@inbarcode)";
			@@ -2283,14 +2388,14 @@
			});

			}
			if (badcode != "" && ngqty != "0")
			if (groupedItems.Count>0)
			{
			//写入缺陷记录表
			for (int i = 0; i < arra1.Length; i++)
			for (int i = 0; i < groupedItems.Count; i++)
			{
			sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_code,remarks,style,lm_user,lm_date)
			values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = ngqty, defect_code = arra1[i], remarks = remarks, style = "B", lm_user = username, lm_date = date } });
			sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_pendqty,defect_code,remarks,style,lm_user,lm_date)
			values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_pendqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_pendqty= groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "B", lm_user = username, lm_date = date } });

			}
			}
			@@ -2354,14 +2459,14 @@
			});

			}
			if (badcode != "" && ngqty != "0")
			if (groupedItems.Count > 0)
			{
			//写入缺陷记录表
			for (int i = 0; i < arra1.Length; i++)
			for (int i = 0; i < groupedItems.Count; i++)
			{
			sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_code,remarks,style,lm_user,lm_date)
			values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = ngqty, defect_code = arra1[i], remarks = remarks, style = "B", lm_user = username, lm_date = date } });
			sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_pendqty,defect_code,remarks,style,lm_user,lm_date)
			values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_pendqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_pendqty= groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "B", lm_user = username, lm_date = date } });

			}
			}
			@@ -2485,20 +2590,27 @@
			#endregion

			#region[生产开报工, 收料提交]
			public static ToMessage SavaMesOrderStepIn(string mesordercode, string partcode, string stepseq, string stepcode, string wxcode, string inbarcode, string inuser, string taskqty, string sqty, string ngqty, string badcode, string remarks, string username)
			public static ToMessage SavaMesOrderStepIn(string mesordercode, string partcode, string stepseq, string stepcode, string wxcode, string inbarcode, string inuser, string taskqty, string sqty, List<ReportDefectList> defectobjs, string remarks, string username)
			{
			var sql = "";
			string[] arra1 = new string[] { };
			decimal ngqty = 0;
			List<object> list = new List<object>();
			var dynamicParams = new DynamicParameters();
			try
			{
			string date = DateTime.Now.ToString(); //获取系统时间
			//截取不良原因
			if (ngqty != "" \|\| ngqty != "0")
			//判断是否有不良数据
			var groupedItems = defectobjs.GroupBy(item => item.defect_code) // 按编码code分组
			.Select(group => new { defect_code = group.Key, badqty = group.Sum(item => Convert.ToDecimal(item.badqty)) }).ToList(); // 汇总数量qty
			if (groupedItems.Count <= 0)
			{
			//截取不良原因
			arra1 = badcode.Split(';');
			ngqty = 0;
			}
			else
			{
			//汇总不良数量
			ngqty = groupedItems.Sum(item => Convert.ToDecimal(item.badqty));
			}

			list.Clear();
			@@ -2532,7 +2644,7 @@
			mes.data = null;
			return mes;
			}
			if ((decimal.Parse(sqty) + decimal.Parse(ngqty)) > decimal.Parse(da.Rows[0]["FQTY"].ToString())) //收料数量+不良数量>发料数量
			if ((decimal.Parse(sqty) + ngqty) > decimal.Parse(da.Rows[0]["FQTY"].ToString())) //收料数量+不良数量>发料数量
			{
			mes.code = "300";
			mes.count = 0;
			@@ -2552,7 +2664,7 @@
			{
			decimal sum_sqty = data.AsEnumerable().Select(d => d.Field<decimal>("SQTY")).Sum(); //获取同单号,同工序,同外协供应商收料总数量
			decimal sum_fqty = da.AsEnumerable().Select(d => d.Field<decimal>("FQTY")).Sum(); //获取同单号,同工序,同外协供应商发料总数量
			if ((sum_sqty + decimal.Parse(sqty) + decimal.Parse(ngqty)) > sum_fqty) //已收料总数+当前收料数量+不良数量>总发料数量
			if ((sum_sqty + decimal.Parse(sqty) + ngqty) > sum_fqty) //已收料总数+当前收料数量+不良数量>总发料数量
			{
			mes.code = "300";
			mes.count = 0;
			@@ -2575,14 +2687,14 @@
			values(@m_id,@wxcode,@in_person,@in_time,@sqty,@ng_qty,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { m_id = int.Parse(dt.Rows[0]["ID"].ToString()), wxcode = wxcode, in_person = inuser, in_time = date, sqty = sqty, ng_qty = ngqty, style = "S", lm_user = username, lm_date = date } });

			if (badcode != "" && ngqty != "0")
			if (groupedItems.Count>0)
			{
			//写入缺陷记录表
			for (int i = 0; i < arra1.Length; i++)
			for (int i = 0; i < groupedItems.Count; i++)
			{
			sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_code,remarks,style,lm_user,lm_date)
			values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = ngqty, defect_code = arra1[i], remarks = remarks, style = "S", lm_user = username, lm_date = date } });
			sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_pendqty,defect_code,remarks,style,lm_user,lm_date)
			values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_pendqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_pendqty= groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "S", lm_user = username, lm_date = date } });

			}
			}
			@@ -2624,14 +2736,14 @@
			values(@m_id,@wxcode,@in_person,@in_time,@sqty,@ng_qty,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { m_id = int.Parse(dt.Rows[0]["ID"].ToString()), wxcode = wxcode, in_person = inuser, in_time = date, sqty = sqty, ng_qty = ngqty, style = "S", lm_user = username, lm_date = date } });

			if (badcode != "" && ngqty != "0")
			if (groupedItems.Count > 0)
			{
			//写入缺陷记录表
			for (int i = 0; i < arra1.Length; i++)
			for (int i = 0; i < groupedItems.Count; i++)
			{
			sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_code,remarks,style,lm_user,lm_date)
			values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = ngqty, defect_code = arra1[i], remarks = remarks, style = "S", lm_user = username, lm_date = date } });
			sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_pendqty,defect_code,remarks,style,lm_user,lm_date)
			values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_pendqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_pendqty= groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "S", lm_user = username, lm_date = date } });

			}
			}
			@@ -2704,7 +2816,7 @@
			str = sql,
			parm = new
			{
			m_id = int.Parse(json.Data.Rows[i]["ID"].ToString()),
			m_id = int.Parse(json.Data.Rows[i]["M_ID"].ToString()),
			repair_qty = decimal.Parse(json.Data.Rows[i]["REPAIR_QTY"].ToString()),
			bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString())
			}
			@@ -2721,18 +2833,33 @@
			bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString()),
			wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
			step_code = json.Data.Rows[i]["STEP_CODE"].ToString(),
			id = int.Parse(json.Data.Rows[i]["ID"].ToString())
			id = int.Parse(json.Data.Rows[i]["M_ID"].ToString())
			}
			});
			//写入报工缺陷处理记录表
			sql = @"insert into CSR_WorkRecord_DefectHandle(record_subid,wo_code,partnumber,step_seq,step_code,repair_qty,bad_qty,defect_code,style,lm_user,lm_date)
			values(@record_subid,@wo_code,@partcode,@stepseq,@stepcode,@repair_qty,@bad_qty,@defect_code,@style,@lm_user,@lm_date)";
			//回写缺陷记录表的待处理数量
			sql = @"update CSR_WorkRecord_Defect set defect_pendqty=defect_pendqty-@repair_qty-@bad_qty,bad_qty=bad_qty+@bad_qty
			where wo_code=@wo_code and step_code=@step_code and id=@id and style='B'";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			record_subid = int.Parse(json.Data.Rows[i]["M_ID"].ToString()),
			repair_qty = decimal.Parse(json.Data.Rows[i]["REPAIR_QTY"].ToString()),
			bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString()),
			wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
			step_code = json.Data.Rows[i]["STEP_CODE"].ToString(),
			id = int.Parse(json.Data.Rows[i]["ID"].ToString())
			}
			});
			//写入报工缺陷处理记录表
			sql = @"insert into CSR_WorkRecord_DefectHandle(defect_id,wo_code,partnumber,step_seq,step_code,repair_qty,bad_qty,defect_code,style,lm_user,lm_date)
			values(@defect_id,@wo_code,@partcode,@stepseq,@stepcode,@repair_qty,@bad_qty,@defect_code,@style,@lm_user,@lm_date)";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			defect_id = int.Parse(json.Data.Rows[i]["ID"].ToString()),
			wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
			partcode = json.Data.Rows[i]["MATERIEL_CODE"].ToString(),
			stepseq = json.Data.Rows[i]["SEQ"].ToString(),
			@@ -2760,7 +2887,7 @@
			str = sql,
			parm = new
			{
			m_id = int.Parse(json.Data.Rows[i]["ID"].ToString()),
			m_id = int.Parse(json.Data.Rows[i]["M_ID"].ToString()),
			repair_qty = decimal.Parse(json.Data.Rows[i]["REPAIR_QTY"].ToString()),
			bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString())
			}
			@@ -2777,18 +2904,33 @@
			bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString()),
			wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
			step_code = json.Data.Rows[i]["STEP_CODE"].ToString(),
			id = int.Parse(json.Data.Rows[i]["ID"].ToString())
			id = int.Parse(json.Data.Rows[i]["M_ID"].ToString())
			}
			});
			//写入报工缺陷处理记录表
			sql = @"insert into CSR_WorkRecord_DefectHandle(record_subid,wo_code,partnumber,step_seq,step_code,repair_qty,bad_qty,defect_code,style,lm_user,lm_date)
			values(@record_subid,@wo_code,@partcode,@stepseq,@stepcode,@repair_qty,@bad_qty,@defect_code,@style,@lm_user,@lm_date)";
			//回写缺陷记录表的待处理数量
			sql = @"update CSR_WorkRecord_Defect set defect_pendqty=defect_pendqty-@repair_qty-@bad_qty,bad_qty=bad_qty+@bad_qty
			where wo_code=@wo_code and step_code=@step_code and id=@id and style='S'";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			record_subid = int.Parse(json.Data.Rows[i]["M_ID"].ToString()),
			repair_qty = decimal.Parse(json.Data.Rows[i]["REPAIR_QTY"].ToString()),
			bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString()),
			wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
			step_code = json.Data.Rows[i]["STEP_CODE"].ToString(),
			id = int.Parse(json.Data.Rows[i]["ID"].ToString())
			}
			});
			//写入报工缺陷处理记录表
			sql = @"insert into CSR_WorkRecord_DefectHandle(defect_id,wo_code,partnumber,step_seq,step_code,repair_qty,bad_qty,defect_code,style,lm_user,lm_date)
			values(@defect_id,@wo_code,@partcode,@stepseq,@stepcode,@repair_qty,@bad_qty,@defect_code,@style,@lm_user,@lm_date)";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			defect_id = int.Parse(json.Data.Rows[i]["ID"].ToString()),
			wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
			partcode = json.Data.Rows[i]["MATERIEL_CODE"].ToString(),
			stepseq = json.Data.Rows[i]["SEQ"].ToString(),