~tjx/NewPdaSqlServer.git

			@@ -26,11 +26,12 @@
			.WhereIF(
			StringUtil.IsNotNullOrEmpty(queryObj.result) &&
			"未完成".Equals(queryObj.result),
			a => (a.FcheckResu ?? "") == "")
			a => (a.STATUS ?? "") != "已提交")
			//a => (a.FcheckResu ?? "") == ""\|\| (a.FcheckResu ?? "") == "检验中")
			.WhereIF(
			StringUtil.IsNotNullOrEmpty(queryObj.result) &&
			!"未完成".Equals(queryObj.result),
			a => (a.FcheckResu ?? "") != "")
			a => (a.STATUS ?? "") == "已提交")
			.WhereIF(UtilityHelper.CheckGuid(parsedGuid),
			a => a.guid == parsedGuid)
			.OrderByDescending(a => a.CreateDate)
			@@ -253,6 +254,7 @@
			var item = new MesQaItemsDetectDetail12();
			item.ParentGuid = detail.ParentGuid;
			item.GrandpaGuid = detail.GrandpaGuid;
			item.FcheckItem = detail.FcheckItem;
			item.Fstand = detail.Fstand;
			item.FcheckResu = detail.FcheckResu;
			item.CreateBy = detail.LastupdateBy;
			@@ -260,7 +262,7 @@
			result.Add(item);
			}

			return db.Insertable(result).IgnoreColumns(true).ExecuteCommand();
			return db.Insertable(result).PageSize(1).IgnoreColumnsNull().ExecuteCommand();
			});

			detail.CreateBy = detail.LastupdateBy;
			@@ -312,6 +314,7 @@
			commit += db.Updateable<MesQaItemsDetectDetail5>()
			.SetColumns(s => s.FcheckResu == result)
			.SetColumns(s => s.FenterQty == count)
			.SetColumns(s => s.FngRate == (s.CheckQyt == 0 ? (decimal?)null : (decimal?)(Convert.ToDouble(noCount) / Convert.ToDouble(count))))
			.Where(s => s.Guid == detail.ParentGuid)
			.ExecuteCommand();

			@@ -451,9 +454,7 @@
			if (qsItemOqcItem.FupAllow.IsNullOrEmpty()
			&& qsItemOqcItem.FdownAllow.IsNullOrEmpty()
			&& qsItemOqcItem.Fstand == null)
			{
			mesQaItemsDetectDetail12.isNumber = false;
			}
			}

			return rkjDto;
			@@ -579,7 +580,7 @@
			throw new Exception("该检验单已提交");

			if (mesQaItemsDetect01.FcheckDate == null)
			throw new Exception("该检测单未输入检验日期，请核对。");
			throw new Exception("该检测单没有检验完成，请核对。");

			if (mesQaItemsDetect01.FcheckBy.IsNullOrEmpty())
			throw new Exception("该检测单未输入检验人员，请核对。");