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

Myshipping.Application/Entity/BookingOrderSeaeEdiCtn.cs

@@ -19,6 +19,11 @@ namespace Myshipping.Application.Entity
         /// 尺寸
         /// </summary>
         public string SIZE { get; set; }
+
+        /// <summary>
+        /// 表现形式 箱型
+        /// </summary>
+        public string CTNALL { get; set; }
         /// <summary>
         /// 集装箱箱型
         /// </summary>

Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs

@@ -117,6 +117,11 @@ namespace Myshipping.Application
                     {
                         var ctn = item.Adapt<BookingOrderSeaeEdiCtn>();
                         ctn.PId = entity.Id;
+                        if (ctn.CTNALL.Length==4) {
+                            ctn.SIZE = ctn.CTNALL != null ? ctn.CTNALL.Substring(0, 2) : "";
+                            ctn.SIZE = ctn.CTNALL != null ? ctn.CTNALL.Substring(2, 2) : "";
+
+                        }
                         await _seaeedictn.InsertAsync(ctn);
                     }
                 }
@@ -143,6 +148,12 @@ namespace Myshipping.Application
                     {
                         var ctn = item.Adapt<BookingOrderSeaeEdiCtn>();
                         ctn.PId = entity.Id;
+                        if (ctn.CTNALL.Length == 4)
+                        {
+                            ctn.SIZE = ctn.CTNALL != null ? ctn.CTNALL.Substring(0, 2) : "";
+                            ctn.SIZE = ctn.CTNALL != null ? ctn.CTNALL.Substring(2, 2) : "";
+
+                        }
                         await _seaeedictn.InsertAsync(ctn);
                     }
                 }
@@ -169,6 +180,7 @@ namespace Myshipping.Application
         /// <param name="Ids"></param>
         /// <returns></returns>
         [SqlSugarUnitOfWork]
+
         [HttpPost("/BookingOrderSeaeEdi/Delete")]
         public async Task Delete(string Ids)
         {
@@ -234,7 +246,6 @@ namespace Myshipping.Application
                     List<CTNDATAItem> CTNDATA = new List<CTNDATAItem>();
                     mDATA = order.Adapt<MDATA>();
                     CTNDATA = ctns.Adapt<List<CTNDATAItem>>();
-
                     custEDIDtos.Add(
                         new CustEDIDto
                         {
@@ -258,10 +269,10 @@ namespace Myshipping.Application
 
 
                     var jobjResp = JObject.Parse(strResp);
-                    int respCode = jobjResp.GetIntValue("code");
-                    if (respCode != 200)
+                    bool respCode = jobjResp.GetBooleanValue("Success");
+                    if (respCode== false)
                     {
-                        throw Oops.Bah(BookingErrorCode.BOOK129, jobjResp.GetStringValue("message"));
+                        throw Oops.Bah(jobjResp.GetStringValue("Message"));
                     }
                     //货运动态
                     var bsl = new BookingStatusLog();

Myshipping.Application/Service/BookingOrderSeaeEdi/Dto/BookingOrderSeaeEdiServiceDto.cs

@@ -204,6 +204,10 @@ namespace Myshipping.Application.Service.BookingOrderSeaeEdi.Dto
         /// </summary>
         public string SIZE { get; set; }
         /// <summary>
+        /// 集装箱箱型表现形式
+        /// </summary>
+        public string CTNALL { get; set; }
+        /// <summary>
         /// 集装箱箱型
         /// </summary>
         public string CTN { get; set; }

Myshipping.Core/Service/User/SysUserService.cs

@@ -77,7 +77,8 @@ public class SysUserService : ISysUserService, IDynamicApiController, ITransient
                                                                     o.Pids.Contains(pid.Trim()))
             .WhereIF(Enum.IsDefined(typeof(CommonStatus), input.SearchStatus), (u, e, o) => u.Status == input.SearchStatus)
             .Where((u, e, o) => u.AdminType == AdminType.None)
-            .Select<UserOutput>("u.*,t.Name As TenantName ").ToDataFilter("u", "Id", FilterType.User).ToPagedListAsync(input.PageNo, input.PageSize);
+            .Select<UserOutput>("u.*,t.Name As TenantName ").ToDataFilter("u", "Id", FilterType.User).OrderByDescending(u=>u.Name).
+            ToPagedListAsync(input.PageNo, input.PageSize);
 
         var empInfos = await _sysEmpService.GetEmpInfo(users.Items.Select(m => long.Parse(m.Id)).ToList());
         foreach (var user in users.Items)
@@ -103,7 +104,7 @@ public class SysUserService : ISysUserService, IDynamicApiController, ITransient
         // 数据范围检查
         CheckDataScope(input.SysEmpParam == null || string.IsNullOrEmpty(input.SysEmpParam.OrgId) ? 0 : long.Parse(input.SysEmpParam.OrgId));
 
-        var isExist = await _sysUserRep.AsQueryable().Filter(null, true).AnyAsync(u => u.Account == input.Account);
+        var isExist = await _sysUserRep.AsQueryable().Filter(null, true).AnyAsync(u => u.Account == input.Account&&u.IsDeleted==false);
         if (isExist) throw Oops.Oh(ErrorCode.D1003);
 
         var keyDES = App.GetOptions<EncryptKeyOptions>().DES;