diff --git a/PEIS/Entity/DictHTypeFItem.cs b/PEIS/Entity/DictHTypeFItem.cs index 7c580e8..9560b28 100644 --- a/PEIS/Entity/DictHTypeFItem.cs +++ b/PEIS/Entity/DictHTypeFItem.cs @@ -21,9 +21,9 @@ namespace PEIS.Entity /// public Int64 FID { get; set; } /// - /// 检查项目编码 + /// KeyNo /// - public string FeeItemCode{ get; set; } + public string KeyNo { get; set; } /// /// 排序 /// @@ -44,9 +44,9 @@ namespace PEIS.Entity /// public Int64 FID { get; set; } /// - /// 检查项目编码 + /// KeyNo /// - public string FeeItemCode { get; set; } + public string KeyNo { get; set; } /// /// 检查项目名称 /// diff --git a/PEIS/Model/Setting/HazardTypeModel.cs b/PEIS/Model/Setting/HazardTypeModel.cs index 5f63090..34acdb0 100644 --- a/PEIS/Model/Setting/HazardTypeModel.cs +++ b/PEIS/Model/Setting/HazardTypeModel.cs @@ -23,7 +23,7 @@ namespace PEIS.Model.Setting H.ID, H.HID, H.FID, - H.FeeItemCode, + H.KeyNo, H.Sort, F.FeeItemName, F.SettlePrice, diff --git a/PEIS/View/Setting/HazardTypeForm.cs b/PEIS/View/Setting/HazardTypeForm.cs index 3396e4e..8c0bc75 100644 --- a/PEIS/View/Setting/HazardTypeForm.cs +++ b/PEIS/View/Setting/HazardTypeForm.cs @@ -131,7 +131,8 @@ namespace PEIS.View.Setting return; } var HFeelItem= gCHFeelItem.DataSource as List; - var alradlyData=HFeelItem?.Where(p => p.FID == feeItemRow.ID).FirstOrDefault(); + //var alradlyData=HFeelItem?.Where(p => p.FID == feeItemRow.ID).FirstOrDefault(); + var alradlyData = HFeelItem?.Where(p => p.KeyNo == feeItemRow.KeyNo).FirstOrDefault(); if (alradlyData!=null) { Global.Msg("info", "项目已经存在"); @@ -140,7 +141,7 @@ namespace PEIS.View.Setting DictHTypeFItem dictHType = new DictHTypeFItem(); dictHType.FID = feeItemRow.ID; dictHType.HID = hazardTypeRow.ID ; - dictHType.FeeItemCode = feeItemRow.FeeItemCode; + dictHType.KeyNo = feeItemRow.KeyNo; dictHType.Sort = HFeelItem.Count + 1; var result = dictHType.Save(); if (result)