FEDApi.git - Gitblit

			@@ -280,7 +280,7 @@
			isnull(S.unprice,0) as unprice,A.good_qty*isnull(S.unprice,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 and P.isend='Y'
			inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
			left join TK_Wrk_Man K on A.wo_code=K.wo_code
			left join TGroup G on B.usergroup_code=G.group_code
			left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code and K.wkshp_code=S.wkspcode
			@@ -394,7 +394,7 @@
			A.good_qty as 报工数量,isnull(S.unprice,0) as 工序单价,A.good_qty*isnull(S.unprice,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 and P.isend='Y'
			inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
			left join TK_Wrk_Man K on A.wo_code=K.wo_code
			left join TGroup G on B.usergroup_code=G.group_code
			left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code and K.wkshp_code=S.wkspcode
			@@ -431,42 +431,42 @@
			{
			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 (groupcode != "" && groupcode != null)
			{
			search += "and G.group_code=@groupcode ";
			search += "and AA.group_code=@groupcode ";
			dynamicParams.Add("@groupcode", groupcode);
			}
			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 B.report_date between @reportopendate and @reportclosedate ";
			search += "and AA.report_date between @reportopendate and @reportclosedate ";
			dynamicParams.Add("@reportopendate", reportopendate + " 00:00:00");
			dynamicParams.Add("@reportclosedate", reportclosedate + " 23:59:59");
			}
			@@ -478,18 +478,24 @@
			search = search.Substring(3);//截取索引2后面的字符
			// --------------查询指定数据--------------
			var total = 0; //总条数
			var sql = @"select distinct A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,A.task_qty,G.group_code,G.group_name,B.report_qty
			,isnull(S.unprice,0) as unprice,B.report_qty*isnull(S.unprice,0) as usermoney,U.username as lm_user,B.report_date,
			var sql = @"select AA.wo_code,AA.partcode,AA.partname,AA.partspec,AA.stepcode,AA.stepname,
			AA.task_qty,AA.group_code,AA.group_name,AA.report_qty,AA.unprice,
			AA.moneys/colum as usermoney,AA.username,AA.report_date,colum
			from (
			select distinct A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,
			A.task_qty,G.group_code,G.group_name,B.report_qty,isnull(S.unprice,0) as unprice,
			B.report_qty*isnull(S.unprice,0) as moneys,U.username,B.report_date,
			(select distinct count(*) from TK_Wrk_RecordSub S where S.m_id=B.m_id) as colum
			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 and P.isend='Y'
			inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
			left join TK_Wrk_Man K on A.wo_code=K.wo_code
			left join TGroup G on B.usergroup_code=G.group_code
			left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code and K.wkshp_code=S.wkspcode
			left join TMateriel_Info M on A.materiel_code=M.partcode
			left join TStep T on A.step_code=T.stepcode
			left join TUser U on B.report_person=U.usercode
			) as AA
			where " + search;
			var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			@@ -574,7 +580,7 @@
			(select distinct count(*) from TK_Wrk_RecordSub S where S.m_id=B.m_id) as colum
			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 and P.isend='Y'
			inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
			left join TK_Wrk_Man K on A.wo_code=K.wo_code
			left join TGroup G on B.usergroup_code=G.group_code
			left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code and K.wkshp_code=S.wkspcode