ZQHApi.git - Gitblit

			@@ -694,52 +694,52 @@
			{
			if (wkshopcode != "" && wkshopcode != null)
			{
			search += "and W.wkshp_code=@wkshopcode ";
			search += "and AA.wkshp_code=@wkshopcode ";
			dynamicParams.Add("@wkshopcode", wkshopcode);
			}
			if (wocode != "" && wocode != null)
			{
			search += "and A.wo_code like '%'+@wocode+'%' ";
			search += "and AA.wo_code like '%'+@wocode+'%' ";
			dynamicParams.Add("@wocode", wocode);
			}
			if (partcode != "" && partcode != null)
			{
			search += "and M.partcode like '%'+@partcode+'%' ";
			search += "and AA.partcode like '%'+@partcode+'%' ";
			dynamicParams.Add("@partcode", partcode);
			}
			if (partname != "" && partname != null)
			{
			search += "and M.partname like '%'+@partname+'%' ";
			search += "and AA.partname like '%'+@partname+'%' ";
			dynamicParams.Add("@partname", partname);
			}
			if (partspec != "" && partspec != null)
			{
			search += "and M.partspec like '%'+@partspec+'%' ";
			search += "and AA.partspec like '%'+@partspec+'%' ";
			dynamicParams.Add("@partspec", partspec);
			}
			if (stepname != "" && stepname != null)
			{
			search += "and T.stepname like '%'+@stepname+'%' ";
			search += "and AA.stepname like '%'+@stepname+'%' ";
			dynamicParams.Add("@stepname", stepname);
			}
			if (defectcode != "" && defectcode != null)
			{
			search += "and F.code like '%'+@defectcode+'%' ";
			search += "and AA.defect_code like '%'+@defectcode+'%' ";
			dynamicParams.Add("@defectcode", defectcode);
			}
			if (defectname != "" && defectname != null)
			{
			search += "and F.name like '%'+@defectname+'%' ";
			search += "and AA.defect_name like '%'+@defectname+'%' ";
			dynamicParams.Add("@defectname", defectname);
			}
			if (reportname != "" && reportname != null)
			{
			search += "and U.username like '%'+@reportname+'%' ";
			search += "and AA.username like '%'+@reportname+'%' ";
			dynamicParams.Add("@reportname", reportname);
			}
			if (reportopendate != "" && reportopendate != null)
			{
			search += "and A.lm_date between @reportopendate and @reportclosedate ";
			search += "and AA.lm_date between @reportopendate and @reportclosedate ";
			dynamicParams.Add("@reportopendate", reportopendate + " 00:00:00");
			dynamicParams.Add("@reportclosedate", reportclosedate + " 23:59:59");
			}
			@@ -751,16 +751,22 @@
			search = search.Substring(3);//截取索引2后面的字符
			// --------------查询指定数据--------------
			var total = 0; //总条数
			var sql = @"select W.wkshp_code,L.org_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,P.plan_qty,A.defect_qty,
			F.code as defect_code,F.name as defect_name,A.style,U.username as lm_user,A.lm_date
			var sql = @"select * from(
			select W.wkshp_code,L.org_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,P.plan_qty,A.defect_qty,A.defect_pendqty,A.bad_qty,
			A.defect_code,
			STUFF((SELECT ',' + P.name
			FROM TDefect P
			WHERE CHARINDEX(',' + P.code + ',', ',' + A.defect_code + ',') > 0
			FOR XML PATH('')), 1, 1, '') AS defect_name,
			A.style,U.username as lm_user,A.lm_date
			from CSR_WorkRecord_Defect A
			inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
			left join TMateriel_Info M on A.partnumber=M.partcode
			left join TStep T on A.step_code=T.stepcode
			left join TDefect F on A.defect_code=F.code
			left join TUser U on A.lm_user=U.usercode
			left join TK_Wrk_Man W on A.wo_code=W.wo_code
			left join TOrganization L on W.wkshp_code=L.org_code
			) as AA
			where " + search;
			var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			@@ -788,52 +794,52 @@
			{
			if (wkshopcode != "" && wkshopcode != null)
			{
			search += "and W.wkshp_code=@wkshopcode ";
			search += "and AA.wkshp_code=@wkshopcode ";
			dynamicParams.Add("@wkshopcode", wkshopcode);
			}
			if (wocode != "" && wocode != null)
			{
			search += "and A.wo_code like '%'+@wocode+'%' ";
			search += "and AA.wo_code like '%'+@wocode+'%' ";
			dynamicParams.Add("@wocode", wocode);
			}
			if (partcode != "" && partcode != null)
			{
			search += "and M.partcode like '%'+@partcode+'%' ";
			search += "and AA.partcode like '%'+@partcode+'%' ";
			dynamicParams.Add("@partcode", partcode);
			}
			if (partname != "" && partname != null)
			{
			search += "and M.partname like '%'+@partname+'%' ";
			search += "and AA.partname like '%'+@partname+'%' ";
			dynamicParams.Add("@partname", partname);
			}
			if (partspec != "" && partspec != null)
			{
			search += "and M.partspec like '%'+@partspec+'%' ";
			search += "and AA.partspec like '%'+@partspec+'%' ";
			dynamicParams.Add("@partspec", partspec);
			}
			if (stepname != "" && stepname != null)
			{
			search += "and T.stepname like '%'+@stepname+'%' ";
			search += "and AA.stepname like '%'+@stepname+'%' ";
			dynamicParams.Add("@stepname", stepname);
			}
			if (defectcode != "" && defectcode != null)
			{
			search += "and F.code like '%'+@defectcode+'%' ";
			search += "and AA.code like '%'+@defectcode+'%' ";
			dynamicParams.Add("@defectcode", defectcode);
			}
			if (defectname != "" && defectname != null)
			{
			search += "and F.name like '%'+@defectname+'%' ";
			search += "and AA.name like '%'+@defectname+'%' ";
			dynamicParams.Add("@defectname", defectname);
			}
			if (reportname != "" && reportname != null)
			{
			search += "and U.username like '%'+@reportname+'%' ";
			search += "and AA.username like '%'+@reportname+'%' ";
			dynamicParams.Add("@reportname", reportname);
			}
			if (reportopendate != "" && reportopendate != null)
			{
			search += "and A.lm_date between @reportopendate and @reportclosedate ";
			search += "and AA.lm_date between @reportopendate and @reportclosedate ";
			dynamicParams.Add("@reportopendate", reportopendate + " 00:00:00");
			dynamicParams.Add("@reportclosedate", reportclosedate + " 23:59:59");
			}
			@@ -845,17 +851,25 @@
			search = search.Substring(3);//截取索引2后面的字符
			// --------------查询指定数据--------------
			var total = 0; //总条数
			var sql = @"select W.wkshp_code as 车间编码,L.org_name as 车间名称,A.wo_code as 工单编号,M.partcode as 产品编码,M.partname as 产品名称,M.partspec as 产品规格,T.stepcode as 工序编码,
			T.stepname as 工序名称,P.plan_qty as 任务数量,A.defect_qty as 不良数量,F.code as 缺陷代码,F.name as 缺陷名称,
			(case when A.style='B' then '报工' when A.style='S' then '收料' end) as '操作类型',U.username as 操作人员,A.lm_date as 操作时间
			var sql = @"select AA.wkshp_code as 车间编码,AA.wkshp_name as 车间名称,AA.wo_code as 工单编号,AA.partcode as 产品编码,AA.partname as 产品名称,AA.partspec as 产品规格,AA.stepcode as 工序编码,
			AA.stepname as 工序名称,AA.plan_qty as 任务数量,AA.defect_qty as 不良数量,A.defect_pendqty as 不良待处理数量,A.bad_qty as 报废数量,AA.defect_code as 缺陷代码,AA.defect_name as 缺陷名称,
			(case when AA.style='B' then '报工' when AA.style='S' then '收料' end) as '操作类型',AA.username as 操作人员,AA.lm_date as 操作时间
			from(
			select W.wkshp_code,L.org_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,P.plan_qty,A.defect_qty,
			A.defect_code,
			STUFF((SELECT ',' + P.name
			FROM TDefect P
			WHERE CHARINDEX(',' + P.code + ',', ',' + A.defect_code + ',') > 0
			FOR XML PATH('')), 1, 1, '') AS defect_name,
			A.style,U.username,A.lm_date
			from CSR_WorkRecord_Defect A
			inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
			left join TMateriel_Info M on A.partnumber=M.partcode
			left join TStep T on A.step_code=T.stepcode
			left join TDefect F on A.defect_code=F.code
			left join TUser U on A.lm_user=U.usercode
			left join TK_Wrk_Man W on A.wo_code=W.wo_code
			left join TOrganization L on W.wkshp_code=L.org_code
			left join TOrganization L on W.wkshp_code=L.org_code
			) as AA
			where " + search;
			DataTable data = DapperHelper.selectdata(sql, dynamicParams);
			data.TableName = "Table"; //设置DataTable的名称