Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.WMS.Core/Op/Interface/BookingSlot/IBookingSlotService.cs

@@ -127,7 +127,7 @@ namespace DS.WMS.Core.Op.Interface
         /// </summary>
         /// <param name="model">生成订舱订单请求</param>
         /// <returns>返回回执</returns>
-        Task<TaskManageOrderResultDto> CreateBookingOrder(BookingGenerateDto model);
+        Task<DataResult<long>> CreateBookingOrder(BookingGenerateDto model);
 
         /// <summary>
         /// 检索舱位对应的订舱订单(BY 舱位主键)
@@ -152,7 +152,7 @@ namespace DS.WMS.Core.Op.Interface
         /// <param name="bcSrcDto">BC详情</param>
         /// <param name="bcTargetDto">BC变更后详情</param>
         /// <returns>返回回执</returns>
-        Task<string> ExcuteCompare(ParserBCInfoDto bcSrcDto, ParserBCInfoDto bcTargetDto);
+        Task<DataResult<TaskManageExcuteResultDto>> ExcuteCompare(ParserBCInfoDto bcSrcDto, ParserBCInfoDto bcTargetDto);
 
         /// <summary>
         /// 推送BC变更比对
@@ -186,7 +186,7 @@ namespace DS.WMS.Core.Op.Interface
         /// </summary>
         /// <param name="ids">舱位ID组</param>
         /// <returns>返回舱位详情</returns>
-        Task<List<BookingSlotBaseSaveOutput>> GetSlotList(long[] ids);
+        Task<DataResult<List<BookingSlotBaseSaveOutput>>> GetSlotList(long[] ids);
 
         /// <summary>
         /// 获取合票详情（生成合票需要先调此方法）

ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs

@@ -1582,7 +1582,8 @@ namespace DS.WMS.Core.Op.Method
 
             Logger.Log(NLog.LogLevel.Info, $"批次={batchNo} slotId={slotId} 开始请求比对结果");
 
-            var compareResult = await ExcuteCompare(bcSrcDto, bcTargetDto);
+            var rlt = await ExcuteCompare(bcSrcDto, bcTargetDto);
+            var compareResult = rlt.Data;
 
             Logger.Log(NLog.LogLevel.Info, $"批次={batchNo} slotId={slotId} 请求比对结果完成，结果={JsonConvert.SerializeObject(compareResult)}");
 
@@ -1611,9 +1612,9 @@ namespace DS.WMS.Core.Op.Method
                         CreateTime = nowDate,
                         UpdateTime = nowDate,
                         CreateBy = long.Parse(user.UserId),
-                        //CreatedUserName = UserManager.Name,
+                        CreateUserName = user.UserName,
                         UpdateBy = long.Parse(user.UserId),
-                        //UpdatedUserName = UserManager.Name,
+                        UpdateUserName = user.UserName,
                         CompareType = "BC_MODIFY",
                         CompareRlt = JsonConvert.SerializeObject(compareResult.extra.ShowDetailList),
                     };
@@ -1625,7 +1626,7 @@ namespace DS.WMS.Core.Op.Method
                     hisInfo.CompareDiffNum = compareResult.extra.IsExistsDiff ? compareResult.extra.ShowDetailList.Count : 0;
                     hisInfo.UpdateTime = nowDate;
                     hisInfo.UpdateBy = long.Parse(user.UserId);
-                    //hisInfo.UpdatedUserName = user.UserName;
+                    hisInfo.UpdateUserName = user.UserName;
 
                     hisInfo.CompareRlt = JsonConvert.SerializeObject(compareResult.extra.ShowDetailList);
 
@@ -1636,7 +1637,7 @@ namespace DS.WMS.Core.Op.Method
                         it.CompareRlt,
                         it.UpdateTime,
                         it.UpdateBy,
-                        //it.UpdatedUserName
+                        it.UpdateUserName
                     }).ExecuteCommandAsync();
                 }
                 //throw Oops.Oh($"舱位主键{slotId}请求BC比对失败，返回为空");
@@ -1660,8 +1661,7 @@ namespace DS.WMS.Core.Op.Method
         /// <param name="bcSrcDto">BC详情</param>
         /// <param name="bcTargetDto">BC变更后详情</param>
         /// <returns>返回回执</returns>
-        [NonAction]
-        public async Task<TaskManageExcuteResultDto> ExcuteCompare(ParserBCInfoDto bcSrcDto, ParserBCInfoDto bcTargetDto)
+        public async Task<DataResult<TaskManageExcuteResultDto>> ExcuteCompare(ParserBCInfoDto bcSrcDto, ParserBCInfoDto bcTargetDto)
         {
             TaskManageExcuteResultDto model = null;
             /*
@@ -1715,7 +1715,10 @@ namespace DS.WMS.Core.Op.Method
                 }
             }
 
-            return model;
+            if (model != null)
+                return DataResult<TaskManageExcuteResultDto>.Success(model);
+
+            return DataResult<TaskManageExcuteResultDto>.FailedData(model); ;
         }
         #endregion
 
@@ -2833,20 +2836,31 @@ namespace DS.WMS.Core.Op.Method
             throw new NotImplementedException();
         }
 
-        Task<TaskManageOrderResultDto> IBookingSlotService.CreateBookingOrder(BookingGenerateDto model)
+        #region 获取舱位详情列表
+        /// <summary>
+        /// 获取舱位详情列表
+        /// </summary>
+        /// <param name="ids">舱位ID组</param>
+        /// <returns>返回舱位详情</returns>
+        public async Task<DataResult<List<BookingSlotBaseSaveOutput>>> GetSlotList(long[] ids)
         {
-            throw new NotImplementedException();
-        }
+            var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
 
-        Task<string> IBookingSlotService.ExcuteCompare(ParserBCInfoDto bcSrcDto, ParserBCInfoDto bcTargetDto)
-        {
-            throw new NotImplementedException();
-        }
+            var slotList = await tenantDb.Queryable<BookingSlotBase>().Where(u => ids.Contains(u.Id) && u.Deleted == false).ToListAsync();
+            if (slotList.Count == 0)
+            {
+                //未查询到此舱位信息，可能已被删除，请重新查询后重试
+                throw new Exception(MultiLanguageConst.GetDescription(nameof(MultiLanguageConst.BookingSlotBaseInfoNull)));
+            }
 
-        Task<List<BookingSlotBaseSaveOutput>> IBookingSlotService.GetSlotList(long[] ids)
-        {
-            throw new NotImplementedException();
+            var data = slotList.Select(a => a.Adapt<BookingSlotBaseSaveOutput>()).ToList();
+
+            if (data.Count > 0)
+                return DataResult<List<BookingSlotBaseSaveOutput>>.Success(data);
+
+            return DataResult<List<BookingSlotBaseSaveOutput>>.FailedData(data);
         }
+        #endregion
     }
 
     public static class LetterIndexUtil