From 94512e0ebf5acbd485f0b270afc2b342bf306cd9 Mon Sep 17 00:00:00 2001
From: luoxingjian <1010378449@qq.com>
Date: Wed, 4 Dec 2024 11:59:40 +0800
Subject: [PATCH] =?UTF-8?q?Dict=5FHTypeFItem=E8=AE=B0=E5=BD=95=E8=A1=A8Fee?=
 =?UTF-8?q?ItemCode=E4=BC=9A=E6=9C=89=E9=87=8D=E5=A4=8D=E9=A1=B9=EF=BC=8Ck?=
 =?UTF-8?q?eyno=E6=89=8D=E6=98=AF=E5=94=AF=E4=B8=80=E5=80=BC=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PEIS/Entity/DictHTypeFItem.cs         | 8 ++++----
 PEIS/Model/Setting/HazardTypeModel.cs | 2 +-
 PEIS/View/Setting/HazardTypeForm.cs   | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

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
         /// </summary>
         public Int64 FID { get; set; }
         /// <summary>
-        /// 检查项目编码
+        /// KeyNo
         /// </summary>
-        public string FeeItemCode{ get; set; }
+        public string KeyNo { get; set; }
         /// <summary>
         /// 排序
         /// </summary>
@@ -44,9 +44,9 @@ namespace PEIS.Entity
         /// </summary>
         public Int64 FID { get; set; }
         /// <summary>
-        /// 检查项目编码
+        /// KeyNo
         /// </summary>
-        public string FeeItemCode { get; set; }
+        public string KeyNo { get; set; }
         /// <summary>
         /// 检查项目名称
         /// </summary>
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<HTypeFItemInfo>;
-            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)