ZQHApi.git - Gitblit

			@@ -686,13 +686,8 @@
			search += "and A.check_result=@checkresult ";
			dynamicParams.Add("@checkresult", checkresult);
			}
			if (search == "")
			{
			search = "and 1=1 ";
			}
			search = search.Substring(3);//截取索引2后面的字符
			// --------------查询指定数据--------------
			var total = 0; //总条数
			var total = 0; //总条数(首检、巡检、完工检验)
			var sql = @"select A.id,A.wo_code,A.partcode,B.partname,B.partspec,A.step_code,S.stepname,A.checkstaned_code,T.name as checkstaned_name,A.check_user,
			A.check_type,A.check_result,A.check_descr,A.check_qty,U.username as lm_user,A.lm_date
			from TStepCheckRecord A
			@@ -700,7 +695,7 @@
			left join TStep S on A.step_code=S.stepcode
			left join TStepCheckStandard T on A.checkstaned_code=T.code
			left join TUser U on A.check_user=U.usercode
			where " + search;
			where A.check_type in('FirstCheck','PatroCheck','EndCheck') " + search;
			var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			mes.Message = "查询成功!";
			@@ -794,11 +789,6 @@
			search += "and A.check_result=@checkresult ";
			dynamicParams.Add("@checkresult", checkresult);
			}
			if (search == "")
			{
			search = "and 1=1 ";
			}
			search = search.Substring(3);//截取索引2后面的字符
			// --------------查询指定数据--------------
			var total = 0; //总条数
			var sql = @"select
			@@ -848,7 +838,7 @@
			left join TStep S on A.step_code=S.stepcode
			left join TStepCheckStandard T on A.checkstaned_code=T.code
			left join TUser U on A.check_user=U.usercode
			where " + search;
			where A.check_type in('FirstCheck','PatroCheck','EndCheck') " + search;
			DataTable data = DapperHelper.selectdata(sql, dynamicParams);
			data.TableName = "Table"; //设置DataTable的名称
			string msg = DownLoad.DataTableToExcel(data, "工序检验记录");
			@@ -915,20 +905,22 @@
			// --------------查询指定数据--------------
			var total = 0; //总条数
			var sql = @"select * from(
			select code,name,status,checktype,sampmethod,sampscare,suitobject,descr,suitpart,
			case when suitobject='P' then
			select A.code,A.name,A.status,A.checktype,A.sampmethod,A.sampscare,A.suitobject,A.stepcode,S.stepname,A.descr,A.suitpart,A.lm_date,U.username,
			case when A.suitobject='P' then
			STUFF(( SELECT ';' + partname
			FROM TMateriel_Info
			where PATINDEX('%;' + RTRIM(TMateriel_Info.partcode) + ';%',';' + TStepCheckStandard.suitpart + ';')>0
			where PATINDEX('%;' + RTRIM(TMateriel_Info.partcode) + ';%',';' + A.suitpart + ';')>0
			FOR XML PATH('')), 1, 1,'')
			when suitobject='PY'
			when A.suitobject='PY'
			then
			STUFF(( SELECT ';' + name
			FROM T_Dict
			where PATINDEX('%;' + RTRIM(T_Dict.code) + ';%',';' + TStepCheckStandard.suitpart + ';')>0
			where PATINDEX('%;' + RTRIM(T_Dict.code) + ';%',';' + A.suitpart + ';')>0
			FOR XML PATH('')), 1, 1,'')
			end as suitpartname
			from TStepCheckStandard
			from TStepCheckStandard A
			left join TUser U on A.lm_user=U.usercode
			left join TStep S on A.stepcode=S.stepcode
			) as AA
			where " + search;
			var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			@@ -956,7 +948,7 @@
			try
			{
			sql = @"select A.stepcheckitem_seq,A.stepcheckitem_code,B.name as stepcheckitem_name,A.required,
			A.numberjudge,A.unit,A.decimal,A.standvalue,A.uppervalue,A.lowervalue
			A.numberjudge,A.unit,A.decimalnum,A.standvalue,A.uppervalue,A.lowervalue,A.stepcheckitem_desc
			from TStepCheckStandardSub A
			inner join TStepCheckItem B on A.stepcheckitem_code=B.code
			where A.stepstaned_code=@qualityinsptcode";
			@@ -979,7 +971,7 @@
			#endregion

			#region[质检方案新增/编辑提交]
			public static ToMessage QualityInspectionAddEditSave(string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampmethod, string sampscare, string suitobject, string suitpart, string descr, string checkitem, string type, string username)
			public static ToMessage QualityInspectionAddEditSave(string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampmethod, string sampscare, string suitobject, string suitpart, string descr,string stepcode, string checkitem, string type, string username)
			{
			var sql = "";
			List<object> list = new List<object>();
			@@ -994,8 +986,8 @@
			{
			case "Add": //新增
			//写入质检方案主表
			sql = @"insert into TStepCheckStandard(code,name,status,checktype,sampmethod,sampscare,suitobject,suitpart,descr,lm_user,lm_date)
			values(@code,@name,@status,@checktype,@sampmethod,@sampscare,@suitobject,@suitpart,@descr,@lm_user,@lm_date)";
			sql = @"insert into TStepCheckStandard(code,name,status,checktype,sampmethod,sampscare,suitobject,suitpart,stepcode,descr,lm_user,lm_date)
			values(@code,@name,@status,@checktype,@sampmethod,@sampscare,@suitobject,@suitpart,@stepcode,@descr,@lm_user,@lm_date)";
			list.Add(new
			{
			str = sql,
			@@ -1009,6 +1001,7 @@
			sampscare = sampscare,
			suitobject = suitobject,
			suitpart = suitpart,
			stepcode= stepcode,
			descr = descr,
			lm_user = username,
			lm_date = date
			@@ -1030,7 +1023,7 @@
			required = arra[i]["required"].ToString(),
			numberjudge = arra[i]["numberjudge"].ToString(),
			unit = arra[i]["unit"].ToString(),
			decimalnum = Convert.ToInt32(arra[i]["decimalnum"].ToString()),
			decimalnum = arra[i]["decimalnum"].ToString(),
			standvalue = arra[i]["standvalue"].ToString(),
			uppervalue = arra[i]["uppervalue"].ToString(),
			lowervalue = arra[i]["lowervalue"].ToString(),
			@@ -1043,7 +1036,7 @@
			break;
			case "Update"://修改
			//判断是否生成检验记录(入厂检验(InCheck) 出厂检验(OutCheck) FirstCheck（首检） PatroCheck(巡检) EndCheck(完工检))
			sql = @"select * from TStepCheckRecord where checkstaned_code=@qualityinsptcode and checktype=@checktype";
			sql = @"select * from TStepCheckRecord where checkstaned_code=@qualityinsptcode and check_type=@checktype";
			dynamicParams.Add("@qualityinsptcode", qualityinsptcode);
			dynamicParams.Add("@checktype", checktype);
			var data = DapperHelper.selectdata(sql, dynamicParams);
			@@ -1060,7 +1053,7 @@
			list.Add(new { str = sql, parm = new { code = qualityinsptcode } });
			//修改质检方案主表
			sql = @"update TStepCheckStandard set name=@name,status=@status,checktype=@checktype,sampmethod=@sampmethod,sampscare=@sampscare,
			suitobject=@suitobject,suitpart=@suitpart,descr=@descr
			suitobject=@suitobject,suitpart=@suitpart,stepcode=@stepcode,descr=@descr
			where code=@code";
			list.Add(new
			{
			@@ -1075,6 +1068,7 @@
			sampscare = sampscare,
			suitobject = suitobject,
			suitpart = suitpart,
			stepcode = stepcode,
			descr = descr,
			}
			});
			@@ -1094,7 +1088,7 @@
			required = arra[i]["required"].ToString(),
			numberjudge = arra[i]["numberjudge"].ToString(),
			unit = arra[i]["unit"].ToString(),
			decimalnum = Convert.ToInt32(arra[i]["decimalnum"].ToString()),
			decimalnum = arra[i]["decimalnum"].ToString(),
			standvalue = arra[i]["standvalue"].ToString(),
			uppervalue = arra[i]["uppervalue"].ToString(),
			lowervalue = arra[i]["lowervalue"].ToString(),