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

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

@@ -2855,7 +2855,7 @@ namespace DS.WMS.Core.Op.Method
             {
                 Logger.Log(NLog.LogLevel.Info, $"引入失败，原因：{ex.Message}");
 
-                return DataResult<string>.Failed("引入失败，原因：{ex.me}");
+                return DataResult<string>.Failed($"引入失败，原因：{ex.Message}");
             }
             finally
             {

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

@@ -115,6 +115,9 @@ namespace DS.WMS.Core.Op.Method
                 stockObj.Id = (long)idTemp;
             }
 
+            stockObj.PortLoadId = baseList[0].PortLoadCode;
+            stockObj.PortDischargeId = baseList[0].PortDischargeCode;
+
             // 总舱位数
             stockObj.TotalOrders = baseList.Count;