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

Myshipping.Application/EDI/InttraEdiHelper.cs

@@ -317,7 +317,7 @@ namespace Myshipping.Application.EDI
                 }
 
 
-                if (headData.CARRIER != "YML")
+                if (headData.CARRIERID != "YML")
                 {
                     if (string.IsNullOrEmpty(headData.OpEName))
                     { error = error + "<br />操作的英文名不能为空"; }
@@ -371,7 +371,7 @@ namespace Myshipping.Application.EDI
                 {
                     if (headData.SIREMARK.IndexOf("PLEASE BOOK OCEAN CARRIER") > -1 || headData.SIREMARK.ToString().Trim() == "")
                     {
-                        if (headData.CARRIER == "COSU")
+                        if (headData.CARRIEREDICODE == "COSU")
                         {
                             error = error + "<br />提单号：" + headData.MBLNO + " 请在SI备注中输入:COSCO 销售的营销代码（此代码船公司会直接提供）";
                         }
@@ -776,7 +776,7 @@ namespace Myshipping.Application.EDI
                 r.WriteLine("UNH+" + bill.ORDERNO + "+IFTMBF:D:99B:UN'");
                 icount = icount + 2;
 
-                if (bill.CARRIERID == "HLCU")
+                if (bill.CARRIEREDICODE == "HLCU")
                 {
                     if (InttrEdi.filerole == "9")
                         r.WriteLine("BGM+335+" + bill.ORDERNO + "SO+9'");
@@ -866,7 +866,7 @@ namespace Myshipping.Application.EDI
                 icount = icount + 3;
 
                 //2024-04-08 这里看2.0文档显示不使用 CNT
-                if (bill.CARRIERID == "UASC")
+                if (bill.CARRIEREDICODE == "UASC")
                 {
                     if (bill.CTNLIST.Count > 0)
                     {

Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs

@@ -276,7 +276,7 @@ namespace Myshipping.Application.Service.BookingOrder
                 var ctnCodeMappingList = _cache.GetAllMappingCtn().GetAwaiter().GetResult().ToList();
 
                 if (ctnCodeMappingList.Count > 0)
-                    ctnCodeMappingList = ctnCodeMappingList.Where(x => x.CarrierCode == "MSK" && x.Module == "BOOK_OR_CLOSING").ToList();
+                    ctnCodeMappingList = ctnCodeMappingList.Where(x => x.CarrierCode == "MSK" && x.Module == "BOOK_MSK_API").ToList();
 
                 MSKAPIBookingDto bookingDto = new MSKAPIBookingDto
                 {

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -154,6 +154,7 @@ namespace Myshipping.Application
         const string CONST_MAPPING_MODULE = "BOOK_OR_CLOSING";
         const string CONST_MAPPING_MODULE_ROUTE = "BOOK_OR_CLOSING_RT";
         const string CONST_MAPPING_MODULE_VOLTA = "BOOK_CLOSING_VOLTA";
+        const string CONST_MAPPING_MODULE_INTTRA = "INTTRA_EDI";
 
         private const string PrintRecentListTypeKey = "booking_print_recent_list";
 
@@ -8774,6 +8775,16 @@ namespace Myshipping.Application
                 }
                 else if (ediRouteEnum == EDIRouteEnum.INTTRA)
                 {
+                    //这里INTTRA单独取了船公司
+                    var ediSOSICfg = _cache.GetAllMappingCarrier().GetAwaiter().GetResult()
+                        .FirstOrDefault(t => t.Module.Equals(CONST_MAPPING_MODULE_INTTRA, StringComparison.OrdinalIgnoreCase)
+                        && t.Code.Equals(ediModel.BSLIST.FirstOrDefault().CARRIERID, StringComparison.OrdinalIgnoreCase));
+
+                    if (ediSOSICfg == null || string.IsNullOrWhiteSpace(ediSOSICfg.MapCode))
+                        throw Oops.Bah($"CARRIERID={ediModel.BSLIST.FirstOrDefault().CARRIERID} INTTRA EDI订舱和截单 的船公司EDI代码未找到");
+
+                    ediModel.BSLIST.FirstOrDefault().CARRIEREDICODE = ediSOSICfg.MapCode;
+
                     #region INTTRA
                     string strCheck = InttraEdiHelper.IsCreateINTTR(ediModel);
 

Myshipping.Core/Service/DjyTenantParam/DjyTenantParamService.cs

@@ -138,7 +138,7 @@ namespace Myshipping.Core.Service
         /// 分页获取租户参数类别
         /// </summary>
         /// <returns></returns>
-        [HttpGet("/DJYTenantParam/page")]
+        [HttpPost("/DJYTenantParam/page")]
         public async Task<SqlSugarPagedList<DJYTenantParamOutput>> Page(QueryDJYTenantParamInput input)
         {
             var list = await _rep.AsQueryable()
@@ -277,7 +277,7 @@ namespace Myshipping.Core.Service
         /// 分页获取参数值
         /// </summary>
         /// <returns></returns>
-        [HttpGet("/DJYTenantParam/PageParamValue")]
+        [HttpPost("/DJYTenantParam/PageParamValue")]
         public async Task<SqlSugarPagedList<DjyTenantParamValueListOutput>> PageParamValue(QueryTenantParamValueInput input)
         {
             var list = await _valuerep.AsQueryable().Filter(null, true)

ServiceProjectSyncWin/Entities/TaskBCEntity.cs

@@ -57,6 +57,11 @@ namespace ServiceProjectSyncWin.Entities
         /// </summary>
         public Nullable<DateTime> CY_CUTOFF_TIME { get; set; }
 
+        /// <summary>
+        /// 客户样单截止日期
+        /// </summary>
+        public Nullable<DateTime> CUSTOM_SI_CUT_DATE { get; set; }
+
         public string TASK_ID { get; set; }
 
         public bool IsDeleted { get; set; }

ServiceProjectSyncWin/Program.cs

@@ -580,9 +580,27 @@ public class SyncHisRecord: ISyncHisRecord,ITransient
                             task.CLOSING_DATE = null;
                         }
 
+                        //CLOSING_DATE
+                        if (BCReadInfo.CustomSICutDate.HasValue)
+                        {
+                            if (!task.CUSTOM_SI_CUT_DATE.HasValue || task.CUSTOM_SI_CUT_DATE.Value != BCReadInfo.CustomSICutDate.Value)
+                            {
+                                msgBuilder.Append($"CUSTOM_SI_CUT_DATE org={task.CUSTOM_SI_CUT_DATE} tar={BCReadInfo.CustomSICutDate.Value}##");
+
+                                task.CUSTOM_SI_CUT_DATE = BCReadInfo.CustomSICutDate.Value;
+                            }
+                        }
+                        else
+                        {
+                            msgBuilder.Append($"CUSTOM_SI_CUT_DATE org={task.CUSTOM_SI_CUT_DATE} tar=null##");
+
+                            task.CUSTOM_SI_CUT_DATE = null;
+                        }
+
                         _db.Updateable<TaskBCEntity>(task).UpdateColumns(it => new
                         {
                             it.SI_CUT_DATE,
+                            it.CUSTOM_SI_CUT_DATE,
                             it.VGM_CUTOFF_TIME,
                             it.MANIFEST_CUT_DATE,
                             it.CY_CUTOFF_TIME,
@@ -718,9 +736,27 @@ public class SyncHisRecord: ISyncHisRecord,ITransient
                             task.CLOSING_DATE = null;
                         }
 
+                        //CLOSING_DATE
+                        if (BCReadInfo.CustomSICutDate.HasValue)
+                        {
+                            if (!task.CUSTOM_SI_CUT_DATE.HasValue || task.CUSTOM_SI_CUT_DATE.Value != BCReadInfo.CustomSICutDate.Value)
+                            {
+                                msgBuilder.Append($"CUSTOM_SI_CUT_DATE org={task.CUSTOM_SI_CUT_DATE} tar={BCReadInfo.CustomSICutDate.Value}##");
+
+                                task.CUSTOM_SI_CUT_DATE = BCReadInfo.CustomSICutDate.Value;
+                            }
+                        }
+                        else
+                        {
+                            msgBuilder.Append($"CUSTOM_SI_CUT_DATE org={task.CUSTOM_SI_CUT_DATE} tar=null##");
+
+                            task.CUSTOM_SI_CUT_DATE = null;
+                        }
+
                         _db.Updateable<TaskBCEntity>(task).UpdateColumns(it => new
                         {
                             it.SI_CUT_DATE,
+                            it.CUSTOM_SI_CUT_DATE,
                             it.VGM_CUTOFF_TIME,
                             it.MANIFEST_CUT_DATE,
                             it.CY_CUTOFF_TIME,
@@ -1376,6 +1412,11 @@ public class TaskBCInfoReadDto
     /// 订舱确认时间
     /// </summary>
     public Nullable<DateTime> BookingConfirmDate { get; set; }
+
+    /// <summary>
+    /// 客户样单截止日期
+    /// </summary>
+    public Nullable<DateTime> CustomSICutDate { get; set; }
 }
 
 /// <summary>