1

web/djy.Model/Isf/ISF_Company.cs

@@ -19,6 +19,10 @@ namespace djy.Model.Isf
         [MaxLength(50)]
         public string CompanyType { get; set; }
         /// <summary>
+        /// 公司ID
+        /// </summary>
+        public string CompanyId { get; set; }
+        /// <summary>
         /// 公司名称
         /// </summary>
         [MaxLength(50)]

web/djy.Model/IsfDto/IsfInfo.cs

@@ -60,10 +60,10 @@ namespace djy.Model.IsfDto
         /// </summary>
         public string city { get; set; }
      
-        ///// <summary>
-        ///// 公司ID
-        ///// </summary>
-        //public string companyId { get; set; }
+        /// <summary>
+        /// 公司ID
+        /// </summary>
+        public string companyId { get; set; }
       
         /// <summary>
         /// 公司名称

web/djy.Service/ISF/IsfService.cs

@@ -63,7 +63,6 @@ namespace djy.Service.Isf
             if (mlist != null)
             {
                 return "-1";
-
             }
 
             if (dto.GID.IsNull())
@@ -319,6 +318,7 @@ namespace djy.Service.Isf
                                     companyType = item.CompanyType,
                                     companyName = item.CompanyName,
                                     idTypeCode = item.IdTypeCode,
+                                    companyId=item.CompanyId,
                                     address = item.Address,
                                     city = item.City,
                                     province = item.Province,
@@ -521,7 +521,6 @@ namespace djy.Service.Isf
                         //}
                         //if (master.NewNotice == "修改发送成功")
                         //{
-
                         //    DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new AMS_Master { MateState = retdto.status, NewNotice = "匹配失败", ReportState = "删单失败" }).Where(w => w.GID == master.GID).ExecuteAffrows();
                         //}
                         if (master.NewNotice == "重发发送成功" || master.NewNotice == "新增发送成功")
@@ -529,7 +528,6 @@ namespace djy.Service.Isf
 
                             DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new AMS_Master { MateState = retdto.status, NewNotice = "匹配失败", ReportState = "接收成功" }).Where(w => w.GID == master.GID).ExecuteAffrows();
                         }
-
                     }
                     else if (retdto.status == "02")
                     {

web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>F:\DJY.AMS\web\djy_IsfApi\bin\Release\net5.0\publish\</_PublishTargetUrl>
-    <History>True|2022-06-30T07:28:48.8212173Z;True|2022-06-30T15:07:27.8048719+08:00;True|2022-06-30T14:23:02.1357807+08:00;True|2022-06-30T14:07:07.8696769+08:00;True|2022-06-30T09:14:19.1360602+08:00;True|2022-06-29T16:34:08.2367476+08:00;</History>
+    <History>True|2022-07-01T01:54:42.5780181Z;True|2022-06-30T15:28:48.8212173+08:00;True|2022-06-30T15:07:27.8048719+08:00;True|2022-06-30T14:23:02.1357807+08:00;True|2022-06-30T14:07:07.8696769+08:00;True|2022-06-30T09:14:19.1360602+08:00;True|2022-06-29T16:34:08.2367476+08:00;</History>
   </PropertyGroup>
 </Project>