XkdMesApi.git - Gitblit

			@@ -72,11 +72,6 @@
			dynamicParams.Add("@opendate", opendate + " 00:00:00");
			dynamicParams.Add("@closedate", closedate + " 23:59:59");
			}
			if (search == "")
			{
			search = "and 1=1 ";
			}
			search = search.Substring(3);//截取索引2后面的字符
			// --------------查询指定数据--------------
			var total = 0; //总条数
			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,
			@@ -99,7 +94,7 @@
			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
			) as AA where " + search;
			) 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";
			mes.message = "查询成功!";
			@@ -170,11 +165,6 @@
			dynamicParams.Add("@opendate", opendate + " 00:00:00");
			dynamicParams.Add("@closedate", closedate + " 23:59:59");
			}
			if (search == "")
			{
			search = "and 1=1 ";
			}
			search = search.Substring(3);//截取索引2后面的字符
			// --------------查询指定数据--------------
			var total = 0; //总条数

			@@ -200,7 +190,7 @@
			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
			) as AA
			where " + search;
			where AA.concat_name is not null " + search;
			DataTable data = DapperHelper.selectdata(sql, dynamicParams);
			data.TableName = "Table"; //设置DataTable的名称
			string msg = DownLoad.DataTableToExcel(data, "生产进度报表");
			@@ -287,7 +277,7 @@
			// --------------查询指定数据--------------
			var total = 0; //总条数
			var sql = @"select distinct A.id,K.wkshp_code,F.torg_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,A.task_qty,G.usergroupcode,G.usergroupname,A.good_qty,
			isnull(P.stepprice,0) as unprice,A.good_qty*isnull(P.stepprice,0) as usermoney,U.username as lm_user,A.lm_date,B.report_date
			isnull(A.step_price,0) as unprice,A.good_qty*isnull(A.step_price,0) as usermoney,U.username as lm_user,A.lm_date,B.report_date
			from TK_Wrk_Record A
			inner join TK_Wrk_RecordSub B on A.id=B.m_id
			inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
			@@ -413,7 +403,7 @@
			var total = 0; //总条数
			var sql = @"select distinct K.wkshp_code as 车间编码,F.torg_name as 车间名称, A.wo_code as 工单编号,M.partcode as 产品编码,M.partname as 产品名称,M.partspec as 产品规格,
			T.stepcode as 工序编码,T.stepname as 工序名称,A.task_qty as 任务数量,G.usergroupcode as 班组编码,G.usergroupname as 班组名称,
			A.good_qty as 报工数量,isnull(P.stepprice,0) as 工序单价,A.good_qty*isnull(P.stepprice,0) as 计件工资,U.username as 操作人员,A.lm_date as 操作时间,B.report_date as 报工时间
			A.good_qty as 报工数量,isnull(A.step_price,0) as 工序单价,A.good_qty*isnull(A.step_price,0) as 计件工资,U.username as 操作人员,A.lm_date as 操作时间,B.report_date as 报工时间
			from TK_Wrk_Record A
			inner join TK_Wrk_RecordSub B on A.id=B.m_id
			inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code