ams

ams/Djy.Common/DjyService/ApiBase.cs

@@ -186,7 +186,7 @@ namespace Common.DjyService
         /// <summary>
         /// 获取登录公司id
         /// </summary>
-        protected string GetLoginCompId { get { return GetClaimsValue("CompId"); } }
+        protected string GetLoginCompId { get { return GetClaimsValue("CompayId"); } }
 
         /// <summary>
         /// 获取登录类型

ams/djy.Service/ISF/IsfService.cs

@@ -221,7 +221,6 @@ namespace djy.Service.ISF
         public async Task<Response> SendDE(string Gid, string userid, string msgType)
         {
             Response req = new Response();
-
             try
             {
                 string[] id = Gid.Split(',');
@@ -234,6 +233,7 @@ namespace djy.Service.ISF
 
                         var fin = new FinanceService();
                         var master = DbBus.Get(DbList.AMSCenter).Select<ISF_Master>().Where(x => (x.IsDel == false || x.IsDel == null) && x.CompID == user.CompId && x.GID == oid).ToOne();
+                        var comlist = DbBus.Get(DbList.AMSCenter).Select<ISF_Company>().Where(x => (x.IsDel == false || x.IsDel == null) && x.PID == oid).ToList();
                         if (msgType != "3")
                         {
                            
@@ -272,10 +272,31 @@ namespace djy.Service.ISF
                             info.infoType = master.InFoType;
                             info.dischargeHarbourCode = portList.Where(x => x.Code == master.DischargeHarbourCode).Select(x => x.EdiCode).FirstOrDefault();
                             info.deliveryHarbourCode = portList.Where(x => x.Code == master.DeliveryHarbourCode).Select(x => x.EdiCode).FirstOrDefault();
-
+                            info.shipmentTypeCode = master.ShipmentTypeCode;
-
+                            info.hstCode = master.HstCode;
-
+                            info.memo = null;
-
+                            info.blTypeCode = master.BlTypeCode;
+                            info.refId = master.GID;
+                            List<CompanyList> companyList = new List<CompanyList>();
+                            foreach (var item in comlist)
+                            {
+                                companyList.Add(new CompanyList
+                                {
+                                    companyType = item.CompanyType,
+                                    companyName = item.CompanyName,
+                                    companyId = null,
+                                    idTypeCode=item.IdTypeCode,
+                                    address=item.Address,
+                                    city=item.City,
+                                    province=item.Province,
+                                    provinceCode=item.ProvinceCode,
+                                    countryCode=item.ProvinceCode,
+                                    postcode=item.PostCode,
+                                    hstCode=item.HstCode,
+                                    ieType=item.IeType
+                                });
+                            }
+                             companyList.Sort();
                         }
                     }
                 }