ISF

ams/djy.Model/IsfDto/IsfInfo.cs

@@ -0,0 +1,136 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+namespace djy.Model.IsfDto
+{
+    public class Info
+    {
+        /// <summary>
+        /// 提单号
+        /// </summary>
+        public string masterBillNo { get; set; }
+        /// <summary>
+        /// 类型(1.ISF5 2.ISF10)
+        /// </summary>
+        public string infoType { get; set; }
+        /// <summary>
+        /// 卸货港代码
+        /// </summary>
+        public string dischargeHarbourCode { get; set; }
+        /// <summary>
+        /// 交货地代码
+        /// </summary>
+        public string deliveryHarbourCode { get; set; }
+        /// <summary>
+        /// 贸易类型代码
+        /// </summary>
+        public string shipmentTypeCode { get; set; }
+        /// <summary>
+        /// HSTCode多个用英文逗号隔开
+        /// </summary>
+        public string hstCode { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string memo { get; set; }
+        /// <summary>
+        /// 提单类型CODE
+        /// </summary>
+        public string blTypeCode { get; set; }
+        /// <summary>
+        /// 业务id
+        /// </summary>
+        public string refId { get; set; }
+    }
+
+    public class CompanyList
+    {
+        /// <summary>
+        /// 公司类型
+        /// </summary>
+        public string companyType { get; set; }
+        /// <summary>
+        /// 公司名称
+        /// </summary>
+        public string companyName { get; set; }
+        /// <summary>
+        /// 公司ID
+        /// </summary>
+        public string companyId { get; set; }
+        /// <summary>
+        /// id类型代码
+        /// </summary>
+        public string idTypeCode { get; set; }
+        /// <summary>
+        /// 地址
+        /// </summary>
+        public string address { get; set; }
+        /// <summary>
+        /// 城市
+        /// </summary>
+        public string city { get; set; }
+        /// <summary>
+        /// 省份
+        /// </summary>
+        public string province { get; set; }
+        /// <summary>
+        /// 省份代码
+        /// </summary>
+        public string provinceCode { get; set; }
+        /// <summary>
+        /// 国家代码
+        /// </summary>
+        public string countryCode { get; set; }
+        /// <summary>
+        /// 邮编
+        /// </summary>
+        public string postcode { get; set; }
+        /// <summary>
+        /// HSTCode多个用英文逗号隔开
+        /// </summary>
+        public string hstCode { get; set; }
+        /// <summary>
+        /// 进出口类型(1.进口2.出口)
+        /// </summary>
+        public string ieType { get; set; }
+    }
+
+    public class IsfInfo
+    {
+ 
+        public Info info { get; set; }
+ 
+        public List<CompanyList> companyList { get; set; }
+        /// <summary>
+        /// 类型1.原始2.修改3.删除4.重发
+        /// </summary>
+        public int msgType { get; set; }
+        /// <summary>
+        /// 用户id
+        /// </summary>
+        public string user_id { get; set; }
+        /// <summary>
+        /// 服务名称，值为：eportyun.manifest.isf.sendBill
+        /// </summary>
+        public string method { get; set; }
+        /// <summary>
+        /// json
+        /// </summary>
+        public string format { get; set; }
+        /// <summary>
+        /// 加密
+        /// </summary>
+        public string sign { get; set; }
+        /// <summary>
+        /// 时间戳
+        /// </summary>
+        public DateTime timestamp { get; set; }
+        /// <summary>
+        /// 2.0
+        /// </summary>
+        public string version { get; set; }
+    }
+
+}

ams/djy.Service/Ams/AmsService.cs

@@ -789,7 +789,7 @@ namespace djy.Service.Ams
             {
                 var List = DbBus.Get(DbList.Common).Select<CodeCity>().WhereIf(provinceCode != "", x => x.ProvinceCode==provinceCode).ToList().Select(x => new CodeCityDto
                 {
-                    Code = x.CNName,
+                    Code = x.EnName,
                     PostCode = x.PostCode,
                     ProvinceCode = x.ProvinceCode,
                 }).Distinct().ToList();

ams/djy.WebApi/Controllers/ISF/IsfController.cs

@@ -3,6 +3,7 @@ using Common.Utilities;
 using djy.Model.Isf;
 using djy.Model.IsfDto;
 using djy.Service.ISF;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
@@ -10,6 +11,7 @@ using System.Threading.Tasks;
 
 namespace djy_AmsApi.Controllers.ISF
 {
+    [AllowAnonymous]
     public class IsfController : ApiBase
     {
         ISFService ser = new ISFService();
@@ -50,6 +52,37 @@ namespace djy_AmsApi.Controllers.ISF
         }
         #endregion
 
+        #region  删除 
+        /// <summary>
+        /// 删除接口 
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        [HttpGet("Del")]
+        public Response Delete(string ids)
+        {
+            var result = new Response();
+            try
+            {
+                if (GetLoginId == null)
+                {
+                    result.Code = 401;
+                    result.Message = "登录过期，请重新登录！";
+                    return result;
+                }
+                ser.Delete(ids, GetLoginId.ToString());
+
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+
+            return result;
+        }
+        #endregion
+
         #region  获取模板
         [HttpGet("GetTemplate")]
         public Response<List<ISF_CompanyTemplate>> GetTemplate(string InFoType, string CompanyType)