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

ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs

@@ -1479,7 +1479,7 @@ public static class MultiLanguageConst
     #endregion
 
     #region 关联任务
-    [Description("此类型的任务已存在")]
+    [Description("此任务已存在，请勿重复提交")]
     public const string TaskExists = "Task_Exists";
     [Description("此任务已完成")]
     public const string TaskCompleted = "Task_Completed";

ds-wms-service/DS.WMS.Core/DS.WMS.Core.csproj

@@ -29,7 +29,6 @@
       <Folder Include="TaskPlat\Interface\TransplanHasChange\" />
       <Folder Include="TaskPlat\Interface\POLContainerNotPickUp\" />
       <Folder Include="TaskPlat\Interface\Draft\" />
-      <Folder Include="TaskPlat\Interface\ShippingOrderCompare\" />
       <Folder Include="TaskPlat\Interface\PODDischargeGateoutFull\" />
       <Folder Include="TaskPlat\Interface\RollingNomination\" />
     </ItemGroup>

ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/TaskRequest.cs

@@ -20,12 +20,12 @@ namespace DS.WMS.Core.Op.Dtos.TaskInteraction
         /// </summary>
         public BusinessType BusinessType { get; set; }
 
-        TaskBaseTypeEnum _defaultTaskType = TaskBaseTypeEnum.NOT_SPECIFIED;
+        static readonly TaskBaseTypeEnum _defaultTaskType = TaskBaseTypeEnum.NOT_SPECIFIED;
         /// <summary>
         /// 任务类型
         /// </summary>
         [IgnoreDataMember]
-        public TaskBaseTypeEnum TaskType => string.IsNullOrEmpty(TaskTypeName) ?  _defaultTaskType : Enum.Parse<TaskBaseTypeEnum>(TaskTypeName);
+        public TaskBaseTypeEnum TaskType => string.IsNullOrEmpty(TaskTypeName) ? _defaultTaskType : Enum.Parse<TaskBaseTypeEnum>(TaskTypeName);
 
         /// <summary>
         /// 任务类型名称

ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs

@@ -1432,4 +1432,34 @@ public class SeaExport : BaseOrgModel<long>
     [SugarColumn(ColumnDescription = "运输条款代码", IsNullable = true, Length = 30)]
     public string ServiceCode { get; set; }
 
+    /// <summary>
+    /// 最后下货纸比对状态 NO_DIFF-无异常;DIFF-有差异;NO_YARD-无场站数据;EXPT-异常
+    /// </summary>
+    [SugarColumn(ColumnDescription = "最后下货纸比对状态", IsNullable = true, Length = 20)]
+    public string LstShipOrderCompareRlt { get; set; }
+
+    /// <summary>
+    /// 最后下货纸比对时间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "最后下货纸比对时间", IsNullable = true)]
+    public Nullable<DateTime> LstShipOrderCompareDate { get; set; }
+
+    /// <summary>
+    /// 最后下货纸比对批次号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "最后下货纸比对批次号", IsNullable = true, Length = 64)]
+    public string LstShipOrderCompareId { get; set; }
+
+    /// <summary>
+    /// 最后下货纸比对状态 NO_DIFF-无异常;DIFF-有差异;NO_YARD-无场站数据;EXPT-异常
+    /// </summary>
+    [SugarColumn(ColumnDescription = "最后下货纸比对状态", IsNullable = true, Length = 30)]
+    public string LstShipOrderCompareRltName { get; set; }
+
+    /// <summary>
+    /// 最后下货纸比对方式 MANUAL-手动 AUTO-自动
+    /// </summary>
+    [SugarColumn(ColumnDescription = "最后下货纸比对方式 MANUAL-手动 AUTO-自动", IsNullable = true, Length = 20)]
+    public string LstShipOrderCompareMode { get; set; }
+
 }

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

@@ -1,7 +1,9 @@
 using DS.Module.Core;
 using DS.Module.Core.Data;
+using DS.Module.SqlSugar;
 using DS.WMS.Core.Info.Dtos;
 using DS.WMS.Core.Op.Dtos;
+using DS.WMS.Core.Op.Entity;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -36,7 +38,12 @@ namespace DS.WMS.Core.Op.Interface
         /// <param name="id"></param>
         /// <returns></returns>
         DataResult<OpBusinessYardRes> GetOpBusinessYardInfo(string id);
-         
+        /// <summary>
+        /// 获取详情按业务id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public DataResult<OpBusinessYardRes> GetBusinessYardByKeyId(string id);
         /// <summary>
         /// 批量删除
         /// </summary>

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

@@ -83,7 +83,15 @@ namespace DS.WMS.Core.Op.Method
                 .First();
             return DataResult<OpBusinessYardRes>.Success(data, MultiLanguageConst.DataQuerySuccess);
         }
