Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Myshipping.Application.xml

@@ -9736,7 +9736,7 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Myshipping.Application.BookingPrintTemplateService.GetPrinttemplateRightList(System.Int64)">
+        <member name="M:Myshipping.Application.BookingPrintTemplateService.GetPrinttemplateRightList(System.Int64,System.String,System.String)">
             <summary>
             获取打印模板权限
             </summary>
@@ -10088,6 +10088,11 @@
             主键
             </summary>
         </member>
+        <member name="P:Myshipping.Application.DjyCustomerSyncDto.BSNO">
+            <summary>
+            东胜id
+            </summary>
+        </member>
         <member name="P:Myshipping.Application.DjyCustomerSyncDto.CodeName">
             <summary>
             代码

Myshipping.Application/Service/BookingPrintTemplate/BookingPrintTemplateService.cs

@@ -396,7 +396,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <returns></returns>
         [HttpGet("/BookingPrintTemplate/GetPrinttemplateRightList")]
-        public async Task<dynamic> GetPrinttemplateRightList(long userId)
+        public async Task<dynamic> GetPrinttemplateRightList(long userId,string cateCode,string type)
         {
             var userlist = await _repUser.AsQueryable().Filter(null, true).ToListAsync();
             var list = await _repRight.AsQueryable().InnerJoin<BookingPrintTemplate>((d, t) => d.PrintTemplateId == t.Id && t.TenantId == UserManager.TENANT_ID).
@@ -417,6 +417,9 @@ namespace Myshipping.Application
                     Type = t.Type,
                     UserName = "",
                 }).ToListAsync();
+
+            list = list.WhereIF(!string.IsNullOrWhiteSpace(cateCode), x => x.CateCode == cateCode).
+                WhereIF(!string.IsNullOrWhiteSpace(type), x => x.Type == type).ToList();
             foreach (var item in list)
             {
                 var username = userlist.Where(x => x.Id == item.SysUserId).Select(x => x.Name).FirstOrDefault();

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -76,10 +76,10 @@ namespace Myshipping.Application
         public async Task<long> SyncCustomer(DjyCustomerSyncDto model)
         {
              
-            if (string.IsNullOrWhiteSpace(model.CodeName)) {
+            if (string.IsNullOrWhiteSpace(model.BSNO)) {
-                throw Oops.Bah("请上传正确数据,Code未录入");
+                throw Oops.Bah("BSNO未录入");
             }
-            var m = await _djycustomer.Where(x => x.CodeName == model.CodeName).FirstAsync();
+            var m = await _djycustomer.Where(x => x.BSNO == model.BSNO).FirstAsync();
             var entity = model.Adapt<DjyCustomer>();
             if (m == null)
             {
@@ -115,11 +115,11 @@ namespace Myshipping.Application
         public async Task<long> SyncVesselDate(DjyVesselInfoDto model)
         {
 
-            if (string.IsNullOrWhiteSpace(model.Vessel)|| string.IsNullOrWhiteSpace(model.CARRIERID))
+            if (string.IsNullOrWhiteSpace(model.BSNO))
             {
-                throw Oops.Bah("请上传正确数据,船公司或船名未录入");
+                throw Oops.Bah("BSNO未录入");
             }
-            var m = await _vesselinfo.Where(x => x.Vessel==model.Vessel.ToUpper().Trim()&&x.CARRIERID==model.CARRIERID).FirstAsync();
+            var m = await _vesselinfo.Where(x => x.BSNO==model.BSNO).FirstAsync();
             var entity = model.Adapt<DjyVesselInfo>();
             entity.Vessel = model.Vessel.ToUpper().Trim();
             if (m == null)

Myshipping.Application/Service/DataSync/Dto/DjyCustomerDto.cs

@@ -13,7 +13,10 @@ namespace Myshipping.Application
         /// 主键
         /// </summary>
         public long? Id { get; set; }
-
+        /// <summary>
+        /// 东胜id
+        /// </summary>
+        public string BSNO { get; set; }
         /// <summary>
         /// 代码
         /// </summary>

Myshipping.Core/Entity/DJY/DjyCustomer.cs

@@ -136,5 +136,10 @@ namespace Myshipping.Core.Entity
         /// 提单信息
         /// </summary>
         public string TIDANINFO { get; set; }
+
+        /// <summary>
+        /// 东胜id
+        /// </summary>
+        public string BSNO { get; set; }
     }
 }

Myshipping.Core/Entity/DJY/DjyVesselInfo.cs

@@ -84,6 +84,12 @@ namespace Myshipping.Application.Entity
         /// 内部航次
         /// </summary>
         public string VoynoInside { get; set; }
+
+
+        /// <summary>
+        /// 东胜id
+        /// </summary>
+        public string BSNO { get; set; }
     }
 
 
@@ -91,6 +97,10 @@ namespace Myshipping.Application.Entity
 
     public class DjyVesselInfoDto {
 
+        /// <summary>
+        /// 东胜id
+        /// </summary>
+        public string BSNO { get; set; }
         public virtual long Id { get; set; }
         /// <summary>
         /// 船名

Myshipping.Core/Myshipping.Core.xml

@@ -1809,6 +1809,11 @@
             提单信息
             </summary>
         </member>
+        <member name="P:Myshipping.Core.Entity.DjyCustomer.BSNO">
+            <summary>
+            东胜id
+            </summary>
+        </member>
         <member name="T:Myshipping.Core.Entity.DjyCustomerContact">
             <summary>
             
@@ -17348,6 +17353,16 @@
             内部航次
             </summary>
         </member>
+        <member name="P:Myshipping.Application.Entity.DjyVesselInfo.BSNO">
+            <summary>
+            东胜id
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.DjyVesselInfoDto.BSNO">
+            <summary>
+            东胜id
+            </summary>
+        </member>
         <member name="P:Myshipping.Application.Entity.DjyVesselInfoDto.Vessel">
             <summary>
             船名