LXAPI.git - Gitblit

			@@ -58,12 +58,30 @@
			{
			string[] selects = Array.ConvertAll<string, string>(shopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[]
			//查询产线下已开工的加工单信息
			sql = @"select distinct E.saleOrderCode,A.wo_code,P.plan_qty,M.partcode,M.partname,M.partspec,T.name as uomname from TK_Wrk_Record A
			inner join TK_Wrk_Man P on A.wo_code=P.wo_code
			left join TMateriel_Info M on P.materiel_code=M.partcode
			left join TUom T on M.uom_code=T.code
			left join TKimp_Ewo E on P.m_po=E.wo and P.sourceid=E.id
			where P.status<>'CLOSED' and P.status<>'NEW' and P.wkshp_code in @shopcode and A.style='S' and A.step_seq='1'";
			//sql = @"select * from (
			// select distinct E.saleOrderCode,A.wo_code,P.plan_qty,M.partcode,M.partname,M.partspec,T.name as uomname,S.good_qty,S.ng_qty,S.bad_qty from TK_Wrk_Record A
			// inner join TK_Wrk_Man P on A.wo_code=P.wo_code
			// left join TMateriel_Info M on P.materiel_code=M.partcode
			// left join TUom T on M.uom_code=T.code
			// left join TKimp_Ewo E on P.m_po=E.wo and P.sourceid=E.id
			// left join (
			// select wo_code,sum(good_qty) as good_qty,sum(ng_qty) as ng_qty,sum(bad_qty) as bad_qty from TK_Wrk_Step where isend='Y' group by wo_code
			// ) S on P.wo_code=S.wo_code
			// where P.status<>'CLOSED' and P.status<>'NEW' and P.wkshp_code in @shopcode and A.style='S' and A.step_seq='1'
			// ) as AA where AA.plan_qty>(AA.good_qty+aa.bad_qty+AA.ng_qty)";
			sql = @"select AA.lm_date,AA.saleOrderCode,AA.wo_code,AA.plan_qty,AA.partcode,AA.partname,AA.partspec,AA.uomname,
			sum(AA.good_qty) as good_qty,sum(AA.ng_qty)+sum(AA.bad_qty) as ng_qty,sum(AA.bad_qty) as bad_qty
			from(
			select P.lm_date,E.saleOrderCode,A.wo_code,P.plan_qty,M.partcode,M.partname,M.partspec,T.name as uomname,A.good_qty,A.ng_qty,A.bad_qty
			from TK_Wrk_Record A
			inner join TK_Wrk_Man P on A.wo_code=P.wo_code
			left join TMateriel_Info M on P.materiel_code=M.partcode
			left join TUom T on M.uom_code=T.code
			left join TKimp_Ewo E on P.m_po=E.wo and P.sourceid=E.id
			where P.status<>'CLOSED' and P.status<>'NEW'
			and P.wkshp_code in @shopcode and DateDiff(dd,P.lm_date,getdate())<=15
			) as AA group by AA.lm_date,AA.saleOrderCode,AA.wo_code,AA.plan_qty,AA.partcode,AA.partname,AA.partspec,AA.uomname
			order by AA.lm_date desc";
			var data0 = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });

			if (data0.Rows.Count > 0)
			@@ -88,7 +106,7 @@
			lineone.children = new List<TreeTwo>();

			//查新工单下工序信息
			sql = @"select A.seq,T.stepcode,T.stepname,A.plan_qty,A.good_qty,A.ng_qty,A.status
			sql = @"select A.seq,T.stepcode,T.stepname,A.plan_qty,A.good_qty,A.ng_qty+A.bad_qty as ng_qty,A.status
			from TK_Wrk_Step A
			left join TStep T on A.step_code=T.stepcode
			where A.wo_code=@wo_code";
			@@ -153,16 +171,30 @@
			try
			{
			//获取任务列表信息
			sql = @"select A.*,ROW_NUMBER() OVER(ORDER BY (case when A.warning<=2 then A.planenddate end) asc ,A.planstartdate asc) AS RowNum from(
			//sql = @"select A.*,ROW_NUMBER() OVER(ORDER BY (case when A.warning<=2 then A.planenddate end) asc ,A.planstartdate asc) AS RowNum from(
			// select A.status,A.lm_date,E.saleOrderCode,A.wo_code,M.partcode,M.partname,M.partspec,U.name,
			// A.plan_qty,B.good_qty,B.ng_qty,E.planstartdate,E.planenddate, datediff(day,getdate(),E.planenddate) warning
			// from TK_Wrk_Man A
			// inner join TK_Wrk_Step B on A.wo_code=B.wo_code
			// inner join TKimp_Ewo E on A.m_po=E.wo and A.sourceid=E.id
			// left join TMateriel_Info M on A.materiel_code=M.partcode
			// left join TUom U on M.uom_code=U.code
			// where A.status<>'CLOSED' and A.wkshp_code in @shopcode and A.is_delete<>'1' and B.isend='Y'
			// and A.plan_qty>(B.good_qty+B.ng_qty+B.bad_qty)
			// )as A ";
			sql = @"select * from(
			select A.*,ROW_NUMBER() OVER(ORDER BY A.lm_date desc) AS RowNum from(
			select A.status,A.lm_date,E.saleOrderCode,A.wo_code,M.partcode,M.partname,M.partspec,U.name,
			A.plan_qty,B.good_qty,B.ng_qty,E.planstartdate,E.planenddate, datediff(day,getdate(),E.planenddate) warning
			A.plan_qty,B.good_qty,BS.ng_qty,E.planstartdate,E.planenddate, datediff(day,getdate(),E.planenddate) warning
			from TK_Wrk_Man A
			inner join TK_Wrk_Step B on A.wo_code=B.wo_code
			inner join (select wo_code, sum(good_qty) as good_qty from TK_Wrk_Step where isend='Y' group by wo_code) B on A.wo_code=B.wo_code
			inner join (select wo_code, sum(ng_qty)+sum(bad_qty) as ng_qty from TK_Wrk_Step group by wo_code) BS on A.wo_code=BS.wo_code
			inner join TKimp_Ewo E on A.m_po=E.wo and A.sourceid=E.id
			left join TMateriel_Info M on A.materiel_code=M.partcode
			left join TUom U on M.uom_code=U.code
			where A.status<>'CLOSED' and A.wkshp_code in @shopcode and A.is_delete<>'1' and B.isend='Y'
			)as A ";
			where A.status<>'CLOSED' and A.wkshp_code in @shopcode and A.is_delete<>'1' and DateDiff(dd,A.lm_date,getdate())<=15
			)as A
			) as AA ";
			var data = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
			mes.code = "200";
			mes.Message = "查询成功!";
			@@ -281,7 +313,7 @@
			try
			{
			//获取采购订单跟踪列表
			sql = @"select * from h_v_DDKanBan_PurchaseLeftBottom ";
			sql = @"select * from h_v_DDKanBan_PurchaseLeftBottom order by voucherdate desc";
			var data = DapperHelper.selecttable(sql);
			mes.code = "200";
			mes.Message = "查询成功!";
			@@ -331,7 +363,7 @@
			try
			{
			//获取仓库生产加工单待入库列表
			sql = @"select * from h_v_DDKanBan_WareHouseTopLeft";
			sql = @"select * from h_v_DDKanBan_WareHouseTopLeft order by voucherdate desc";
			var data = DapperHelper.selecttable(sql);
			mes.code = "200";
			mes.Message = "查询成功!";
			@@ -355,7 +387,7 @@
			try
			{
			//获取仓库生产加工单待入库列表
			sql = @"select * from h_v_DDKanBan_WareHouseTopBottom";
			sql = @"select * from h_v_DDKanBan_WareHouseTopBottom order by voucherdate desc";
			var data = DapperHelper.selecttable(sql);
			mes.code = "200";
			mes.Message = "查询成功!";