-
+        public DataResult<OpBusinessYardRes> GetBusinessYardByKeyId(string id)
+        {
+            var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+            var data = tenantDb.Queryable<BusinessYard>()
+                .Where(a => a.BusinessId == long.Parse(id))
+                .Select<OpBusinessYardRes>()
+                .First();
+            return DataResult<OpBusinessYardRes>.Success(data, MultiLanguageConst.DataQuerySuccess);
+        }
         public DataResult BatchDelOpBusinessYard(IdModel req)
         {
             var tenantDb = saasService.GetBizDbScopeById(user.TenantId);

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

@@ -148,7 +148,7 @@ namespace DS.WMS.Core.Op.Method
             var rtnObj = JObject.Parse(res);
             if (rtnObj.GetIntValue("code") != 200)
             {
-                return await Task.FromResult(DataResult<string>.Failed("$\"获取场站数据失败：{rtnObj.GetStringValue(\"msg\")}\"!"));
+                return await Task.FromResult(DataResult<string>.Failed("获取场站数据失败:"+rtnObj.GetStringValue("msg")));
             }
             else
             {

ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/TaskService.cs

@@ -85,9 +85,6 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
         /// <returns></returns>
         protected virtual async Task<bool> EnsureModuleAuthorized()
         {
-            //if (!await Db.Queryable<SysPermissionTenant>().AnyAsync(x => x.PermissionId == PERMISSION_ID))
-            //    return false;
-
             long tid = long.Parse(User.TenantId);
             var authStr = await Db.Queryable<SysTenantPermissionAuth>().Where(x => x.PermissionId == PERMISSION_ID && x.TenantId == tid &&
                 SqlFunc.Subqueryable<SysPermissionTenant>().Where(spt => spt.PermissionId == x.PermissionId).Any())
@@ -242,7 +239,10 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
 
             if (request.RecvUserIdList == null || request.RecvUserIdList.Length == 0)
             {
-                info.Main.RecvUserInfoList = [new RecvUserInfo { RecvUserId = long.Parse(User.UserId), RecvUserName = User.UserName }];
+                //默认接收人=当前订单的操作员
+                var opr = await TenantDb.Queryable<SeaExport>().Where(x => x.Id == request.BusinessId)
+                    .Select(x => new { x.OperatorId, x.OperatorName }).FirstAsync();
+                info.Main.RecvUserInfoList = [new RecvUserInfo { RecvUserId = opr.OperatorId, RecvUserName = opr.OperatorName }];
             }
             else
             {

ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/Mapper/AddTaskPlatMapsterSetup.cs

@@ -392,6 +392,47 @@ namespace DS.WMS.Core.TaskPlat.Dtos.Mapper
                 //.Map(dest => dest.Remark, src => src.REMARK);
             }
 
+            {
+                TypeAdapterConfig<SeaExport, TaskMessageMain>.NewConfig().TwoWays()
+                .Map(dest => dest.BookingNo, src => src.BookingNo)
+                //.Map(dest => dest.TenantId, src => src.TenantId)
+                //.Map(dest => dest.TenantName, src => src.TenantName)
+                //.Map(dest => dest.YardCode, src => src.YARDID)
+                .Map(dest => dest.YardCName, src => src.Yard)
+                .Map(dest => dest.VesselName, src => src.Vessel)
+                .Map(dest => dest.VoyNo, src => src.Voyno)
+                .Map(dest => dest.MasterBlNo, src => src.MBLNO)
+                .Map(dest => dest.HouseBlNo, src => src.HBLNO)
+                //.Map(dest => dest.PortLoadId, src => src.PORTLOADID)
+                .Map(dest => dest.PortLoad, src => src.LoadPort)
+                //.Map(dest => dest.PortDischargeId, src => src.dich)
+                .Map(dest => dest.PortDischarge, src => src.DischargePort)
+                .Map(dest => dest.TransportId, src => src.TransPortCode)
+                .Map(dest => dest.Transport, src => src.TransPort)
+                //.Map(dest => dest.PlaceDeliveryId, src => src.DeliveryPlaceId)
+                .Map(dest => dest.PlaceDelivery, src => src.DeliveryPlace)
+                //.Map(dest => dest.DestinationId, src => src.DESTINATIONID)
+                .Map(dest => dest.Destination, src => src.Destination)
+                .Map(dest => dest.PKGs, src => src.PKGS)
+                .Map(dest => dest.KGs, src => src.KGS)
+                .Map(dest => dest.CBM, src => src.CBM)
+                .Map(dest => dest.GoodsDescription, src => src.Destination);
+                //.Map(dest => dest.CarrierCode, src => src.carr);
+            }
+
+            {
+                TypeAdapterConfig<OpCtn, TaskMessageCtnInfo>.NewConfig().TwoWays()
+                .Map(dest => dest.ContaType, src => src.CtnCode)
+                .Map(dest => dest.ContaTypeName, src => src.CtnAll)
+                .Map(dest => dest.ContaNo, src => src.CntrNo)
+                .Map(dest => dest.SealNo, src => src.SealNo)
+                .Map(dest => dest.KindPKGs, src => src.KindPkgs)
+                .Map(dest => dest.TareWeight, src => src.TareWeight)
+                .Map(dest => dest.PKGs, src => src.PKGS)
+                .Map(dest => dest.KGs, src => src.KGS)
+                .Map(dest => dest.CBM, src => src.CBM)
+                .Map(dest => dest.CtnNum, src => src.CtnNum);
+            }
         }
     }
 }

ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/ShippingOrderCompareCallBackInfo.cs

@@ -0,0 +1,50 @@
+using DS.WMS.Core.Op.Dtos;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DS.WMS.Core.TaskPlat.Dtos
+{
+    /// <summary>
+    /// 下货纸比对回写
+    /// </summary>
+    public class ShippingOrderCompareCallBackInfo
+    {
+        /// <summary>
+        /// 请求主键
+        /// </summary>
+        public string reqBusiId { get; set; }
+
+        /// <summary>
+        /// 比对ID
+        /// </summary>
+        public string compareId { get; set; }
+
+        /// <summary>
+        /// 下货纸比对方式  MANUAL-手动 AUTO-自动
+        /// </summary>
+        public string compareMode { get; set; } = "AUTO";
+
+        /// <summary>
+        /// 比对结果代码
+        /// </summary>
+        public string compareRltCode { get; set; }
+
+        /// <summary>
+        /// 比对结果名称
+        /// </summary>
+        public string compareRltName { get; set; }
+
+        /// <summary>
+        /// 比对日期
+        /// </summary>
+        public DateTime compareDate { get; set; }
+
+        /// <summary>
+        /// 比对详情
+        /// </summary>
+        public List<CompareResultDetailInfo> compareDetailList { get; set; }
+    }
+}

ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/TaskMessageInfoDto.cs

