修改舱位管理

ds-wms-service/DS.WMS.Core/Op/Dtos/BookingContractNo/BookingContractNoManageDto.cs

@@ -88,6 +88,11 @@ namespace DS.WMS.Core.Op.Dtos
         /// 关联的航线列表
         /// </summary>
         public List<BookingContractNoManageLane>? LaneList { get; set; }
+
+        /// <summary>
+        /// 提单类型（MBL-Master单,HBL-House单）
+        /// </summary>
+        public string BLIssueType { get; set; }
     }
 
     /// <summary>

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

@@ -432,6 +432,31 @@ namespace DS.WMS.Core.Op.Dtos
         /// 船公司航次
         /// </summary>
         public string CarrierVoyno { get; set; }
+
+        /// <summary>
+        /// 提箱场站
+        /// </summary>
+        public string TakeCtnYard { get; set; }
+
+        /// <summary>
+        /// 更新标记 （ORIGINAL-原BC文件 CANCELLATION-取消 REJECTION-拒绝 1ST UPDATE-首次更新 2ND-2次  3RD-3次 4TH..多次）
+        /// </summary>
+        public string UpdateFlag { get; set; }
+
+        /// <summary>
+        /// 船公司参考号
+        /// </summary>
+        public string CarrierReferNo { get; set; }
+
+        /// <summary>
+        /// 用户参考号
+        /// </summary>
+        public string UserReferNo { get; set; }
+
+        /// <summary>
+        /// 提单类型（MBL-Master单,HBL-House单）
+        /// </summary>
+        public string BLIssueType { get; set; }
     }
 
     /// <summary>

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

@@ -915,6 +915,10 @@ namespace DS.WMS.Core.Op.Method
                     TransferPort1 = taskBCInfoDto.TransferPort1,
                     TransferPort2 = taskBCInfoDto.TransferPort2,
                     PriceCalculationDate = taskBCInfoDto.PriceCalculationDate,
+                    TakeCtnYard = taskBCInfoDto.TakeCTNYard,
+                    UpdateFlag = taskBCInfoDto.UpdateFlag,
+                    CarrierReferNo = taskBCInfoDto.CarrierReferNo,
+                    UserReferNo = taskBCInfoDto.UserReferNo,
                     CtnList = new List<BookingSlotCtnSaveInput>()
                 },
                 OpType = messageInfo.Head.RequestAction?.ToLower(),
@@ -925,6 +929,21 @@ namespace DS.WMS.Core.Op.Method
             {
                 slotModel.DataObj.WeekAt = week;
             }
+
+            var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+
+            //如果约号不为空，通过约号来对应提单类型 MBL 或者HBL
+            if (!string.IsNullOrWhiteSpace(taskBCInfoDto.ContractNo))
+            {
+                string s = taskBCInfoDto.ContractNo.Trim();
+                var contractInfo = tenantDb.Queryable<BookingContractNoManage>().First(b => b.ContractNo.Equals(s, StringComparison.OrdinalIgnoreCase));
+
+                if(contractInfo != null && !string.IsNullOrWhiteSpace(contractInfo.BLIssueType))
+                {
+                    slotModel.DataObj.BLIssueType = contractInfo.BLIssueType;
+                }
+            }
+
             if (taskBCInfoDto.CtnList.Count > 0)
             {
                 var ctnCodeList = (await _codeCtnService.GetAllList()).Data ?? new List<Code.Dtos.CodeCtnRes>();