ZQHApi.git - Gitblit

			@@ -720,16 +720,35 @@
			var dynamicParams = new DynamicParameters();
			try
			{
			sql = @"select A.checkitem_seq,A.checkitem_code,A.checkitem_name,A.checkitem_descr,A.check_result,U.username as lm_user,A.lm_date
			from TStepCheckRecordSub A
			left join TUser U on A.lm_user=U.usercode
			where A.m_id=@id";
			dynamicParams.Add("@id", id);
			var data = DapperHelper.selectdata(sql, dynamicParams);
			//sql = @"select A.checkitem_seq,A.checkitem_code,A.checkitem_name,A.checkitem_descr,A.check_result,U.username as lm_user,A.lm_date
			// from TStepCheckRecordSub A
			// left join TUser U on A.lm_user=U.usercode
			// where A.m_id=@id";
			//dynamicParams.Add("@id", id);
			//var data = DapperHelper.selectdata(sql, dynamicParams);

			mes.code = "200";
			mes.Message = "查询成功!";
			mes.data = data;
			//mes.code = "200";
			//mes.Message = "查询成功!";
			//mes.data = data;

			//存储过程名
			sql = @"h_p_IFCLD_WuLiuCheckSubSelect";
			dynamicParams.Add("@checkid", id);
			DataTable dt = DapperHelper.selectProcedure(sql, dynamicParams);
			if (dt.Rows.Count > 0)
			{
			mes.code = "200";
			mes.count = 0;
			mes.Message = "查询成功!";
			mes.data = dt;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "无检验明细数据!";
			mes.data = null;
			}
			}
			catch (Exception e)
			{
			@@ -793,50 +812,52 @@
			var total = 0; //总条数
			var sql = @"select
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.wo_code ORDER BY B.checkitem_code) = 1 THEN A.wo_code
			ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN A.wo_code
			ELSE ''END AS '工单号',
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.partcode ORDER BY B.checkitem_code) = 1 THEN M.partcode
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN M.partcode
			ELSE ''END AS '产品编码',
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.partcode ORDER BY B.checkitem_code) = 1 THEN M.partname
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN M.partname
			ELSE ''END AS '产品名称',
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.partcode ORDER BY B.checkitem_code) = 1 THEN M.partspec
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN M.partspec
			ELSE ''END AS '规格型号',
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.step_code ORDER BY B.checkitem_code) = 1 THEN S.stepname
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN S.stepname
			ELSE ''END AS '工序名称',
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.checkstaned_code ORDER BY B.checkitem_code) = 1 THEN A.checkstaned_code
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN A.checkstaned_code
			ELSE ''END AS '标准编码',
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.checkstaned_code ORDER BY B.checkitem_code) = 1 THEN T.name
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN T.name
			ELSE ''END AS '标准名称',
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.check_user ORDER BY B.checkitem_code) = 1 THEN U.username
			ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN U.username
			ELSE ''END AS '检验人员',
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.check_typename ORDER BY B.checkitem_code) = 1 THEN A.check_typename
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN A.check_typename
			ELSE ''END AS '检验类型',
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.check_result ORDER BY B.checkitem_code) = 1 THEN A.check_result
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN A.check_result
			ELSE ''END AS '检验结果',
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.check_descr ORDER BY B.checkitem_code) = 1 THEN A.check_descr
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN A.check_descr
			ELSE ''END AS '检验描述',
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.check_qty ORDER BY B.checkitem_code) = 1 THEN A.check_qty
			END AS '检验数量',
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.lm_date ORDER BY B.checkitem_code) = 1 THEN A.lm_date
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN A.check_qty
			END AS '样本数量',
			CASE WHEN
			ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN A.lm_date
			END AS '检验时间',
			B.checkitem_seq as '检验项目序号',B.checkitem_code '检验项目编码',B.checkitem_name '检验项目名称',B.checkitem_descr '检验项目描述',B.check_result '检验项目结果'
			B.checknum as 检验件次,B.checkitem_seq as '检验项目序号',B.checkitem_code '检验项目编码',B.checkitem_name '检验项目名称',B.checkitem_descr '检验项目描述',B.check_result '检验项目结果',
			C.standvalue as '标准值',C.uppervalue as '上限值',C.lowervalue as '下限值',B.check_value as '实测值'
			from TStepCheckRecord A
			left join TStepCheckRecordSub B on A.id=B.m_id
			left join TMateriel_Info M on A.partcode=M.partcode
			left join TStep S on A.step_code=S.stepcode
			left join TStepCheckStandard T on A.checkstaned_code=T.code
			left join TStepCheckStandardSub C on A.checkstaned_code=C.stepstaned_code and B.checkitem_code=C.stepcheckitem_code
			left join TUser U on A.check_user=U.usercode
			where A.check_type in('FirstCheck','PatroCheck','EndCheck') " + search;
			DataTable data = DapperHelper.selectdata(sql, dynamicParams);