修改任务台

Myshipping.Application/Entity/TaskManagePlat/TaskSISubmitted.cs

@@ -51,5 +51,85 @@ namespace Myshipping.Application
         /// </summary>
         public Nullable<long> BOOKING_ID { get; set; }
 
+        /// <summary>
+        /// 截单上传时间
+        /// </summary>
+        public Nullable<DateTime> SUBMITTED_DATE { get; set; }
+
+        /// <summary>
+        /// 提单份数
+        /// </summary>
+        public Nullable<int> BILLOF_NUM { get; set; }
+
+        /// <summary>
+        /// 放单方式
+        /// </summary>
+        public string RELEASE_INSTRUCTION { get; set; }
+
+        /// <summary>
+        /// 是否拆单 SPLIT-标识已拆单
+        /// </summary>
+        public string SI_SUBTYPE { get; set; }
+
+        /// <summary>
+        /// 发货人
+        /// </summary>
+        public string SHIPPER { get; set; }
+
+        /// <summary>
+        /// 收货人
+        /// </summary>
+        public string CONSIGNEE { get; set; }
+
+        /// <summary>
+        /// 通知人
+        /// </summary>
+        public string NOTIFYPARTY { get; set; }
+
+        /// <summary>
+        /// 第二通知人
+        /// </summary>
+        public string NOTIFYPARTY2 { get; set; }
+
+        /// <summary>
+        /// 订舱方
+        /// </summary>
+        public string TRANSPORT_RECEIVER { get; set; }
+
+        /// <summary>
+        /// 唛头
+        /// </summary>
+        public string MARKS { get; set; }
+
+        /// <summary>
+        /// HS代码
+        /// </summary>
+        public string HSCODE { get; set; }
+
+        /// <summary>
+        /// 货描
+        /// </summary>
+        public string DESCRIPTION { get; set; }
+
+        /// <summary>
+        /// 件数
+        /// </summary>
+        public Nullable<int> PKGS { get; set; }
+
+        /// <summary>
+        /// 包装
+        /// </summary>
+        public string KINDPKGS { get; set; }
+
+        /// <summary>
+        /// 毛重
+        /// </summary>
+        public Nullable<decimal> KGS { get; set; }
+
+        /// <summary>
+        /// 尺码
+        /// </summary>
+        public Nullable<decimal> CBM { get; set; }
+
     }
 }

Myshipping.Application/Enum/TaskFileCategoryEnum.cs

@@ -53,6 +53,11 @@ namespace Myshipping.Application
         [Description("Draft Notice")]
         DRAFT_NOTICE,
         /// <summary>
+        /// SI Submitted
+        /// </summary>
+        [Description("SI Submitted")]
+        SI_SUBMITTED,
+        /// <summary>
         /// 空
         /// </summary>
         [Description("NONE")]

Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageOrderSIFeedBackInfo.cs

@@ -40,10 +40,27 @@ namespace Myshipping.Application
         /// 通知人
         /// </summary>
         public string NotifyParty { get; set; }
+
+        /// <summary>
+        /// 第二通知人
+        /// </summary>
+        public string NotifyParty2 { get; set; }
+
+        /// <summary>
+        /// 订舱方
+        /// </summary>
+        public string TransportReceiver { get; set; }
+
         /// <summary>
         /// 唛头
         /// </summary>
         public string Marks{ get; set; }
+
+        /// <summary>
+        /// HS CODE
+        /// </summary>
+        public string HSCode { get; set; }
+
         /// <summary>
         /// 货描
         /// </summary>
@@ -154,6 +171,11 @@ namespace Myshipping.Application
         /// </summary>
         public string ReleaseInstruction { get; set; }
 
+        /// <summary>
+        /// 是否拆单 SPLIT-标识已拆单
+        /// </summary>
+        public string SISubType { get; set; }
+
         /// <summary>
         /// 箱信息
         /// </summary>

Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs

@@ -347,18 +347,20 @@ namespace Myshipping.Application
                         tenantName = UserManager.TENANT_NAME
                     };
 
-                    taskInfo.IS_PUBLIC = 1;
+                    //这里只有派车不是公共任务，其他基本都是公共任务
+                    if (info.Main.TaskType != TaskBaseTypeEnum.TRUCK_DISPATCH)
+                        taskInfo.IS_PUBLIC = 1;
                 }
                 else if (!string.IsNullOrWhiteSpace(info.Main.DJYRecvUserId) && string.IsNullOrWhiteSpace(info.Main.TaskUserId))
                 {
                     userTendInfo = GetUserTendInfoByDJYUserId(info.Main.DJYRecvUserId, info.Main.DJYRecvUserEmail);
 
-                    if(userTendInfo != null)
+                    if (userTendInfo != null)
                     {
                         taskInfo.IS_PUBLIC = 0;
                     }
                 }
-                else if(string.IsNullOrWhiteSpace(info.Main.DJYRecvUserId) && string.IsNullOrWhiteSpace(info.Main.TaskUserId) && 
+                else if (string.IsNullOrWhiteSpace(info.Main.DJYRecvUserId) && string.IsNullOrWhiteSpace(info.Main.TaskUserId) &&
                     !string.IsNullOrWhiteSpace(info.Main.TaskRecvEmail) && info.Main.TaskTenatId.HasValue && info.Main.TaskTenatId.Value > 0)
                 {
                     userTendInfo = GetUserTendInfoByEmail(info.Main.TaskTenatId.Value, info.Main.TaskRecvEmail);
@@ -435,6 +437,12 @@ namespace Myshipping.Application
 
                         fileCategory = TaskFileCategoryEnum.DRAFT.ToString();
                     }
+                    else if (TaskBaseTypeEnum.SI_FEEDBACK.ToString() == taskInfo.TASK_BASE_TYPE)
+                    {
+                        attachFileType = "sisubmittedfiles";
+
+                        fileCategory = TaskFileCategoryEnum.SI_SUBMITTED.ToString();
+                    }
 
                     var noExtensionFileName = Path.GetFileNameWithoutExtension(file.FileName);
                     var fileFullName = await FileAttachHelper.SaveFile(taskInfo.PK_ID, bytes, batchNo, noExtensionFileName,