修改舱位管理

ds-wms-service/DS.WMS.Core/Op/Dtos/BookingSlot/BookingSlotBaseSaveOutput.cs

@@ -1,4 +1,5 @@
-using System;
+using SqlSugar;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -503,8 +504,40 @@ namespace DS.WMS.Core.Op.Dtos
         public bool UpdateFlag { get; set; }
 
         /// <summary>
-        /// 
+        /// 主键ID
         /// </summary>
-        public Nullable<long> CreatedUserId { get; set; }
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Note { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public long CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建人名称
+        /// </summary>
+        public string CreateUserName { get; set; }
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public long UpdateBy { get; set; }
+        /// <summary>
+        /// 修改人名称
+        /// </summary>
+        public string UpdateUserName { get; set; }
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime UpdateTime { get; set; }
     }
 }

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

@@ -171,7 +171,7 @@ namespace DS.WMS.Core.Op.Interface
         /// <param name="bcTargetDto">新舱位详情</param>
         /// <param name="slotId">舱位ID</param>
         /// <returns></returns>
-        Task MeasureDiffCautionTask(ParserBCInfoDto bcSrcDto, ParserBCInfoDto bcTargetDto, long slotId);
+        Task<DataResult<string>> MeasureDiffCautionTask(ParserBCInfoDto bcSrcDto, ParserBCInfoDto bcTargetDto, long slotId);
 
         /// <summary>
         /// 订舱编号检索舱位信息

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

@@ -2823,7 +2823,7 @@ namespace DS.WMS.Core.Op.Method
                     result.msg = "请上传指定模板文件";
                     return result;
                 }
-                var tempDic = Path.Combine(App.WebHostEnvironment.WebRootPath, App.GetOptions<TempFileOptions>().Path, DateTime.Now.Ticks.ToString());
+                var tempDic = string.Empty;// Path.Combine(App.WebHostEnvironment.WebRootPath, App.GetOptions<TempFileOptions>().Path, DateTime.Now.Ticks.ToString());
                 Directory.CreateDirectory(tempDic);
                 var filePath = Path.Combine(tempDic, file.FileName);
 
@@ -2886,7 +2886,7 @@ namespace DS.WMS.Core.Op.Method
                                 case 23:
                                     {
                                         ctnExt.CtnAll = value;
-                                        ctnExt.CtnCode = cacheCtnCode.FirstOrDefault(x => x.Name == value)?.Code;
+                                        ctnExt.CtnCode = cacheCtnCode.FirstOrDefault(x => x.CtnName == value)?.EdiCode;
                                         break;
                                     }
                                 case 24:
@@ -2985,10 +2985,10 @@ namespace DS.WMS.Core.Op.Method
                         }
                     }
                     // 特殊处理
-                    if (!string.IsNullOrWhiteSpace(slot.CarrierCode)) slot.Carrier = cacheCarrier.FirstOrDefault(x => x.EnName == slot.CarrierCode)?.CnName;
+                    if (!string.IsNullOrWhiteSpace(slot.CarrierCode)) slot.Carrier = cacheMappCarrier.FirstOrDefault(x => x.CarrierName == slot.CarrierCode)?.CarrierName;
                     if (!string.IsNullOrWhiteSpace(slot.PortLoadCode)) slot.PortLoad = cachePort.FirstOrDefault(x => x.EdiCode == slot.PortLoadCode)?.PortName;
                     if (!string.IsNullOrWhiteSpace(slot.PortDischargeCode)) slot.PortDischarge = cachePort.FirstOrDefault(x => x.EdiCode == slot.PortDischargeCode)?.PortName;
-                    if (!string.IsNullOrWhiteSpace(slot.LaneName)) slot.LaneCode = cacheLane.FirstOrDefault(x => x.LaneName == slot.LaneName)?.Code;
+                    if (!string.IsNullOrWhiteSpace(slot.LaneName)) slot.LaneCode = cacheLane.FirstOrDefault(x => x.LaneName == slot.LaneName)?.LaneEnName;
                     if (!string.IsNullOrWhiteSpace(slot.BookingSlotTypeName))
                         slot.BookingSlotType = slot.BookingSlotTypeName switch
                         {
@@ -3015,7 +3015,7 @@ namespace DS.WMS.Core.Op.Method
                             case 23:
                                 {
                                     ctn.CtnAll = value;
-                                    ctn.CtnCode = cacheCtnCode.FirstOrDefault(x => x.Name == value)?.Code;
+                                    ctn.CtnCode = cacheCtnCode.FirstOrDefault(x => x.CtnName == value)?.EdiCode;
                                     break;
                                 }
                             case 24:
@@ -3451,7 +3451,7 @@ namespace DS.WMS.Core.Op.Method
             //return HttpUtility.UrlEncode(fileName, Encoding.GetEncoding("UTF-8"));
             return fileName;*/
 
-            return "";
+            return DataResult<string>.Success(string.Empty);
         }
         #endregion