diff --git a/web/djy.IService/Report/IReportService.cs b/web/djy.IService/Report/IReportService.cs
index da73a19..a564add 100644
--- a/web/djy.IService/Report/IReportService.cs
+++ b/web/djy.IService/Report/IReportService.cs
@@ -30,5 +30,7 @@ namespace djy.IService.Report
 
 
         Response IsBook(string Gid, string TemplateId, bool isBook, string DJson, User user);
+
+        void TemplateTask();
     }   
 }
diff --git a/web/djy.Service/ISF/IsfService.cs b/web/djy.Service/ISF/IsfService.cs
index 2bffeba..a2a8761 100644
--- a/web/djy.Service/ISF/IsfService.cs
+++ b/web/djy.Service/ISF/IsfService.cs
@@ -363,12 +363,12 @@ namespace djy.Service.Isf
                                     idTypeCode = item.IdTypeCode,
                                     companyId = item.CompanyId,
                                     address = item.Address,
-                                    city = item.City,
+                                    city = item.City.Trim(),
                                     province = item.Province,
                                     provinceCode = item.ProvinceCode,
                                     countryCode = item.CountryCode,
                                     postcode = item.PostCode,
-                                    hstCode = item.HstCode,
+                                    hstCode = item.CompanyType!="MF"?item.HstCode: master.HstCode,
                                 });
                             }
 
@@ -412,7 +412,7 @@ namespace djy.Service.Isf
                         {
                             var timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                             var Account = DbBus.Get(DbList.djydb).Select<ParamSet>().Where(x => x.PARAMNAME == "ISFAccount").ToOne();
-                            var method = DbBus.Get(DbList.djydb).Select<ParamSet>().Where(x => x.PARAMNAME == "ISFMethod").ToOne();
+                            var method = DbBus.Get(DbList.djydb).Select<ParamSet>().Where(x => x.PARAMNAME == "ISFDeleteMethod").ToOne();
                             var key = DbBus.Get(DbList.djydb).Select<ParamSet>().Where(x => x.PARAMNAME == "ISFKEY").ToOne();
                             var url = DbBus.Get(DbList.djydb).Select<ParamSet>().Where(x => x.PARAMNAME == "AMSURL").ToOne();
 
diff --git a/web/djy.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/web/djy.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
index bb0807a..a212c6b 100644
--- a/web/djy.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/web/djy.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -6,6 +6,6 @@
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy.WebApi\bin\Release\net5.0\publish\</_PublishTargetUrl>
-    <History>True|2022-08-23T06:28:11.3249766Z;True|2022-08-23T14:06:20.0492662+08:00;True|2022-08-18T14:54:28.0305650+08:00;True|2022-08-18T14:01:59.8031822+08:00;True|2022-08-16T15:41:06.8876151+08:00;True|2022-08-11T16:30:26.5758718+08:00;True|2022-08-11T15:57:08.7787498+08:00;True|2022-08-11T15:31:36.9253999+08:00;</History>
+    <History>True|2022-11-22T09:09:34.5920257Z;True|2022-11-21T16:04:10.7391070+08:00;True|2022-08-23T14:28:11.3249766+08:00;True|2022-08-23T14:06:20.0492662+08:00;True|2022-08-18T14:54:28.0305650+08:00;True|2022-08-18T14:01:59.8031822+08:00;True|2022-08-16T15:41:06.8876151+08:00;True|2022-08-11T16:30:26.5758718+08:00;True|2022-08-11T15:57:08.7787498+08:00;True|2022-08-11T15:31:36.9253999+08:00;</History>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/web/djy.WebApi/Properties/launchSettings.json b/web/djy.WebApi/Properties/launchSettings.json
index 4bc5eab..a76e941 100644
--- a/web/djy.WebApi/Properties/launchSettings.json
+++ b/web/djy.WebApi/Properties/launchSettings.json
@@ -4,8 +4,8 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:5002",
-      "sslPort": 0
+      "applicationUrl": "http://localhost:61011/",
+      "sslPort": 44338
     }
   },
   "profiles": {
diff --git a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
index c44abff..78c204b 100644
--- a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -6,6 +6,6 @@
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\bin\Release\net5.0\publish\</_PublishTargetUrl>
-    <History>True|2022-10-11T09:38:16.7996816Z;True|2022-09-29T09:19:00.7683602+08:00;True|2022-09-29T09:13:52.5346287+08:00;True|2022-09-28T17:20:00.5132329+08:00;True|2022-09-28T17:12:55.5194328+08:00;True|2022-09-28T17:08:40.9334943+08:00;True|2022-09-28T17:05:05.8696515+08:00;True|2022-09-28T16:31:42.3084773+08:00;True|2022-09-28T09:20:15.3600913+08:00;True|2022-08-31T11:05:06.8122818+08:00;True|2022-08-23T14:37:55.9777827+08:00;True|2022-08-22T15:49:27.7983465+08:00;</History>
+    <History>True|2023-01-09T00:52:52.3747129Z;True|2023-01-06T18:11:59.7446279+08:00;True|2023-01-06T17:09:56.9087259+08:00;True|2022-10-11T17:38:16.7996816+08:00;True|2022-09-29T09:19:00.7683602+08:00;True|2022-09-29T09:13:52.5346287+08:00;True|2022-09-28T17:20:00.5132329+08:00;True|2022-09-28T17:12:55.5194328+08:00;True|2022-09-28T17:08:40.9334943+08:00;True|2022-09-28T17:05:05.8696515+08:00;True|2022-09-28T16:31:42.3084773+08:00;True|2022-09-28T09:20:15.3600913+08:00;True|2022-08-31T11:05:06.8122818+08:00;True|2022-08-23T14:37:55.9777827+08:00;True|2022-08-22T15:49:27.7983465+08:00;</History>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/web/djy_IsfApi/djy_IsfApi.csproj.user b/web/djy_IsfApi/djy_IsfApi.csproj.user
index 8cba453..0c0d867 100644
--- a/web/djy_IsfApi/djy_IsfApi.csproj.user
+++ b/web/djy_IsfApi/djy_IsfApi.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
   </PropertyGroup>
diff --git a/web/djy_Report/Controllers/Report/ReportController.cs b/web/djy_Report/Controllers/Report/ReportController.cs
index 0535c87..4c8604e 100644
--- a/web/djy_Report/Controllers/Report/ReportController.cs
+++ b/web/djy_Report/Controllers/Report/ReportController.cs
@@ -97,7 +97,12 @@ namespace djy_Report.Controllers.Report
             
         }
         #endregion
