JTAPI.git - Gitblit

			@@ -1295,7 +1295,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";
			}
			@@ -1586,6 +1586,9 @@
			list.Add(new { str = sql_1, parm = new { stepcode = stepcode } });
			//修改工序表关联工作站标识
			sql_1 = @"update TStep set is_eqp='N' where stepcode=@stepcode";
			list.Add(new { str = sql_1, parm = new { stepcode = stepcode } });
			//删除设备节拍工价表
			sql_1 = @"delete TPrteEqp_Stad where step_code=@stepcode";
			list.Add(new { str = sql_1, parm = new { stepcode = stepcode } });
			}
			}
			@@ -2027,12 +2030,12 @@
			try
			{
			//通过产品编码查找关联的工艺路线信息
			sql = @"select B.stepcode as code,B.stepname as name
			sql = @"select B.stepcode as code,B.stepname as name,B.flwtype as flag
			from TFlw_Rtdt A
			inner join TStep B on A.step_code=B.stepcode
			where A.rout_code=@routecode and B.is_delete<>'1' and A.is_delete<>'1'";
			dynamicParams.Add("@routecode", routecode);
			var data = DapperHelper.select<ObjectData>(sql, dynamicParams);
			var data = DapperHelper.select<StepDefect>(sql, dynamicParams);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.data = data;
			@@ -2077,29 +2080,81 @@
			#endregion

			#region[根据工序线编码查找关联设备集合]
			public static ToMessage StepSelectEqpList(string partcode, string routecode, string stepcode, int startNum, int endNum, string prop, string order)
			public static ToMessage StepSelectEqpList(string partcode, string routecode, string stepcode,string steptype, int startNum, int endNum, string prop, string order)
			{
			var dynamicParams = new DynamicParameters();
			string search = "";
			string search = "", sql = "";
			int total = 0;
			try
			{
			// --------------查询指定数据--------------
			var total = 0; //总条数
			var 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
			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' ";
			dynamicParams.Add("@partcode", partcode);
			dynamicParams.Add("@routecode", routecode);
			dynamicParams.Add("@stepcode", stepcode);
			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);
			}
			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
			// 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,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'";
			dynamicParams.Add("@partcode", partcode);
			dynamicParams.Add("@routecode", routecode);
			dynamicParams.Add("@stepcode", stepcode);
			}
			var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			mes.Message = "查询成功!";