XkdMesApi.git - Gitblit

			@@ -808,17 +808,50 @@
			}
			}
			//获取工序信息
			sql = @"select S.wo_code,S.seq,S.step_code,T.stepname,S.stepprice,(isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0)) as produceq_qty,
			sql = @"select S.id,S.wo_code,S.seq,S.step_code,T.stepname,T.flwtype,S.stepprice,(isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0)) as produceq_qty,
			S.good_qty,S.ng_qty,S.laborbad_qty,S.materielbad_qty,(isnull(S.plan_qty,0)-(isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0))) as delive_qty,S.isbott,S.isend
			from TK_Wrk_Step S
			left join TStep T on S.step_code=T.stepcode
			where S.wo_code=@wocode order by S.seq ";
			dynamicParams.Add("@wocode", wocode);
			var data1 = DapperHelper.selectdata(sql, dynamicParams);
			var parents = DapperHelper.select<WorkRouteStepEqp>(sql, dynamicParams);
			//获取工序对应设备信息
			for (int i = 0; i < parents.Count; i++)
			{
			if (parents[i].flwtype == "Z")
			{
			//通过工艺路线工序表ID查找对应设备信息
			sql = @"select S.eqp_code,E.name as eqp_name,S.eqpprice as eqp_price,
			(isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0)) as produceq_qty,
			S.good_qty,S.ng_qty,S.laborbad_qty,S.materielbad_qty
			from TK_Wrk_StepEqp S
			inner join TEqpInfo E on S.eqp_code=E.code
			where S.m_id=@m_id";
			dynamicParams.Add("@m_id", parents[i].id);
			var children = DapperHelper.select<WorkRouteStepEqpSub>(sql, dynamicParams);
			parents[i].children = children.ToList();
			}
			else
			{
			//通过工艺路线工序表ID查找对应外协供应商信息
			sql = @"select S.eqp_code,E.name as eqp_name,S.eqpprice as eqp_price,
			(isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0)) as produceq_qty,
			S.good_qty,S.ng_qty,S.laborbad_qty,S.materielbad_qty
			from TK_Wrk_StepEqp S
			inner join TCustomer E on S.eqp_code=E.code
			where S.m_id=@m_id";
			dynamicParams.Add("@m_id", parents[i].id);
			var children = DapperHelper.select<WorkRouteStepEqpSub>(sql, dynamicParams);
			parents[i].children = children.ToList();
			}

			}


			dir.Add("canupdate_qty", canupdate_qty);
			dir.Add("stepdata", data1);
			dir.Add("stepdata", parents);
			mes.code = "200";
			mes.count = data1.Rows.Count;
			mes.count = parents.Count;
			mes.message = "查询成功";
			mes.data = dir;
			}
			@@ -1150,10 +1183,11 @@
			if (route) //工艺路线版
			{
			//MES工单查找历史引用最新工序信息
			sql = @"select S.wo_code,S.seq,S.step_code,S.stepprice,isbott,isend
			sql = @"select S.id,S.wo_code,S.seq,S.step_code,T.stepname,T.flwtype,S.stepprice,'0' as produceq_qty,
			'0' as good_qty,'0' as ng_qty,'0' as laborbad_qty,'0' as materielbad_qty,'0' as delive_qty,isbott,isend
			from TK_Wrk_Step S
			inner join (
			select top 1 A.wo_code,A.route_code from TK_Wrk_Man A
			select top 1 S.id,A.wo_code,A.route_code from TK_Wrk_Man A
			inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.route_code=S.route_code
			where A.materiel_code=@partcode and A.wkshp_code=@wkshopcode and A.route_code=@routecode
			order by A.lm_date desc
			@@ -1163,11 +1197,43 @@
			dynamicParams.Add("@wkshopcode", wkshopcode);
			dynamicParams.Add("@partcode", partcode);
			dynamicParams.Add("@routecode", routecode);
			var parents = DapperHelper.select<WorkRouteStepEqp>(sql, dynamicParams);
			//获取工序对应设备信息
			for (int i = 0; i < parents.Count; i++)
			{
			if (parents[i].flwtype == "Z")
			{
			//通过工艺路线工序表ID查找对应设备信息
			sql = @"select S.eqp_code,E.name as eqp_name,S.eqpprice as eqp_price,
			(isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0)) as produceq_qty,
			S.good_qty,S.ng_qty,S.laborbad_qty,S.materielbad_qty
			from TK_Wrk_StepEqp S
			inner join TEqpInfo E on S.eqp_code=E.code
			where S.m_id=@m_id";
			dynamicParams.Add("@m_id", parents[i].id);
			var children = DapperHelper.select<WorkRouteStepEqpSub>(sql, dynamicParams);
			parents[i].children = children.ToList();
			}
			else
			{
			//通过工艺路线工序表ID查找对应外协供应商信息
			sql = @"select S.eqp_code,E.name as eqp_name,S.eqpprice as eqp_price,
			(isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0)) as produceq_qty,
			S.good_qty,S.ng_qty,S.laborbad_qty,S.materielbad_qty
			from TK_Wrk_StepEqp S
			inner join TCustomer E on S.eqp_code=E.code
			where S.m_id=@m_id";
			dynamicParams.Add("@m_id", parents[i].id);
			var children = DapperHelper.select<WorkRouteStepEqpSub>(sql, dynamicParams);
			parents[i].children = children.ToList();
			}
			}
			}
			else
			{
			//MES工单查找历史引用最新工序信息
			sql = @"select S.wo_code,S.seq,S.step_code,S.stepprice,isbott,isend
			sql = @"select S.id,S.wo_code,S.seq,S.step_code,T.stepname,T.flwtype,S.stepprice,'0' as produceq_qty,
			'0' as good_qty,'0' as ng_qty,'0' as laborbad_qty,'0' as materielbad_qty,'0' as delive_qty,isbott,isend
			from TK_Wrk_Step S
			inner join (
			select top 1 A.wo_code from TK_Wrk_Man A
			@@ -1179,6 +1245,37 @@
			order by S.seq";
			dynamicParams.Add("@wkshopcode", wkshopcode);
			dynamicParams.Add("@partcode", partcode);
			var parents = DapperHelper.select<WorkRouteStepEqp>(sql, dynamicParams);
			//获取工序对应设备信息
			for (int i = 0; i < parents.Count; i++)
			{
			if (parents[i].flwtype == "Z")
			{
			//通过工艺路线工序表ID查找对应设备信息
			sql = @"select S.eqp_code,E.name as eqp_name,S.eqpprice as eqp_price,
			(isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0)) as produceq_qty,
			S.good_qty,S.ng_qty,S.laborbad_qty,S.materielbad_qty
			from TK_Wrk_StepEqp S
			inner join TEqpInfo E on S.eqp_code=E.code
			where S.m_id=@m_id";
			dynamicParams.Add("@m_id", parents[i].id);
			var children = DapperHelper.select<WorkRouteStepEqpSub>(sql, dynamicParams);
			parents[i].children = children.ToList();
			}
			else
			{
			//通过工艺路线工序表ID查找对应外协供应商信息
			sql = @"select S.eqp_code,E.name as eqp_name,S.eqpprice as eqp_price,
			(isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0)) as produceq_qty,
			S.good_qty,S.ng_qty,S.laborbad_qty,S.materielbad_qty
			from TK_Wrk_StepEqp S
			inner join TCustomer E on S.eqp_code=E.code
			where S.m_id=@m_id";
			dynamicParams.Add("@m_id", parents[i].id);
			var children = DapperHelper.select<WorkRouteStepEqpSub>(sql, dynamicParams);
			parents[i].children = children.ToList();
			}
			}
			}

			var data = DapperHelper.selectdata(sql, dynamicParams);