+        [HttpGet("Test"),AllowAnonymous]
+        public void Test()
+        {
+            ser.TemplateTask();
 
 
+        }
     }
 }
diff --git a/web/djy_Report/Properties/PublishProfiles/FolderProfile.pubxml.user b/web/djy_Report/Properties/PublishProfiles/FolderProfile.pubxml.user
index 95e7434..7806123 100644
--- a/web/djy_Report/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/web/djy_Report/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy_Report\bin\Release\net5.0\publish\</_PublishTargetUrl>
-    <History>True|2022-09-26T02:36:28.6725563Z;True|2022-09-26T10:19:28.4063280+08:00;True|2022-09-26T10:15:50.6060906+08:00;True|2022-08-16T15:07:48.5795668+08:00;True|2022-08-12T17:21:59.5918968+08:00;True|2022-08-12T17:20:17.2821998+08:00;True|2022-08-12T16:53:08.4350093+08:00;True|2022-08-12T16:35:32.5083916+08:00;True|2022-08-12T11:37:34.3492640+08:00;True|2022-07-28T17:10:51.7248412+08:00;True|2022-07-28T16:35:31.2753071+08:00;True|2022-07-26T15:37:57.8232926+08:00;True|2022-07-26T15:35:18.3536046+08:00;True|2022-07-26T15:13:31.6562730+08:00;True|2022-07-26T15:13:15.8782954+08:00;True|2022-07-26T14:45:37.8959227+08:00;True|2022-07-26T14:36:32.2119163+08:00;True|2022-07-25T13:50:19.3527775+08:00;</History>
+    <History>True|2023-01-06T10:08:22.9277115Z;True|2022-09-26T10:36:28.6725563+08:00;True|2022-09-26T10:19:28.4063280+08:00;True|2022-09-26T10:15:50.6060906+08:00;True|2022-08-16T15:07:48.5795668+08:00;True|2022-08-12T17:21:59.5918968+08:00;True|2022-08-12T17:20:17.2821998+08:00;True|2022-08-12T16:53:08.4350093+08:00;True|2022-08-12T16:35:32.5083916+08:00;True|2022-08-12T11:37:34.3492640+08:00;True|2022-07-28T17:10:51.7248412+08:00;True|2022-07-28T16:35:31.2753071+08:00;True|2022-07-26T15:37:57.8232926+08:00;True|2022-07-26T15:35:18.3536046+08:00;True|2022-07-26T15:13:31.6562730+08:00;True|2022-07-26T15:13:15.8782954+08:00;True|2022-07-26T14:45:37.8959227+08:00;True|2022-07-26T14:36:32.2119163+08:00;True|2022-07-25T13:50:19.3527775+08:00;</History>
   </PropertyGroup>
 </Project>
\ No newline at end of file