@@ -0,0 +1,359 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DS.WMS.Core.TaskPlat.Dtos
+{
+    public class TaskMessageInfoDto
+    {
+        /// <summary>
+        /// 表头
+        /// </summary>
+        public TaskMessageHead Head { get; set; }
+
+        /// <summary>
+        /// 表体
+        /// </summary>
+        public TaskMessageMain Main { get; set; }
+    }
+
+    /// <summary>
+    /// 报文表体
+    /// </summary>
+    public class TaskMessageMain
+    {
+        /// <summary>
+        /// 业务惟一主键
+        /// </summary>
+        public string BusiPKId { get; set; }
+
+        /// <summary>
+        /// 比对ID
+        /// </summary>
+        public string TaskCompareId { get; set; }
+
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string UserId { get; set; }
+
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 用户邮件
+        /// </summary>
+        public string UserEmail { get; set; }
+
+        /// <summary>
+        /// 租户ID
+        /// </summary>
+        public string TenantId { get; set; }
+
+        /// <summary>
+        /// 租户名称
+        /// </summary>
+        public string TenantName { get; set; }
+
+        /// <summary>
+        /// 场站代码
+        /// </summary>
+        public string YardCode { get; set; }
+
+        /// <summary>
+        /// 场站中文名称
+        /// </summary>
+        public string YardCName { get; set; }
+
+        /// <summary>
+        /// 船名英文名
+        /// </summary>
+        public string VesselName { get; set; }
+
+        /// <summary>
+        /// 船名中文名
+        /// </summary>
+        public string VesselCName { get; set; }
+
+        /// <summary>
+        /// 航次号
+        /// </summary>
+        public string VoyNo { get; set; }
+
+        /// <summary>
+        /// 主提单号
+        /// </summary>
+        public string MasterBlNo { get; set; }
+
+        /// <summary>
+        /// 分提单号
+        /// </summary>
+        public string HouseBlNo { get; set; }
+
+        /// <summary>
+        /// 订舱编号
+        /// </summary>
+        public string BookingNo { get; set; }
+
+        /// <summary>
+        /// 起运港代码
+        /// </summary>
+        public string PortLoadId { get; set; }
+
+        /// <summary>
+        /// 起运港
+        /// </summary>
+        public string PortLoad { get; set; }
+
+        /// <summary>
+        /// 卸货港代码
+        /// </summary>
+        public string PortDischargeId { get; set; }
+
+        /// <summary>
+        /// 卸货港
+        /// </summary>
+        public string PortDischarge { get; set; }
+
+
+        /// <summary>
+        /// 中转港代码
+        /// </summary>
+        public string TransportId { get; set; }
+
+        /// <summary>
+        /// 中转港
+        /// </summary>
+        public string Transport { get; set; }
+
+        /// <summary>
+        /// 交货地代码
+        /// </summary>
+        public string PlaceDeliveryId { get; set; }
+
+        /// <summary>
+        /// 交货地
+        /// </summary>
+        public string PlaceDelivery { get; set; }
+
+        /// <summary>
+        /// 目的港代码
+        /// </summary>
+        public string DestinationId { get; set; }
+
+        /// <summary>
+        /// 目的港
+        /// </summary>
+        public string Destination { get; set; }
+
+        /// <summary>
+        /// 件数
+        /// </summary>
+        public Int32 PKGs { get; set; }
+
+        /// <summary>
+        /// 毛重
+        /// </summary>
+        public Nullable<decimal> KGs { get; set; }
+
+        /// <summary>
+        /// 尺码
+        /// </summary>
+        public Nullable<decimal> CBM { get; set; }
+
+        /// <summary>
+        /// 主等级（危险品）
+        /// </summary>
+        public string DClass { get; set; }
+
+        /// <summary>
+        /// 国际危险品编号（危险品）
+        /// </summary>
+        public string DUNNo { get; set; }
+
+        /// <summary>
+        /// 副等级（危险品）
+        /// </summary>
+        public string FuDClass { get; set; }
+
+        /// <summary>
+        /// 副国际危险品编号（危险品）
+        /// </summary>
+        public string FuDUNNo { get; set; }
+
+        /// <summary>
+        /// 海污（危险品）
+        /// </summary>
+        public string HaiWu { get; set; }
+
+        /// <summary>
+        /// 温度（冻柜）
+        /// </summary>
+        public string TempSet { get; set; }
+
+        /// <summary>
+        /// 通风（冻柜）
+        /// </summary>
+        public string Reeferf { get; set; }
+
+        /// <summary>
+        /// 湿度（冻柜）
+        /// </summary>
+        public string Humidity { get; set; }
+
+        /// <summary>
+        /// 货描
+        /// </summary>
+        public string GoodsDescription { get; set; }
+
+        /// <summary>
+        /// 船公司代码
+        /// </summary>
+        public string CarrierCode { get; set; }
+
+        /// <summary>
+        /// 箱信息列表
+        /// </summary>
+        public List<TaskMessageCtnInfo> ContaList { get; set; }
+    }
+
+    /// <summary>
+    /// 箱信息
+    /// </summary>
+    public class TaskMessageCtnInfo
+    {
+        /// <summary>
+        /// 集装箱箱型代码
+        /// </summary>
+        public string ContaType { get; set; }
+
+        /// <summary>
+        /// 集装箱箱型名称
+        /// </summary>
+        public string ContaTypeName { get; set; }
+
+        /// <summary>
+        /// 集装箱箱号
+        /// </summary>
+        public string ContaNo { get; set; }
+
+        /// <summary>
+        /// 铅封号
+        /// </summary>
+        public string SealNo { get; set; }
+
+        /// <summary>
+        /// 包装
+        /// </summary>
+        public string KindPKGs { get; set; }
+
+        /// <summary>
+        /// 皮重
+        /// </summary>
+        public string TareWeight { get; set; }
+
+        /// <summary>
+        /// 件数
+        /// </summary>
+        public Int32 PKGs { get; set; }
+
+        /// <summary>
+        /// 毛重
+        /// </summary>
+        public Nullable<decimal> KGs { get; set; }
+
+        /// <summary>
+        /// 尺码
+        /// </summary>
+        public Nullable<decimal> CBM { get; set; }
+
+        /// <summary>
+        /// 箱量
+        /// </summary>
+        public int CtnNum { get; set; }
+    }
+
+    /// <summary>
+    /// 报文表头
+    /// </summary>
+    public class TaskMessageHead : WebAPIHeadBase
+    {
+
+    }
+
+    public class WebAPIHeadBase
+    {
+        /// <summary>
+        /// 报文惟一主键
+        /// </summary>
+        /// <example>08dab66c-96a1-4f90-8606-2626e06202ad</example>
+        [Required(ErrorMessage = "必填")]
+        public string GID { get; set; }
+
+        /// <summary>
+        /// 报文类型 BUSI_RULE-业务规则校验
+        /// </summary>
+        /// <example>BUSI_RULE</example>
+        [Required(ErrorMessage = "必填")]
+        public string MessageType { get; set; }
+
+        /// <summary>
+        /// 发送方代码
+        /// </summary>
+        /// <example>CUSTOMER1</example>
+        [Required(ErrorMessage = "必填")]
+        public string SenderId { get; set; }
+
+        /// <summary>
+        /// 发送方名称
+        /// </summary>
+        /// <example>企业A</example>
+        [Required(ErrorMessage = "必填")]
+        public string SenderName { get; set; }
+
+        /// <summary>
+        /// 接收方代码
+        /// </summary>
+        /// <example>RulesEngine</example>
+        [Required(ErrorMessage = "必填")]
+        public string ReceiverId { get; set; }
+
+        /// <summary>
+        /// 接收方名称
+        /// </summary>
+        /// <example>大简云规则引擎</example>
+        [Required(ErrorMessage = "必填")]
+        public string ReceiverName { get; set; }
+
+        /// <summary>
+        /// 请求方登录TOKEN（可以是真实的登录人TOKEN或者是服务模拟登录人TOKEN）
+        /// </summary>
+        /// <example>eyJhbGciOiJSUzI1NiIsImtpZCI6IkQ1RTkxMDI5OUU0RURFNUZEM0EwNTJBMEFDRDUzMUQzIiwidHlwIjoiYXQrand0In0</example>
+        public string Token { get; set; }
+
+        /// <summary>
+        /// 版本号 默认1.0
+        /// </summary>
+        /// <example>1.0</example>
+        [Required(ErrorMessage = "必填")]
+        public string Version { get; set; } = "1.0";
+
+        /// <summary>
+        /// 请求时间
+        /// </summary>
+        /// <example>2022-10-10 10:00:00</example>
+        public string RequestDate { get; set; }
+
+        /// <summary>
+        /// 请求操作类型
+        /// </summary>
+        /// <example>Add</example>
+        [Required(ErrorMessage = "必填")]
+        public string RequestAction { get; set; } = "Add";
+    }
+}

ds-wms-service/DS.WMS.Core/TaskPlat/Entity/DraftCompareFeedBackRecord.cs

