LXAPI.git - Gitblit

			@@ -1286,7 +1286,7 @@
			{
			is_firststep = "Y";
			}
			else if (Convert.ToInt32(json.Data.Rows[i]["SEQ"].ToString()) == json.Data.Rows.Count) //是否末道工序
			if (Convert.ToInt32(json.Data.Rows[i]["SEQ"].ToString()) == json.Data.Rows.Count) //是否末道工序
			{
			is_laststep = "Y";
			}
			@@ -2079,18 +2079,35 @@
			if (steptype == "Z") //自制工序
			{
			total = 0; //总条数
			//sql = @"select B.code as eqpcode,B.name as eqpname,B.wksp_code,T.org_name as wksp_name,A.eqp_value,A.stand_value,A.cavity_qty,A.unprice
			// from (
			// select materiel_code, eqp_code,eqp_value,stand_value,cavity_qty,unprice from TPrteEqp_Stad
			// where materiel_code=@partcode and route_code=@routecode and step_code=@stepcode
			// union all
			// select @partcode as materiel_code,eqp_code,'0' as eqp_value,'0' as stand_value,'0' as cavity_qty,'0' as unprice
			// from TFlw_Rteqp where step_code=@stepcode and style='E' and @partcode+eqp_code+step_code not in(select materiel_code+eqp_code+step_code from TPrteEqp_Stad)
			// ) A
			// left join TEqpInfo B on A.eqp_code=B.code
			// left join TOrganization T on B.wksp_code=T.org_code
			// left join TMateriel_Info C on A.materiel_code=C.partcode
			// where B.is_delete<>'1' and T.is_delete<>'1' and C.is_delete<>'1' ";

			sql = @"select B.code as eqpcode,B.name as eqpname,B.wksp_code,T.org_name as wksp_name,A.eqp_value,A.stand_value,A.cavity_qty,A.unprice
			from (
			select materiel_code, eqp_code,eqp_value,stand_value,cavity_qty,unprice from TPrteEqp_Stad
			where materiel_code=@partcode and route_code=@routecode and step_code=@stepcode
			union all
			select @partcode as materiel_code,eqp_code,'0' as eqp_value,'0' as stand_value,'0' as cavity_qty,'0' as unprice
			from TFlw_Rteqp where step_code=@stepcode and style='E' and @partcode+eqp_code+step_code not in(select materiel_code+eqp_code+step_code from TPrteEqp_Stad)
			select @partcode as materiel_code,C.eqp_code,'0' as eqp_value,'0' as stand_value,'0' as cavity_qty,'0' as unprice
			from TFlw_Rout A
			inner join TFlw_Rtdt B on A.code=B.rout_code
			left join TFlw_Rteqp C on B.step_code=C.step_code
			where A.code=@routecode and B.step_code=@stepcode and style='E' and @partcode+A.code+C.eqp_code+B.step_code
			not in(select materiel_code+route_code+eqp_code+step_code from TPrteEqp_Stad where materiel_code=@partcode and route_code=@routecode and step_code=@stepcode)
			) A
			left join TEqpInfo B on A.eqp_code=B.code
			left join TOrganization T on B.wksp_code=T.org_code
			left join TMateriel_Info C on A.materiel_code=C.partcode
			where B.is_delete<>'1' and T.is_delete<>'1' and C.is_delete<>'1' ";
			where B.is_delete<>'1' and T.is_delete<>'1' and C.is_delete<>'1'";
			dynamicParams.Add("@partcode", partcode);
			dynamicParams.Add("@routecode", routecode);
			dynamicParams.Add("@stepcode", stepcode);
			@@ -2098,13 +2115,27 @@
			else //外协工序
			{
			total = 0; //总条数
			sql = @"select B.code as eqpcode,B.name as eqpname,'' as wksp_code,'' as wksp_name,A.eqp_value,A.stand_value,A.cavity_qty,A.unprice
			//sql = @"select B.code as eqpcode,B.name as eqpname,'' as wksp_code,'' as wksp_name,A.eqp_value,A.stand_value,A.cavity_qty,A.unprice
			// from (
			// select materiel_code, eqp_code,eqp_value,stand_value,cavity_qty,unprice from TPrteEqp_Stad
			// where materiel_code=@partcode and route_code=@routecode and step_code=@stepcode
			// union all
			// select @partcode as materiel_code,eqp_code,'0' as eqp_value,'0' as stand_value,'0' as cavity_qty,'0' as unprice
			// from TFlw_Rteqp where step_code=@stepcode and style='W' and @partcode+eqp_code+step_code not in(select materiel_code+eqp_code+step_code from TPrteEqp_Stad)
			// ) A
			// left join TCustomer B on A.eqp_code=B.code
			// where B.is_delete<>'1'";
			sql = @"select B.code as eqpcode,B.name as eqpname,'' as wksp_code,'' as wksp_name,A.eqp_value,A.stand_value,A.cavity_qty,A.unprice
			from (
			select materiel_code, eqp_code,eqp_value,stand_value,cavity_qty,unprice from TPrteEqp_Stad
			where materiel_code=@partcode and route_code=@routecode and step_code=@stepcode
			union all
			select @partcode as materiel_code,eqp_code,'0' as eqp_value,'0' as stand_value,'0' as cavity_qty,'0' as unprice
			from TFlw_Rteqp where step_code=@stepcode and style='W' and @partcode+eqp_code+step_code not in(select materiel_code+eqp_code+step_code from TPrteEqp_Stad)
			select @partcode as materiel_code,C.eqp_code,'0' as eqp_value,'0' as stand_value,'0' as cavity_qty,'0' as unprice
			from TFlw_Rout A
			inner join TFlw_Rtdt B on A.code=B.rout_code
			left join TFlw_Rteqp C on B.step_code=C.step_code
			where A.code=@routecode and B.step_code=@stepcode and style='W' and @partcode+A.code+C.eqp_code+B.step_code
			not in(select materiel_code+route_code+eqp_code+step_code from TPrteEqp_Stad where materiel_code=@partcode and route_code=@routecode and step_code=@stepcode)
			) A
			left join TCustomer B on A.eqp_code=B.code
			where B.is_delete<>'1'";
			@@ -2138,7 +2169,7 @@
			{
			if (partcode != "" && partcode != null)
			{
			search += "and AA.materiel_code=@partcode ";
			search += "and AA.partcode=@partcode ";
			dynamicParams.Add("@partcode", partcode);
			}
			if (routecode != "" && routecode != null)
			@@ -2148,7 +2179,7 @@
			}
			if (stepcode != "" && stepcode != null)
			{
			search += "and AA.step_code=@stepcode ";
			search += "and AA.stepcode=@stepcode ";
			dynamicParams.Add("@stepcode", stepcode);
			}
			if (eqpcode != "" && eqpcode != null)