DDNewApi.git - Gitblit

			@@ -85,7 +85,7 @@
			var sql = @"select top 100 percent AA.saleOrderCode,AA.m_po,AA.wkshp_code,AA.wkshp_name,AA.wo_code,AA.status,AA.lm_date,
			AA.partcode,AA.partname,AA.partspec,AA.plan_qty,left(AA.concat_name,len(concat_name)-1) as concat_name
			from (
			select E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.torg_name as wkshp_name,
			select W.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.torg_name as wkshp_name,
			case when W.status='START' then '执行中' when W.status='CLOSED' then '已完成' else '未开始' end as status,
			W.lm_date,
			P.partcode,P.partname,P.partspec,W.plan_qty,
			@@ -96,12 +96,9 @@
			where n.wo_code=W.wo_code for xml path('')
			) as concat_name
			from TK_Wrk_Man W
			left join (
			select wo,saleOrderCode from TKimp_Ewo
			) as E on W.m_po=E.wo
			left join TMateriel_Info P on W.materiel_code=p.partcode
			left join TOrganization F on W.wkshp_code=F.torg_code
			group by E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.torg_name,W.status,W.lm_date,P.partcode,P.partname,P.partspec,W.plan_qty
			group by W.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.torg_name,W.status,W.lm_date,P.partcode,P.partname,P.partspec,W.plan_qty
			) as AA where AA.concat_name is not null " + search;
			var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			@@ -185,7 +182,7 @@
			AA.status as 工单状态,AA.lm_date as 单据日期
			AA.partcode as 产品编码,AA.partname as 产品名称,AA.partspec as 产品规格,AA.plan_qty as 任务数量,left(AA.concat_name,len(concat_name)-1) as 生产进度
			from (
			select E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.torg_name as wkshp_name,
			select W.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.torg_name as wkshp_name,
			case when W.status='START' then '执行中' when W.status='CLOSED' then '已完成' else '未开始' end as status,
			W.lm_date,
			P.partcode,P.partname,P.partspec,W.plan_qty,
			@@ -196,12 +193,9 @@
			where n.wo_code=W.wo_code for xml path('')
			) as concat_name
			from TK_Wrk_Man W
			left join (
			select wo,saleOrderCode from TKimp_Ewo
			) as E on W.m_po=E.wo
			left join TMateriel_Info P on W.materiel_code=p.partcode
			left join TOrganization F on W.wkshp_code=F.torg_code
			group by E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.torg_name,W.status,W.lm_date,P.partcode,P.partname,P.partspec,W.plan_qty
			group by W.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.torg_name,W.status,W.lm_date,P.partcode,P.partname,P.partspec,W.plan_qty
			) as AA
			where where AA.concat_name is not null " + search;
			DataTable data = DapperHelper.selectdata(sql, dynamicParams);