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

Myshipping.Application/Entity/BookingTemplate.cs

@@ -18,7 +18,7 @@ namespace Myshipping.Application.Entity
         /// <summary>
         /// 类型
         /// </summary>
-        public BookingTemplateType Type { get; set; }
+        public string Type { get; set; }
         /// <summary>
         /// 模板内容
         /// </summary>

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -892,10 +892,10 @@ namespace Myshipping.Application
             {
                 BusinessId = BusinessId,
                 MBLNO = MBLNO,
-                YARD = YARD,
+                YARD = YARD==""?null: YARD,
-                YardCode = YARDID,
+                YardCode = YARDID == ""? null: YARDID,
-                CARRIER = CARRIER,
+                CARRIER = CARRIER == "" ? null : CARRIER,
-                CARRIERID = CARRIERID,
+                CARRIERID = CARRIERID == "" ? null : CARRIERID,
                 isBook = isbook
             });
             billdto.Children = billTraceList;
@@ -2222,7 +2222,6 @@ namespace Myshipping.Application
         }
         #endregion
 
-
         public async Task<string> InnerBookingOrClosingEDI(BookingOrClosingEDIOrderDto model)
         {
             string batchNo = IDGen.NextID().ToString();
@@ -2524,7 +2523,6 @@ namespace Myshipping.Application
 
 
 
-
         #region 下载订舱、截单EDI
         /// <summary>
         /// 下载订舱、截单EDI

Myshipping.Application/Service/BookingTemplate/BookingTemplateService.cs

@@ -39,7 +39,7 @@ namespace Myshipping.Application
                var entities = await _rep.AsQueryable()
                 .Where(m => m.CreatedUserId == UserManager.UserId)
                 .WhereIF(!string.IsNullOrEmpty(input.Title), u => u.Title.Contains(input.Title))
-                .WhereIF(input.Type.HasValue, u => u.Type == input.Type)
+                .WhereIF(!string.IsNullOrEmpty(input.Type), u =>u.Type.Contains(input.Type))
                 .ToPagedListAsync(input.PageNo, input.PageSize);
             return entities.XnPagedResult();
         }
@@ -52,7 +52,7 @@ namespace Myshipping.Application
         [HttpPost("/BookingTemplate/add")]
         public async Task Add(AddBookingTemplateInput input)
         {
-            var c = _rep.Count(x => x.Type == input.Type && x.Title == input.Title);
+            var c = _rep.Count(x => x.Type.Contains(input.Type) && x.Title == input.Title);
             if (c > 0)
             {
                 throw Oops.Oh(BookingErrorCode.BOOK101);

Myshipping.Application/Service/BookingTemplate/Dto/BookingTemplateInput.cs

@@ -17,7 +17,7 @@ namespace Myshipping.Application
         /// <summary>
         /// 类型
         /// </summary>
-        public virtual BookingTemplateType Type { get; set; }
+        public virtual string Type { get; set; }
 
         /// <summary>
         /// 模板内容
@@ -91,7 +91,7 @@ namespace Myshipping.Application
         /// <summary>
         /// 类型
         /// </summary>
-        public virtual BookingTemplateType? Type { get; set; }
+        public virtual string Type { get; set; }
 
         /// <summary>
         /// 模板内容