@@ -0,0 +1,72 @@
+using DS.Module.Core.Data;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DS.WMS.Core.TaskPlat.Entity
+{
+    /// <summary>
+    /// 格式单比对反馈记录表
+    /// </summary>
+    [SugarTable("draft_compare_feedback_record", "格式单比对反馈记录表")]
+    public class DraftCompareFeedBackRecord : BaseModelV2<long>
+    {
+        /// <summary>
+        /// 订舱主键,关联订舱主表ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "订舱主键,关联订舱主表ID", IsNullable = false)]
+        public long BOOKING_ID { get; set; }
+
+        /// <summary>
+        /// 主提单号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "主提单号", IsNullable = false)]
+        public string MBLNO { get; set; }
+
+        /// <summary>
+        /// 比对主键
+        /// </summary>
+        [SugarColumn(ColumnDescription = "比对主键", IsNullable = false)]
+        public string TASK_COMPARE_ID { get; set; }
+
+        /// <summary>
+        /// 是否识别问题 1-时 0-否
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否识别问题 1-时 0-否", IsNullable = false)]
+        public bool IS_OCR_ERROR { get; set; }
+
+        /// <summary>
+        /// 是否订舱录入问题 1-是 0-否
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否订舱录入问题 1-是 0-否", IsNullable = false)]
+        public bool IS_EDIT_ERROR { get; set; }
+
+        /// <summary>
+        /// 是否代理录入问题 1-是 0-否
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否代理录入问题 1-是 0-否", IsNullable = false)]
+        public bool IS_AGENT_ERROR { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [SugarColumn(ColumnDescription = "备注", IsNullable = false)]
+        public string NOTES { get; set; }
+
+        /// <summary>
+        /// 比对类型 DRAFT-格式单比对；SHIPORDER-下货纸比对
+        /// </summary>
+        [SugarColumn(ColumnDescription = "比对类型", IsNullable = false)]
+        public string COMPARE_TYPE { get; set; }
+
+        /// <summary>
+        /// 比对完成时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "比对完成时间", IsNullable = false)]
+        public Nullable<DateTime> COMPARE_TIME { get; set; }
+    }
+}

ds-wms-service/DS.WMS.Core/TaskPlat/Interface/ShippingOrderCompare/ITaskShippingOrderCompareService.cs

@@ -0,0 +1,53 @@
+using DS.WMS.Core.Op.Dtos;
+using DS.WMS.Core.TaskPlat.Dtos;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DS.WMS.Core.TaskPlat.Interface
+{
+    /// <summary>
+    /// 下货纸比对
+    /// </summary>
+    public interface ITaskShippingOrderCompareService
+    {
+        /// <summary>
+        /// 执行下货纸比对
+        /// </summary>
+        /// <param name="bookingId">订舱主键</param>
+        /// <returns>返回回执</returns>
+        Task<TaskManageExcuteResultDto> ExcuteShippingOrderCompareAsync(string bookingId);
+
+
+        /// <summary>
+        /// 批量执行下货纸比对
+        /// </summary>
+        /// <param name="bookingIds">订舱主键组</param>
+        /// <returns>返回回执</returns>
+        Task<TaskManageExcuteResultDto> ExcuteShippingOrderCompareBatchAsync(string[] bookingIds);
+
+        /// <summary>
+        /// 下货纸自动比对回写状态
+        /// </summary>
+        /// <param name="model">比对回写详情</param>
+        /// <returns>返回回执</returns>
+        Task<TaskManageExcuteResultDto> AutoTaskShippingOrderCompareCallBackAsync(ShippingOrderCompareCallBackInfo model);
+
+        /// <summary>
+        /// 自动执行下货纸比对
+        /// </summary>
+        /// <param name="bookingId">订舱主键</param>
+        /// <returns>返回回执</returns>
+        Task<TaskManageExcuteResultDto> ExcuteAutoShippingOrderCompareAsync(string bookingId);
+
+
+        /// <summary>
+        /// 获取下货纸比对结果
+        /// </summary>
+        /// <param name="bookingId">订舱主键</param>
+        /// <returns>返回回执</returns>
+        Task<TaskManageExcuteResultDto> GetShippingOrderCompareResult(long bookingId);
+    }
+}

ds-wms-service/DS.WMS.Core/TaskPlat/Method/ShippingOrderCompare/TaskShippingOrderCompareService.cs

@@ -0,0 +1,724 @@
+using DS.Module.Core;
+using DS.Module.Core.Attributes;
+using DS.Module.Core.Helpers;
+using DS.Module.DjyServiceStatus;
+using DS.Module.SqlSugar;
+using DS.Module.UserModule;
+using DS.WMS.Core.Invoice.Dtos;
+using DS.WMS.Core.Op.Dtos;
+using DS.WMS.Core.Op.Entity;
+using DS.WMS.Core.TaskPlat.Dtos;
+using DS.WMS.Core.TaskPlat.Entity;
+using DS.WMS.Core.TaskPlat.Interface;
+using Mapster;
+using Masuit.Tools.Systems;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+using NLog;
+using NPOI.SS.Formula.Functions;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+
+namespace DS.WMS.Core.TaskPlat.Method
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class TaskShippingOrderCompareService : ITaskShippingOrderCompareService
+    {
+        private readonly IServiceProvider _serviceProvider;
+        private readonly ISqlSugarClient db;
+        private readonly IUser user;
+        private readonly ISaasDbService saasService;
+        private readonly IDjyServiceStatusService _djyServiceStatusService;
+
+        private readonly string shippingOrderCompareUrl;
+        private readonly string shippingOrderCompareResultUrl;
+
+        private static readonly NLog.Logger Logger = LogManager.GetCurrentClassLogger();
+
+        public TaskShippingOrderCompareService(IServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider;
+            db = _serviceProvider.GetRequiredService<ISqlSugarClient>();
+            user = _serviceProvider.GetRequiredService<IUser>();
+            saasService = _serviceProvider.GetRequiredService<ISaasDbService>();
+            _djyServiceStatusService = _serviceProvider.GetRequiredService<IDjyServiceStatusService>();
+
+            shippingOrderCompareUrl = AppSetting.app(new string[] { "ShippingOrderCompare", "Url" });
+            shippingOrderCompareResultUrl = AppSetting.app(new string[] { "ShippingOrderCompare", "ResultUrl" });
+        }
+
+        /// <summary>
+        /// 执行下货纸比对
+        /// </summary>
+        /// <param name="bookingId">订舱主键</param>
+        /// <returns>返回回执</returns>
+        public async Task<TaskManageExcuteResultDto> ExcuteShippingOrderCompareAsync(string bookingId)
+        {
+            string batchNo = GuidHelper.GetSnowflakeId();
+
+            Logger.Log(NLog.LogLevel.Info, "批次={no}获取订舱数据请求规则 {id}", batchNo, bookingId);
+
+            /*
+            处理逻辑
+            1、台账触发单票下货纸比对
+            2、调取订舱的详情。
+            3、对应请求报文。
+            4、请求比对接口。
+            5、返回回执。
+            */
+
+            return await InnerExcuteShippingOrderCompareAsync(bookingId);
+        }
+
+        #region 执行下货纸比对
+        /// <summary>
+        /// 执行下货纸比对
+        /// </summary>
+        /// <param name="bookingId">订舱主键</param>
+        /// <param name="LstShipOrderCompareMode">比对模式（MANUAL-手工 AUTO-自动）</param>
+        /// <returns>返回回执</returns>
+        private async Task<TaskManageExcuteResultDto> InnerExcuteShippingOrderCompareAsync(string bookingId,
+            string LstShipOrderCompareMode = "MANUAL")
+        {
+            string batchNo = GuidHelper.GetSnowflakeId();
+
+            Logger.Log(NLog.LogLevel.Info, "批次={no}获取订舱数据请求规则 {id}", batchNo, bookingId);
+
+            /*
+            处理逻辑
+            1、台账触发单票下货纸比对
+            2、调取订舱的详情。
+            3、对应请求报文。
+            4、请求比对接口。
+            5、返回回执。
+            */
+
+            TaskManageExcuteResultDto result = new TaskManageExcuteResultDto();
+
+            var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+
+            try
+            {
+                DateTime nowDate = DateTime.Now;
+
+                long id = long.Parse(bookingId);
+
+                var model = tenantDb.Queryable<SeaExport>()
+                    .First(a => a.Id == id);
+
+                if (model == null)
+                    throw new Exception($"订舱主键{bookingId}无法获取业务信息");
+
+                Logger.Log(NLog.LogLevel.Info, "批次={no}获取订舱数据完成", batchNo);
+
+
+                //附主信息
+                var mainInfo = model.Adapt<TaskMessageMain>();
+
+                mainInfo.BusiPKId = model.Id.ToString();
+                mainInfo.UserId = user.UserId;
+                mainInfo.UserName = user.UserName;
+                //mainInfo.UserEmail = user.;
+
+                var contaList = await tenantDb.Queryable<OpCtn>()
+                    .Where(x => long.Parse(x.BSNO) == model.Id).ToListAsync();
+
+                Logger.Log(NLog.LogLevel.Info, "批次={no} 提取箱完成 数量={total}", batchNo, contaList.Count);
+
+                if (contaList.Count > 0)
+                {
+                    mainInfo.ContaList = contaList.Adapt<List<TaskMessageCtnInfo>>();
+                }
+
+                var msgModel = GetMessageInfo(batchNo, mainInfo);
+
+                Logger.Log(NLog.LogLevel.Info, "批次={no} 对应请求报文完成 msg={msg}", batchNo, JsonConvert.SerializeObject(msgModel));
+
+                DateTime bDate = DateTime.Now;
+
+                var compareResult = await ExcuteCompare(msgModel);
+
+                DateTime eDate = DateTime.Now;
+                TimeSpan ts = eDate.Subtract(bDate);
+                var timeDiff = ts.TotalMilliseconds;
+
+                Logger.Log(NLog.LogLevel.Info, "批次={no} 请求完成,耗时：{timeDiff}ms. 结果{msg}", batchNo, timeDiff, compareResult.succ ? "成功" : "失败");
+
+                if (compareResult == null)
+                    throw new Exception($"订舱主键{bookingId}请求下货纸比对失败，返回为空");
+
+
+                var orderInfo = tenantDb.Queryable<SeaExport>()
+                    .First(x => x.Id == id);
+
+                if (orderInfo != null)
+                {
+                    var oldOrderInfo = orderInfo.Adapt<SeaExport>();
+                    orderInfo.LstShipOrderCompareDate = bDate;
+
+                    if (compareResult.succ)
+                    {
+                        orderInfo.LstShipOrderCompareMode = LstShipOrderCompareMode;
+
+                        /*
+                         isComplete标记当票是否满足截至要求
+                         1、场站返回的记录里所有箱都有了返场日期。
+                         2、或者当票的实际开船日期或者预计开船日期已到也可以截至。
+                         */
+                        bool isComplete = false;
+                        bool isBefore = false;
+
+                        //需要细分状态，返场前和返场后
+                        if (compareResult.yardStatInfo != null)
+                        {
+                            var yardStatInfo = compareResult.yardStatInfo as YardStatInfo;
+
+                            //如果场站集装箱都有了返场时间，即认为下货纸自动任务结束
+                            if (yardStatInfo.LstReturnYardDate.HasValue && yardStatInfo.ContaNum >= 1 &&
+                            yardStatInfo.ContaNum == yardStatInfo.ExistsReturnYardDateCtnNum)
+                            {
+                                isComplete = true;
+                            }
+
+                            //判断 有箱号的条数跟总计箱数量不一致 认为是反场前比对
+                            if ((yardStatInfo.ExistsCtnNo < yardStatInfo.ContaNum))
+                                isBefore = true;
+                        }
+
+                        DateTime etd = DateTime.MinValue;
+                        if (model.ATD.HasValue)
+                        {
+                            etd = model.ATD.Value;
+                        }
+                        else if (model.ETD.HasValue)
+                        {
+                            etd = model.ETD.Value;
+                        }
+
+                        if (etd != DateTime.MinValue && etd <= DateTime.Now)
+                            isComplete = true;
+
+                        if (compareResult.extra.IsExistsDiff)
+                        {
+                            if (isComplete)
+                            {
+                                orderInfo.LstShipOrderCompareRlt = "DIFF";
+                                orderInfo.LstShipOrderCompareRltName = "有差异";
+                            }
+                            else
+                            {
+                                bool isBeforeEqual = false;
+                                var checkList = compareResult.extra.ShowDetailList.Where(b =>
+                                     (b.PCode == null || b.PCode == "") && b.IsDisplay &&
+                                     (b.FieldCode.ToUpper() != "PKGS" && b.FieldCode.ToUpper() != "KGS" && b.FieldCode.ToUpper() != "CBM"))
+                                    .ToList();
+
+                                if (!checkList.Any(t => t.IsDiff))
+                                {
+                                    isBeforeEqual = true;
+                                }
+
+                                if (isBefore)
+                                {
+                                    if (isBeforeEqual)
+                                    {
+                                        orderInfo.LstShipOrderCompareRlt = "BEFORE_EQUAL";
+                                        orderInfo.LstShipOrderCompareRltName = "返场前比对正常";
+                                    }
+                                    else
+                                    {
+                                        orderInfo.LstShipOrderCompareRlt = "BEFORE_DIFF";
+                                        orderInfo.LstShipOrderCompareRltName = "返场前比对有差异";
+                                    }
+                                }
+                                else
+                                {
+                                    orderInfo.LstShipOrderCompareRlt = "DIFF_U";
+                                    orderInfo.LstShipOrderCompareRltName = "有差异未结束";
+                                }
+                            }
+                        }
+                        else
+                        {
+                            if (isComplete)
+                            {
+                                orderInfo.LstShipOrderCompareRlt = "NO_DIFF";
+                                orderInfo.LstShipOrderCompareRltName = "正常";
+
+                                //比对成功后触发下货纸比对状态
+                                var pushModel = new EmbedServiceProjectStatusDto
+                                {
+                                    businessId = bookingId,
+                                    SourceType = 1,
+                                    StatusCodes = new List<EmbedServiceProjectStatusDetailDto> {
+                                    new EmbedServiceProjectStatusDetailDto{
+                                        StatusCode = "XHZBDCHG"
+                                    }
+                                }
+                                };
+
+                                var saveStatusRlt = await _djyServiceStatusService.SaveServiceStatus(pushModel);
+
+                                Logger.Log(NLog.LogLevel.Info, "批次={no} 异步推送下货纸比对状态完成，结果={rlt}", batchNo, JsonConvert.SerializeObject(saveStatusRlt));
+                            }
+                            else
+                            {
+                                if (isBefore)
+                                {
+                                    orderInfo.LstShipOrderCompareRlt = "BEFORE_EQUAL";
+                                    orderInfo.LstShipOrderCompareRltName = "返场前比对正常";
+                                }
+                                else
+                                {
+                                    orderInfo.LstShipOrderCompareRlt = "NO_DIFF_U";
+                                    orderInfo.LstShipOrderCompareRltName = "正常未结束";
+
+                                    //比对成功后触发下货纸比对状态
+                                    var pushModel = new EmbedServiceProjectStatusDto
+                                    {
+                                        businessId = bookingId,
+                                        SourceType = 1,
+                                        StatusCodes = new List<EmbedServiceProjectStatusDetailDto> {
+                                            new EmbedServiceProjectStatusDetailDto{
+                                                StatusCode = "XHZBDCHG"
+                                            }
+                                        }
+                                    };
+
+                                    var saveStatusRlt = await _djyServiceStatusService.SaveServiceStatus(pushModel);
+
+                                    Logger.Log(NLog.LogLevel.Info, "批次={no} 异步推送下货纸比对状态完成，结果={rlt}", batchNo, JsonConvert.SerializeObject(saveStatusRlt));
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        orderInfo.LstShipOrderCompareRlt = "NO_YARD";
+                        orderInfo.LstShipOrderCompareRltName = "无动态";
+                    }
+
+                    if (compareResult.extra != null)
+                        orderInfo.LstShipOrderCompareId = compareResult.extra.TaskCompareId;
+
+                    //更新
+                    await tenantDb.Updateable<SeaExport>(orderInfo).UpdateColumns(it => new
+                    {
+                        it.LstShipOrderCompareId,
+                        it.LstShipOrderCompareDate,
+                        it.LstShipOrderCompareRlt,
+                        it.LstShipOrderCompareRltName,
+                        it.LstShipOrderCompareMode,
+                    }).ExecuteCommandAsync();
+
+                    // 记录日志
+                    //await _bookingOrderService.SaveLog(orderInfo, oldOrderInfo, "下货纸比对");
+                }
+
+
+                result.succ = compareResult.succ;
+                result.msg = compareResult.msg;
+                result.extra = compareResult.extra;
+                result.extra2 = compareResult.extra2;
+                result.total = compareResult.total;
+                result.yardStatInfo = compareResult.yardStatInfo;
+
+                Logger.Log(NLog.LogLevel.Info, "批次={no} 请求下货纸比对返回结果{msg}", batchNo, JsonConvert.SerializeObject(compareResult));
+
+                Logger.Log(NLog.LogLevel.Info, "批次={no} 返回结果{msg}", batchNo, JsonConvert.SerializeObject(result));
+            }
+            catch (Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"请求下货纸比对异常,{ex.Message}";
+            }
+
+            return result;
+        }
+        #endregion
+
+        #region 生成请求规则报文
+        /// <summary>
+        /// 生成请求规则报文
+        /// </summary>
+        /// <param name="batchNo">批次号</param>
+        /// <param name="mainInfo">订舱主业务信息</param>
+        /// <returns>返回请求报文类</returns>
+        private TaskMessageInfoDto GetMessageInfo(string batchNo, TaskMessageMain mainInfo)
+        {
+            DateTime nowDate = DateTime.Now;
+
+            TaskMessageInfoDto msgModel = new TaskMessageInfoDto();
+
+            msgModel.Head = new TaskMessageHead
+            {
+                GID = batchNo,
+                MessageType = "SHIP_ORDER_COMPARE",
+                SenderId = AppSetting.app(new string[] { "ExcuteRuleService", "RulesEngineSender" }),
+                SenderName = AppSetting.app(new string[] { "ExcuteRuleService", "RulesEngineSenderName" }),
+                ReceiverId = "RulesEngine",
+                ReceiverName = "大简云规则引擎",
+                Version = "1.0",
+                RequestDate = nowDate.ToString("yyyy-MM-dd HH:mm:ss"),
+                RequestAction = "Compare",
+            };
+
+            msgModel.Main = mainInfo;
+
+            return msgModel;
+        }
+        #endregion
+
+        #region 请求下货纸比对
+        /// <summary>
+        /// 请求下货纸比对
+        /// </summary>
+        /// <param name="BusinessMsg"></param>
+        /// <returns></returns>
+        private async Task<TaskManageExcuteResultDto> ExcuteCompare(TaskMessageInfoDto info)
+        {
+            TaskManageExcuteResultDto model = null;
+            /*
+             1、读取配置文件中的规则引擎URL
+             2、填充请求的类，并生成JSON报文
+             3、POST请求接口，并记录回执。
+             4、返回信息。
+             */
+
+            try
+            {
+                //var res = await url.OnClientCreating(client => {
+                //    // client 为 HttpClient 对象
+                //    client.Timeout = TimeSpan.FromMinutes(15); // 设置超时时间 15分钟
+                //}).SetHttpMethod(HttpMethod.Post)
+                //    .SetBody(JsonConvert.SerializeObject(info), "application/json")
+                //    .SetContentEncoding(Encoding.UTF8)
+                //.PostAsync();
+
+                var jsonBody = JsonConvert.SerializeObject(info);
+                var res = RequestHelper.Post(jsonBody, shippingOrderCompareUrl);
+
+                Logger.Log(NLog.LogLevel.Info, string.Format("批次={no} 对应请求报文完成 res={res}", info.Head.GID, res));
+
+                if (!string.IsNullOrWhiteSpace(res))
+                {
+                    //var userResult = await res.Content.ReadAsStringAsync();
+
+                    model = JsonConvert.DeserializeObject<TaskManageExcuteResultDto>(res);
+                }
+            }
+            catch (Exception ex)
+            {
+                //写日志
+                if (ex is HttpRequestException)
+                    throw new Exception("请求失败");
+            }
+
+            return model;
+        }
+        #endregion
+
+        #region 请求下货纸比对结果
+        /// <summary>
+        /// 请求下货纸比对结果
+        /// </summary>
+        /// <param name="bookingId">订舱主键</param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        public async Task<TaskManageExcuteResultDto> GetShippingOrderCompareResult(long bookingId)
+        {
+            string batchNo = GuidHelper.GetSnowflakeId();
+
+            var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+
+            TaskManageExcuteResultDto result = new TaskManageExcuteResultDto();
+
+            try
+            {
+                var model = tenantDb.Queryable<SeaExport>()
+                    .First(a => a.Id == bookingId);
+
+                DateTime nowDate = DateTime.Now;
+
+                TaskMessageInfoDto msgModel = new TaskMessageInfoDto
+                {
+                    Head = new TaskMessageHead
+                    {
+                        GID = batchNo,
+                        MessageType = "DRAFT_COMPARE",
+                        SenderId = AppSetting.app(new string[] { "ExcuteRuleService", "RulesEngineSender" }),
+                        SenderName = AppSetting.app(new string[] { "ExcuteRuleService", "RulesEngineSenderName" }),
+                        ReceiverId = "RulesEngine",
+                        ReceiverName = "大简云规则引擎",
+                        Version = "1.0",
+                        RequestDate = nowDate.ToString("yyyy-MM-dd HH:mm:ss"),
+                        RequestAction = "Compare",
+                    },
+                    Main = new TaskMessageMain
+                    {
+                        BusiPKId = bookingId.ToString(),
+                        TaskCompareId = model.LstShipOrderCompareId,
+                    }
+                };
+
+                Logger.Log(NLog.LogLevel.Info, $"开始请求查询 msg={JsonConvert.SerializeObject(msgModel)}");
+
+                result = await GetCompareResult(msgModel);
+
+                if (result != null && result.extra != null && !string.IsNullOrWhiteSpace(result.extra.TaskCompareId))
+                {
+                    var feedBack = tenantDb.Queryable<DraftCompareFeedBackRecord>().First(a => a.BOOKING_ID == bookingId
+                         && a.TASK_COMPARE_ID == result.extra.TaskCompareId);
+
+                    if (feedBack != null)
+                    {
+                        result.extra.ManualFeedBackResult = new FeedBackResult
+                        {
+                            OperNote = feedBack.NOTES,
+                            OperTime = feedBack.CreateTime,
+                            OperUser = feedBack.CreateUserName,
+                            Reason = (feedBack.IS_OCR_ERROR ? "识别问题 " : "") + (feedBack.IS_EDIT_ERROR ? "录入问题 " : "") + (feedBack.IS_AGENT_ERROR ? "代理录入问题 " : "")
+                        };
+                    }
+                }
+
+            }
+            catch (Exception ex)
+            {
+                Logger.Log(NLog.LogLevel.Info, "获取Draft比对结果异常，原因：{error}", ex.Message);
+
+                throw new Exception($"获取Draft比对结果异常，原因：{ex.Message}");
+            }
+
+            return result;
+        }
+        #endregion
+
+        #region 获取Draft比对结果
+        /// <summary>
+        /// 获取Draft比对结果
+        /// </summary>
+        /// <param name="info">请求报文</param>
+        /// <returns>返回回执</returns>
+        private async Task<TaskManageExcuteResultDto> GetCompareResult(TaskMessageInfoDto info)
+        {
+            TaskManageExcuteResultDto model = null;
+
+            try
+            {
+                //var res = await url.SetHttpMethod(HttpMethod.Post)
+                //    .SetBody(JSON.Serialize(info), "application/json")
+                //    .SetContentEncoding(Encoding.UTF8)
+                //.PostAsync();
+
+                var jsonBody = JsonConvert.SerializeObject(info);
+                var res = RequestHelper.Post(jsonBody, shippingOrderCompareResultUrl);
+
+                Logger.Log(NLog.LogLevel.Info, string.Format("批次={no} 对应请求报文完成 res={res}", info.Head.GID, res));
+
+                if (!string.IsNullOrWhiteSpace(res))
+                {
+                    //var userResult = await res.Content.ReadAsStringAsync();
+
+                    Logger.Log(NLog.LogLevel.Info, "对应请求报文 userResult={userResult}", res);
+
+                    model = JsonConvert.DeserializeObject<TaskManageExcuteResultDto>(res);
+                }
+            }
+            catch (Exception ex)
+            {
+                //写日志
+                if (ex is HttpRequestException)
+                    throw new Exception("请求失败");
+            }
+
+            return model;
+        }
+        #endregion
+
+        public async Task<TaskManageExcuteResultDto> ExcuteShippingOrderCompareBatchAsync([FromBody] string[] bookingIds)
+        {
+            TaskManageExcuteResultDto result = new TaskManageExcuteResultDto();
+
+            var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+
+            try
+            {
+                var ids = bookingIds.Select(a => long.Parse(a)).Distinct().ToArray();
+
+                var list = tenantDb.Queryable<SeaExport>().Where(t => ids.Contains(t.Id)).ToList();
+
+                if (list.Count != ids.Length)
+                {
+                    var noRecord = string.Join(",", ids.GroupJoin(list, l => l, r => r.Id, (l, r) =>
+                    {
+                        var currList = r.ToList();
+
+                        if (r.Count() > 0)
+                            return 0;
+
+                        return l;
+                    }).Where(t => t > 0).ToArray());
+
+                    throw new Exception($"以下主键信息 {noRecord} 检索失败或者已作废过");
+                }
+
+                //这里单票下货纸比对时，等待结果返回
+                if (ids.Length == 1)
+                {
+                    result = await InnerExcuteShippingOrderCompareAsync(list.FirstOrDefault().Id.ToString());
+                }
+                else
+                {
+                    List<Task<TaskManageExcuteResultDto>> listOfTasks = new List<Task<TaskManageExcuteResultDto>>();
+
+                    list.ForEach(entity =>
+                    {
+                        listOfTasks.Add(InnerExcuteShippingOrderCompareAsync(entity.Id.ToString()));
+                    });
+
+                    await Task.WhenAll<TaskManageExcuteResultDto>(listOfTasks);
+
+                    result.succ = true;
+                    result.msg = "比对完成";
+
+                    string rltMsg = string.Empty;
+
+                    result.rows = listOfTasks.Select(a =>
+                    {
+                        var origId = a.Result.extra.OrigPKId;
+
+                        var order = list.FirstOrDefault(x => x.Id == long.Parse(origId));
+
+                        if (a.Result.succ)
+                        {
+                            if (a.Result.total > 0)
+                            {
+                                return new { MblNo = order.MBLNO, Msg = "比对异常", IsDiff = true, rlt = a.Result.succ };
+                            }
+
+                            return new { MblNo = order.MBLNO, Msg = "比对一致", IsDiff = false, rlt = a.Result.succ };
+                        }
+
+                        return new { MblNo = order?.MBLNO, Msg = "比对一致", IsDiff = false, rlt = a.Result.succ };
+                    }).ToList();
+                }
+
+
+
+            }
+            catch (Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"请求下货纸比对异常,{ex.Message}";
+            }
+
+            return result;
+        }
+
+        #region 下货纸自动比对回写状态
+        /// <summary>
+        /// 下货纸自动比对回写状态
+        /// </summary>
+        /// <param name="model">比对回写详情</param>
+        /// <returns>返回回执</returns>
+        public async Task<TaskManageExcuteResultDto> AutoTaskShippingOrderCompareCallBackAsync([FromBody] ShippingOrderCompareCallBackInfo model)
+        {
+            TaskManageExcuteResultDto result = new TaskManageExcuteResultDto();
+
+            var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+
+            try
+            {
+                if (string.IsNullOrWhiteSpace(model.reqBusiId))
+                    throw new Exception($"订舱主键{model.reqBusiId}不能为空");
+
+                if (string.IsNullOrWhiteSpace(model.compareId))
+                    throw new Exception($"比对ID{model.compareId}不能为空");
+
+                if (string.IsNullOrWhiteSpace(model.compareMode))
+                    throw new Exception($"下货纸比对方式不能为空{model.compareMode}不能为空");
+
+                if (string.IsNullOrWhiteSpace(model.compareRltCode))
+                    throw new Exception($"比对结果代码{model.compareRltCode}不能为空");
+
+                if (string.IsNullOrWhiteSpace(model.compareRltName))
+                    throw new Exception($"比对结果名称{model.compareId}不能为空");
+
+                var bookingOrder = await tenantDb.Queryable<SeaExport>()
+                    .FirstAsync(a => a.Id == long.Parse(model.reqBusiId));
+
+                if (bookingOrder == null)
+                {
+                    throw new Exception($"订舱信息检索失败，ID={model.reqBusiId}");
+                }
+                var oldBookingOrder = bookingOrder.Adapt<SeaExport>();
+
+                bookingOrder.LstShipOrderCompareId = model.compareId;
+                bookingOrder.LstShipOrderCompareDate = model.compareDate;
+                bookingOrder.LstShipOrderCompareRlt = model.compareRltCode;
+                bookingOrder.LstShipOrderCompareRltName = model.compareRltName;
+                bookingOrder.LstShipOrderCompareMode = model.compareMode;
+
+                //更新
+                await tenantDb.Updateable<SeaExport>(bookingOrder).UpdateColumns(it => new
+                {
+                    it.LstShipOrderCompareId,
+                    it.LstShipOrderCompareDate,
+                    it.LstShipOrderCompareRlt,
+                    it.LstShipOrderCompareRltName,
+                    it.LstShipOrderCompareMode,
+                }).ExecuteCommandAsync();
+
+                //await _bookingOrderService.SaveLog(bookingOrder, oldBookingOrder, "下货纸自动比对回写状态");
+
+                result.succ = true;
+                result.msg = "更新完成";
+            }
+            catch (Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"下货纸自动比对回写状态失败,{ex.Message}";
+            }
+
+            return result;
+        }
+        #endregion
+
+
+        #region 自动执行下货纸比对
+        /// <summary>
+        /// 自动执行下货纸比对
+        /// </summary>
+        /// <param name="bookingId">订舱主键</param>
+        /// <returns>返回回执</returns>
+        public async Task<TaskManageExcuteResultDto> ExcuteAutoShippingOrderCompareAsync(string bookingId)
+        {
+            string batchNo = GuidHelper.GetSnowflakeId();
+
+            Logger.Log(NLog.LogLevel.Info, "批次={no}获取订舱数据请求规则 {id}", batchNo, bookingId);
+
+            /*
+            处理逻辑
+            1、台账触发单票下货纸比对
+            2、调取订舱的详情。
+            3、对应请求报文。
+            4、请求比对接口。
+            5、返回回执。
+            */
+
+            return await InnerExcuteShippingOrderCompareAsync(bookingId, "AUTO");
+        }
+        #endregion
+    }
+}

ds-wms-service/DS.WMS.OpApi/Controllers/OpBusinessYardController.cs

@@ -63,7 +63,18 @@ public class OpBusinessYardController : ApiController
         var res = _invokeService.GetOpBusinessYardInfo(id);
         return res;
     }
-   
+    /// <summary>
+    /// 根据业务id详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpGet]
+    [Route("GetBusinessYardByKeyId")]
+    public DataResult<OpBusinessYardRes> GetBusinessYardByKeyId([FromQuery] string id)
+    {
+        var res = _invokeService.GetBusinessYardByKeyId(id);
+        return res;
+    }
     /// <summary>
     /// 批量删除
     /// </summary>

ds-wms-service/DS.WMS.TaskApi/Controllers/TaskManageSISubmittedController.cs

@@ -24,7 +24,8 @@ namespace DS.WMS.TaskApi.Controllers
         /// </summary>
         /// <param name="taskPkId">截单回执任务主键</param>
         /// <returns>返回回执</returns>
-        [HttpGet("GetInfoByTaskId")]
+        [HttpGet]
+        [Route("GetInfoByTaskId")]
         public async Task<DataResult<TaskSISubmittedShowDto>> GetInfoByTaskId(long taskPkId)
         {
             return await _taskManageSISubmittedService.GetInfoByTaskId(taskPkId);
@@ -37,7 +38,8 @@ namespace DS.WMS.TaskApi.Controllers
         /// </summary>
         /// <param name="taskPkId">截单回执任务主键</param>
         /// <returns>返回回执</returns>
-        [HttpGet("ProcessSISubmitted")]
+        [HttpGet]
+        [Route("ProcessSISubmitted")]
         public async Task<DataResult> ProcessSISubmitted(long taskPkId)
         {
             return await _taskManageSISubmittedService.ProcessSISubmitted(taskPkId);
@@ -50,7 +52,8 @@ namespace DS.WMS.TaskApi.Controllers
         /// </summary>
         /// <param name="taskPKId">任务主键</param>
         /// <returns>返回结果</returns>
-        [HttpGet("GetBookingOrderInfo")]
+        [HttpGet]
+        [Route("GetBookingOrderInfo")]
         public async Task<DataResult<TaskBookingOrderDto>> GetBookingOrderInfo(long taskPKId)
         {
             return await _taskManageSISubmittedService.GetBookingOrderInfo(taskPKId);
@@ -63,7 +66,8 @@ namespace DS.WMS.TaskApi.Controllers
         /// </summary>
         /// <param name="taskPKId">任务主键</param>
         /// <returns>返回结果</returns>
-        [HttpGet("GetSIFeedBackInfo")]
+        [HttpGet]
+        [Route("GetSIFeedBackInfo")]
         public async Task<DataResult<TaskSIFeedBackResultDto>> GetSIFeedBackInfo(long taskPKId)
         {
             return await _taskManageSISubmittedService.GetSIFeedBackInfo(taskPKId);

ds-wms-service/DS.WMS.TaskApi/Controllers/TaskShippingOrderCompareController.cs

@@ -0,0 +1,62 @@
+using DS.WMS.Core.Op.Dtos;
+using DS.WMS.Core.TaskPlat.Interface;
+using Microsoft.AspNetCore.Mvc;
+using NPOI.SS.Formula.Functions;
+
+namespace DS.WMS.TaskApi.Controllers
+{
+    /// <summary>
+    /// 下货纸比对
+    /// </summary>
+    public class TaskShippingOrderCompareController : ApiController
+    {
+        private readonly ITaskShippingOrderCompareService _taskShippingOrderCompareService;
+
+        public TaskShippingOrderCompareController(ITaskShippingOrderCompareService taskShippingOrderCompareService)
+        {
+            _taskShippingOrderCompareService = taskShippingOrderCompareService;
+        }
+
+        #region 执行下货纸比对
+        /// <summary>
+        /// 执行下货纸比对
+        /// </summary>
+        /// <param name="bookingId">订舱主键</param>
+        /// <returns>返回回执</returns>
+        [HttpGet]
+        [Route("ExcuteShippingOrderCompare")]
+        public async Task<TaskManageExcuteResultDto> ExcuteShippingOrderCompareAsync(string bookingId)
+        {
+            return await _taskShippingOrderCompareService.ExcuteShippingOrderCompareAsync(bookingId);
+        }
+        #endregion
+
+        #region 批量执行下货纸比对
+        /// <summary>
+        /// 批量执行下货纸比对
+        /// </summary>
+        /// <param name="bookingIds">订舱主键组</param>
+        /// <returns>返回回执</returns>
+        [HttpPost]
+        [Route("ExcuteShippingOrderCompareBatch")]
+        public async Task<TaskManageExcuteResultDto> ExcuteShippingOrderCompareBatchAsync([FromBody] string[] bookingIds)
+        {
+            return await _taskShippingOrderCompareService.ExcuteShippingOrderCompareBatchAsync(bookingIds);
+        }
+        #endregion
+
+        #region 获取下货纸比对结果
+        /// <summary>
+        /// 获取下货纸比对结果
+        /// </summary>
+        /// <param name="bookingId">订舱主键</param>
+        /// <returns>返回回执</returns>
+        [HttpGet]
+        [Route("GetShippingOrderCompareResult")]
+        public async Task<TaskManageExcuteResultDto> GetShippingOrderCompareResult(long bookingId)
+        {
+            return await _taskShippingOrderCompareService.GetShippingOrderCompareResult(bookingId);
+        }
+        #endregion
+    }
+}

ds-wms-service/DS.WMS.TaskApi/DS.WMS.TaskApi.csproj

@@ -9,6 +9,12 @@
     <DocumentationFile>bin\Debug\net8.0\Api.xml</DocumentationFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Controllers\TaskManageCutDateChangeController.cs" />
+    <Compile Remove="Controllers\TaskManageSISubmittedController.cs" />
+    <Compile Remove="Controllers\TaskShippingOrderCompareController.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\DS.Module.AutofacModule\DS.Module.AutofacModule.csproj" />
     <ProjectReference Include="..\DS.Module.Core\DS.Module.Core.csproj" />