chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加截单回执任务处理

Browse Source
usertest
jianghaiqing 4 months ago
parent 5fd6bcf430
commit 0cc9c891a9
20 changed files with 3096 additions and 7 deletions
Show Stats Download Patch File Download Diff File

7
ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs
Unescape Escape View File

@ -1469,6 +1469,13 @@ public static class MultiLanguageConst
[Description("海运出口详情获取失败，已作废或数据不存在")]
public const string SeaExportInfoNotExists = "SeaExportInfo_NotExists";
/// <summary>
/// 当前截单回执已有匹配的订舱订单
/// </summary>
[Description("当前截单回执已有匹配的订舱订单")]
public const string TaskSISubmittedHasOrder = "TaskSISubmittedHasOrder";
#endregion
#region 关联任务

13
ds-wms-service/DS.WMS.Core/Code/Interface/ICodeIssueTypeService.cs
Unescape Escape View File

@ -74,4 +74,17 @@ public interface ICodeIssueTypeService
/// <returns></returns>
public DataResult BatchDelCodeIssueType(IdModel req);
/// <summary>
/// 获取签单方式基础数据
/// </summary>
/// <param name="isFromCache">是否从缓存提取 true-从缓存读取 false-从数据库读取</param>
/// <returns>返回签单方式基础数据列表</returns>
Task<DataResult<List<CodeIssueTypeRes>>> GetAllList(bool isFromCache = true);
/// <summary>
/// 加载到缓存
/// </summary>
/// <returns></returns>
Task<DataResult> LoadCache();
}

72
ds-wms-service/DS.WMS.Core/Code/Method/CodeIssueTypeService.cs
Unescape Escape View File

@ -6,8 +6,10 @@ using DS.Module.UserModule;
using DS.WMS.Core.Code.Dtos;
using DS.WMS.Core.Code.Entity;
using DS.WMS.Core.Code.Interface;
using DS.WMS.Core.Sys.Interface;
using Mapster;
using Microsoft.Extensions.DependencyInjection;
using Newtonsoft.Json;
using SqlSugar;
namespace DS.WMS.Core.Code.Method;
@ -18,6 +20,8 @@ public class CodeIssueTypeService:ICodeIssueTypeService
private readonly ISqlSugarClient db;
private readonly IUser user;
private readonly ISaasDbService saasService;
private readonly ISysCacheService _sysCacheService;
/// <summary>
///
/// </summary>
@ -28,6 +32,7 @@ public class CodeIssueTypeService:ICodeIssueTypeService
db = _serviceProvider.GetRequiredService<ISqlSugarClient>();
user = _serviceProvider.GetRequiredService<IUser>();
saasService = _serviceProvider.GetRequiredService<ISaasDbService>();
_sysCacheService = _serviceProvider.GetRequiredService<ISysCacheService>();
}
public DataResult<List<CodeIssueTypeRes>> GetListByPage(PageRequest request)
@ -53,7 +58,7 @@ public class CodeIssueTypeService:ICodeIssueTypeService
var data = req.Adapt<CodeIssueType>();
var entity = db.Insertable(data).ExecuteReturnEntity();
_sysCacheService.RemoveCache(Sys.Method.SysCacheCategoryEnum.CommonCodeIssueType, "DS8").GetAwaiter().GetResult();
return DataResult.Successed("添加成功!", entity.Id,MultiLanguageConst.DataCreateSuccess);
}
else
@ -63,6 +68,7 @@ public class CodeIssueTypeService:ICodeIssueTypeService
info = req.Adapt(info);
db.Updateable(info).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
_sysCacheService.RemoveCache(Sys.Method.SysCacheCategoryEnum.CommonCodeIssueType, "DS8").GetAwaiter().GetResult();
return DataResult.Successed("更新成功!",MultiLanguageConst.DataUpdateSuccess);
}
}
@ -101,7 +107,7 @@ public class CodeIssueTypeService:ICodeIssueTypeService
var data = req.Adapt<CodeIssueType>();
var entity = tenantDb.Insertable(data).ExecuteReturnEntity();
_sysCacheService.RemoveCache(Sys.Method.SysCacheCategoryEnum.CommonCodeIssueType, "DS8").GetAwaiter().GetResult();
return DataResult.Successed("添加成功!", entity.Id,MultiLanguageConst.DataCreateSuccess);
}
else
@ -111,6 +117,7 @@ public class CodeIssueTypeService:ICodeIssueTypeService
info = req.Adapt(info);
tenantDb.Updateable(info).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
_sysCacheService.RemoveCache(Sys.Method.SysCacheCategoryEnum.CommonCodeIssueType, "DS8").GetAwaiter().GetResult();
return DataResult.Successed("更新成功!",MultiLanguageConst.DataUpdateSuccess);
}
}
@ -154,6 +161,8 @@ public class CodeIssueTypeService:ICodeIssueTypeService
}
tenantDb.Insertable(list).ExecuteCommand();
_sysCacheService.RemoveCache(Sys.Method.SysCacheCategoryEnum.CommonCodeIssueType, "DS8").GetAwaiter().GetResult();
return DataResult.Successed("引入成功!",MultiLanguageConst.DataImportSuccess);
}
@ -177,6 +186,65 @@ public class CodeIssueTypeService:ICodeIssueTypeService
{
tenantDb.Deleteable(list).ExecuteCommand();
}
_sysCacheService.RemoveCache(Sys.Method.SysCacheCategoryEnum.CommonCodeIssueType, "DS8").GetAwaiter().GetResult();
return DataResult.Successed("删除成功!", MultiLanguageConst.DataDelSuccess);
}
/// <summary>
/// 获取签单方式基础数据
/// </summary>
/// <param name="isFromCache">是否从缓存提取 true-从缓存读取 false-从数据库读取</param>
/// <returns>返回签单方式基础数据列表</returns>
public async Task<DataResult<List<CodeIssueTypeRes>>> GetAllList(bool isFromCache = true)
{
List<CodeIssueTypeRes> list = new List<CodeIssueTypeRes>();
bool isLoad = false;
if (isFromCache)
{
var rlt = await _sysCacheService.GetAllCommonCodeFromCache<CodeIssueTypeRes>(Sys.Method.SysCacheCategoryEnum.CommonCodeIssueType, "DS8");
if (rlt.Succeeded)
return rlt;
isLoad = true;
}
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
list = tenantDb.Queryable<CodeIssueType>()
.Select<CodeIssueTypeRes>()
.Where(a => a.Status == StatusEnum.Enable).ToList();
if (list.Count > 0)
{
if (isLoad)
{
await _sysCacheService.SetCommonCode(JsonConvert.SerializeObject(list), Sys.Method.SysCacheCategoryEnum.CommonCodeIssueType, "DS8");
}
return DataResult<List<CodeIssueTypeRes>>.Success(list);
}
return DataResult<List<CodeIssueTypeRes>>.FailedData(list);
}
/// <summary>
/// 加载到缓存
/// </summary>
/// <returns></returns>
public async Task<DataResult> LoadCache()
{
var rlt = await GetAllList(false);
if (rlt.Succeeded)
{
await _sysCacheService.SetCommonCode(JsonConvert.SerializeObject(rlt.Data), Sys.Method.SysCacheCategoryEnum.CommonCodeIssueType, "DS8");
return DataResult.Successed(MultiLanguageConst.LoadCacheSucc);
}
return DataResult.Failed(MultiLanguageConst.LoadCacheFailDataNull);
}
}

7
ds-wms-service/DS.WMS.Core/DS.WMS.Core.csproj
Unescape Escape View File

@ -25,6 +25,13 @@
<ItemGroup>
<Folder Include="Finance\Dtos\" />
<Folder Include="Finance\Entity\" />
<Folder Include="TaskPlat\Interface\VGM\" />
<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>
<ItemGroup>

14
ds-wms-service/DS.WMS.Core/Map/Interface/IMappingIssueTypeService.cs
Unescape Escape View File

@ -1,5 +1,6 @@
using DS.Module.Core;
using DS.Module.Core.Data;
using DS.WMS.Core.Code.Dtos;
using DS.WMS.Core.Map.Dtos;
using System;
using System.Collections.Generic;
@ -45,5 +46,18 @@ namespace DS.WMS.Core.Map.Interface
/// <param name="req"></param>
/// <returns></returns>
public DataResult BatchDelMappingIssueType(IdModel req);
/// <summary>
/// 获取签单方式映射
/// </summary>
/// <param name="isFromCache">是否从缓存提取 true-从缓存读取 false-从数据库读取</param>
/// <returns>返回签单方式映射列表</returns>
Task<DataResult<List<MappingIssueTypeRes>>> GetAllList(bool isFromCache = true);
/// <summary>
/// 加载到缓存
/// </summary>
/// <returns></returns>
Task<DataResult> LoadCache();
}
}

66
ds-wms-service/DS.WMS.Core/Map/Method/MappingIssueTypeService.cs
Unescape Escape View File

@ -20,6 +20,8 @@ using Org.BouncyCastle.Ocsp;
using Mapster;
using DS.WMS.Core.Fee.Entity;
using DS.WMS.Core.Code.Entity;
using DS.WMS.Core.Sys.Interface;
using Newtonsoft.Json;
namespace DS.WMS.Core.Map.Method
{
@ -29,6 +31,8 @@ namespace DS.WMS.Core.Map.Method
private readonly ISqlSugarClient db;
private readonly IUser user;
private readonly ISaasDbService saasService;
private readonly ISysCacheService _sysCacheService;
/// <summary>
///
/// </summary>
@ -49,6 +53,7 @@ namespace DS.WMS.Core.Map.Method
{
tenantDb.Deleteable(list).ExecuteCommand();
}
_sysCacheService.RemoveCache(Sys.Method.SysCacheCategoryEnum.CommonMappingIssueType, "DS8").GetAwaiter().GetResult();
return DataResult.Successed("删除成功!", MultiLanguageConst.DataDelSuccess);
}
@ -62,6 +67,7 @@ namespace DS.WMS.Core.Map.Method
}
tenantDb.Deleteable(info).ExecuteCommand();
_sysCacheService.RemoveCache(Sys.Method.SysCacheCategoryEnum.CommonMappingIssueType, "DS8").GetAwaiter().GetResult();
return DataResult.Successed("删除成功!", MultiLanguageConst.DataDelSuccess);
}
@ -79,7 +85,7 @@ namespace DS.WMS.Core.Map.Method
var data = req.Adapt<MappingIssueType>();
var entity = tenantDb.Insertable(data).ExecuteReturnEntity();
_sysCacheService.RemoveCache(Sys.Method.SysCacheCategoryEnum.CommonMappingIssueType, "DS8").GetAwaiter().GetResult();
return DataResult.Successed("添加成功!", entity.Id, MultiLanguageConst.DataCreateSuccess);
}
else
@ -89,6 +95,7 @@ namespace DS.WMS.Core.Map.Method
info = req.Adapt(info);
tenantDb.Updateable(info).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
_sysCacheService.RemoveCache(Sys.Method.SysCacheCategoryEnum.CommonMappingIssueType, "DS8").GetAwaiter().GetResult();
return DataResult.Successed("更新成功!", MultiLanguageConst.DataUpdateSuccess);
}
}
@ -123,5 +130,62 @@ namespace DS.WMS.Core.Map.Method
.First();
return DataResult<MappingIssueTypeRes>.Success(data, MultiLanguageConst.DataQuerySuccess);
}
/// <summary>
/// 获取签单方式映射
/// </summary>
/// <param name="isFromCache">是否从缓存提取 true-从缓存读取 false-从数据库读取</param>
/// <returns>返回签单方式映射列表</returns>
public async Task<DataResult<List<MappingIssueTypeRes>>> GetAllList(bool isFromCache = true)
{
List<MappingIssueTypeRes> list = new List<MappingIssueTypeRes>();
bool isLoad = false;
if (isFromCache)
{
var rlt = await _sysCacheService.GetAllCommonCodeFromCache<MappingIssueTypeRes>(Sys.Method.SysCacheCategoryEnum.CommonMappingIssueType, "DS8");
if (rlt.Succeeded)
return rlt;
isLoad = true;
}
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
list = tenantDb.Queryable<MappingIssueType>()
.Select<MappingIssueTypeRes>().ToList();
if (list.Count > 0)
{
if (isLoad)
{
await _sysCacheService.SetCommonCode(JsonConvert.SerializeObject(list), Sys.Method.SysCacheCategoryEnum.CommonMappingIssueType, "DS8");
}
return DataResult<List<MappingIssueTypeRes>>.Success(list);
}
return DataResult<List<MappingIssueTypeRes>>.FailedData(list);
}
/// <summary>
/// 加载到缓存
/// </summary>
/// <returns></returns>
public async Task<DataResult> LoadCache()
{
var rlt = await GetAllList(false);
if (rlt.Succeeded)
{
await _sysCacheService.SetCommonCode(JsonConvert.SerializeObject(rlt.Data), Sys.Method.SysCacheCategoryEnum.CommonMappingIssueType, "DS8");
return DataResult.Successed(MultiLanguageConst.LoadCacheSucc);
}
return DataResult.Failed(MultiLanguageConst.LoadCacheFailDataNull);
}
}
}

4
ds-wms-service/DS.WMS.Core/Map/Method/MappingPackageService.cs
Unescape Escape View File

@ -20,6 +20,7 @@ using Org.BouncyCastle.Ocsp;
using Mapster;
using DS.WMS.Core.Fee.Entity;
using DS.WMS.Core.Code.Entity;
using DS.WMS.Core.Sys.Interface;
namespace DS.WMS.Core.Map.Method
{
@ -29,6 +30,8 @@ namespace DS.WMS.Core.Map.Method
private readonly ISqlSugarClient db;
private readonly IUser user;
private readonly ISaasDbService saasService;
private readonly ISysCacheService _sysCacheService;
/// <summary>
///
/// </summary>
@ -39,6 +42,7 @@ namespace DS.WMS.Core.Map.Method
db = _serviceProvider.GetRequiredService<ISqlSugarClient>();
user = _serviceProvider.GetRequiredService<IUser>();
saasService = _serviceProvider.GetRequiredService<ISaasDbService>();
_sysCacheService = _serviceProvider.GetRequiredService<ISysCacheService>();
}
public DataResult BatchDelMappingPackage(IdModel req)
{

5
ds-wms-service/DS.WMS.Core/Op/Dtos/OpCtnReq.cs
Unescape Escape View File

@ -207,5 +207,10 @@ namespace DS.WMS.Core.Op.Dtos
/// </summary>
public string ActualArrivalPortTime { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
}

63
ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportOpenEditReq.cs
Unescape Escape View File

@ -342,5 +342,66 @@ namespace DS.WMS.Core.Op.Dtos
/// Desc:仓储
/// </summary>
public bool? IsStorage { get; set; } = false;
}
/// <summary>
/// 签单方式
/// </summary>
public string IssueType { 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 SecondNotifyParty { get; set; }
/// <summary>
/// 包装
/// </summary>
public string KindPkgs { get; set; }
/// <summary>
/// 唛头
/// </summary>
public string Marks { get; set; }
/// <summary>
/// 货物描述
/// </summary>
public string Description { get; set; }
/// <summary>
/// 毛重
/// </summary>
public decimal? KGS { get; set; }
/// <summary>
/// 件数
/// </summary>
public int? PKGS { get; set; }
/// <summary>
/// 尺码
/// </summary>
public decimal? CBM { get; set; }
/// <summary>
/// 集装箱列表
/// </summary>
public List<OpCtnReq> CtnList { get; set; }
}
}

5
ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportOrderExtension.cs
Unescape Escape View File

@ -45,6 +45,11 @@ namespace DS.WMS.Core.Op.Dtos
/// 分票订单信息
/// </summary>
public List<SeaExportOrderExtensionSubInfo> otherOrderList { get; set; }
/// <summary>
/// 当前订单的箱信息
/// </summary>
public List<OpCtnRes> currOrderCtnList { get; set; }
}
/// <summary>

9
ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs
Unescape Escape View File

@ -1171,6 +1171,15 @@ public partial class SeaExportService : ISeaExportService
}
}
}
if(model.currOrder != null)
{
var ctnList = await tenantDb.Queryable<OpCtn>()
.Where(a => long.Parse(a.BSNO) == currOrder.Id && a.Deleted == false).ToListAsync();
if (ctnList.Count > 0)
model.currOrderCtnList = ctnList.Select(b => b.Adapt<OpCtnRes>()).ToList();
}
}
else
{

12
ds-wms-service/DS.WMS.Core/Sys/Method/SysCacheService.cs
Unescape Escape View File

@ -120,6 +120,11 @@ namespace DS.WMS.Core.Sys.Method
[Description("航线基础信息")]
CommonCodeLanes,
/// <summary>
/// 签单方式基础信息
/// </summary>
[Description("签单方式基础信息")]
CommonCodeIssueType,
/// <summary>
/// 场站映射信息
/// </summary>
[Description("场站映射信息")]
@ -153,6 +158,11 @@ namespace DS.WMS.Core.Sys.Method
/// 港口映射
/// </summary>
[Description("港口映射")]
CommonMappingPort
CommonMappingPort,
/// <summary>
/// 签单方式映射
/// </summary>
[Description("签单方式映射")]
CommonMappingIssueType
}
}

247
ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/SISubmitted/SIFeedBackCompareDto.cs
Unescape Escape View File

@ -0,0 +1,247 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DS.WMS.Core.TaskPlat.Dtos
{
public class SIFeedBackCompareDto
{
/// <summary>
/// 提单号
/// </summary>
public string MblNo { get; set; }
/// <summary>
/// 船公司
/// </summary>
public string Carrier { get; set; }
/// <summary>
/// 通知时间
/// </summary>
public Nullable<DateTime> NoticeDate { 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 TransportReceiver { get; set; }
/// <summary>
/// 唛头
/// </summary>
public string Marks { get; set; }
/// <summary>
/// HS CODE
/// </summary>
public string HSCode { get; set; }
/// <summary>
/// 货描
/// </summary>
public string Description { get; set; }
/// <summary>
/// 船名
/// </summary>
public string Vessel { get; set; }
/// <summary>
/// 航次
/// </summary>
public string VoyNo { get; set; }
/// <summary>
/// 截单备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 付费方式
/// </summary>
public string BLFRT { get; set; }
/// <summary>
/// 运输条款
/// </summary>
/// <example>CY-CY</example>
public string Service { get; set; }
/// <summary>
/// 签单方式
/// </summary>
/// <example>TELEX</example>
public string IssueType { get; set; }
/// <summary>
/// 提取签单方式
/// </summary>
/// <example>TELEX</example>
public string TakeIssueTypeName { get; set; }
/// <summary>
/// 装货港代码
/// </summary>
/// <example>CNTAO</example>
public string PortLoadId { get; set; }
/// <summary>
/// 装货港
/// </summary>
public string PortLoad { get; set; }
/// <summary>
/// 卸货港代码
/// </summary>
/// <example>GUPIT</example>
public string PortDischargeId { get; set; }
/// <summary>
/// 卸货港
/// </summary>
public string PortDischarge { get; set; }
/// <summary>
/// 中转港代码
/// </summary>
/// <example>GUPIT</example>
public string PortTransId { get; set; }
/// <summary>
/// 中转港
/// </summary>
public string PortTrans { get; set; }
/// <summary>
/// 目的地代码
/// </summary>
/// <example>GUPIT</example>
public string DestinationId { get; set; }
/// <summary>
/// 目的地
/// </summary>
public string Destination { get; set; }
/// <summary>
/// 件数
/// </summary>
public int? PKGS { get; set; }
/// <summary>
/// 包装
/// </summary>
public string KindPKGS { get; set; }
/// <summary>
/// 毛重
/// </summary>
public decimal? KGS { get; set; }
/// <summary>
/// 尺寸
/// </summary>
public decimal? CBM { get; set; }
/// <summary>
/// 第三付款地
/// </summary>
public string ThirdPayAddr { get; set; }
/// <summary>
/// 截单上传时间
/// </summary>
public string SubmittedDate { get; set; }
/// <summary>
/// 签单方式(seaway、original、telex)
/// </summary>
public string DocumentType { get; set; }
/// <summary>
/// 提单份数
/// </summary>
public string BillOfNum { get; set; }
/// <summary>
/// 放单方式
/// </summary>
public string ReleaseInstruction { get; set; }
/// <summary>
/// 是否拆单 SPLIT-标识已拆单
/// </summary>
public string SISubType { get; set; }
/// <summary>
/// 箱信息
/// </summary>
public List<SIFeedBackCompareContaDto> ContaList { get; set; }
}
public class SIFeedBackCompareContaDto
{
/// <summary>
/// 集装箱号
/// </summary>
/// <example>RFCU2088064</example>
public string ContaNo { get; set; }
/// <summary>
/// 铅封号
/// </summary>
/// <example>T090518</example>
public string SealNo { get; set; }
/// <summary>
/// 件数
/// </summary>
/// <example>222</example>
public int PKGS { get; set; }
/// <summary>
/// 重量
/// </summary>
/// <example>1651</example>
public decimal? KGS { get; set; }
/// <summary>
/// 尺寸
/// </summary>
/// <example>9.67</example>
public decimal? CBM { get; set; }
/// <summary>
/// 箱型代码
/// </summary>
/// <example>20GP</example>
public string ContaType { get; set; }
/// <summary>
/// 箱型
/// </summary>
/// <example>20GP</example>
public string ContaTypeName { get; set; }
/// <summary>
/// 包装
/// </summary>
public string KINDPKGS { get; set; }
/// <summary>
/// 称重方式
/// </summary>
public string WeighType { get; set; }
/// <summary>
/// 称重重量
/// </summary>
public Nullable<decimal> WeighKGS { get; set; }
}
}

1024
ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/SISubmitted/TaskBookingOrderDto.cs
View File

File diff suppressed because it is too large Load Diff

56
ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/SISubmitted/TaskSIFeedBackResultContaDto.cs
Unescape Escape View File

@ -0,0 +1,56 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DS.WMS.Core.TaskPlat.Dtos
{
/// <summary>
/// SI集装箱
/// </summary>
public class TaskSIFeedBackResultContaDto
{
/// <summary>
/// 集装箱号
/// </summary>
/// <example>RFCU2088064</example>
public string ContaNo { get; set; }
/// <summary>
/// 铅封号
/// </summary>
/// <example>T090518</example>
public string SealNo { get; set; }
/// <summary>
/// 件数
/// </summary>
/// <example>222</example>
public int PKGS { get; set; }
/// <summary>
/// 重量
/// </summary>
/// <example>1651</example>
public decimal? KGS { get; set; }
/// <summary>
/// 尺寸
/// </summary>
/// <example>9.67</example>
public decimal? CBM { get; set; }
/// <summary>
/// 箱型代码
/// </summary>
/// <example>20GP</example>
public string ContaType { get; set; }
/// <summary>
/// 箱型
/// </summary>
/// <example>20GP</example>
public string ContaTypeName { get; set; }
}
}

142
ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/SISubmitted/TaskSIFeedBackResultDto.cs
Unescape Escape View File

@ -0,0 +1,142 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DS.WMS.Core.TaskPlat.Dtos
{
/// <summary>
/// SI详情
/// </summary>
public class TaskSIFeedBackResultDto
{
// <summary>
/// 任务主键
/// </summary>
public long TaskId { get; set; }
/// <summary>
/// 订舱详情
/// </summary>
public TaskBookingOrderDto BookingOrder { get; set; }
/// <summary>
/// SI详情
/// </summary>
public TaskSIFeedBackResultBusiDto BusiInfo { get; set; }
/// <summary>
/// SI与订舱主信息比对差异字段列表
/// </summary>
public List<string> SICompareOrderKeyList { get; set; }
/// <summary>
/// SI与订舱集装箱比对差异字段列表
/// </summary>
public List<string> SICompareOrderContaKeyList { get; set; }
}
public class TaskSIFeedBackResultBusiDto
{
/// <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 Marks { get; set; }
/// <summary>
/// 货描
/// </summary>
public string Description { get; set; }
/// <summary>
/// 截单备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 付费方式
/// </summary>
public string BLFRT { get; set; }
/// <summary>
/// 运输条款
/// </summary>
/// <example>CY-CY</example>
public string Service { get; set; }
/// <summary>
/// 签单方式
/// </summary>
/// <example>TELEX</example>
public string IssueType { get; set; }
/// <summary>
/// 装货港代码
/// </summary>
/// <example>CNTAO</example>
public string PortLoadId { get; set; }
/// <summary>
/// 装货港
/// </summary>
public string PortLoad { get; set; }
/// <summary>
/// 卸货港代码
/// </summary>
/// <example>GUPIT</example>
public string PortDischargeId { get; set; }
/// <summary>
/// 卸货港
/// </summary>
public string PortDischarge { get; set; }
/// <summary>
/// 中转港代码
/// </summary>
/// <example>GUPIT</example>
public string PortTransId { get; set; }
/// <summary>
/// 中转港
/// </summary>
public string PortTrans { get; set; }
/// <summary>
/// 目的地代码
/// </summary>
/// <example>GUPIT</example>
public string DestinationId { get; set; }
/// <summary>
/// 目的地
/// </summary>
public string Destination { get; set; }
/// <summary>
/// 件数
/// </summary>
public int? PKGS { get; set; }
/// <summary>
/// 包装
/// </summary>
public string KindPKGS { get; set; }
/// <summary>
/// 毛重
/// </summary>
public decimal? KGS { get; set; }
/// <summary>
/// 尺寸
/// </summary>
public decimal? CBM { get; set; }
/// <summary>
/// 第三付款地
/// </summary>
public string ThirdPayAddr { get; set; }
/// <summary>
/// 箱信息
/// </summary>
public List<TaskSIFeedBackResultContaDto> ContaList { get; set; }
}
}

65
ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/SISubmitted/TaskSISubmittedDto.cs
Unescape Escape View File

@ -0,0 +1,65 @@
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 TaskSISubmittedDto
{
public long Id { get; set; }
/// <summary>
/// 任务主键
/// </summary>
public long TaskId { get; set; }
/// <summary>
/// 主单号
/// </summary>
public string MBlNo { get; set; }
/// <summary>
/// 船公司
/// </summary>
public string Carrier { get; set; }
/// <summary>
/// 通知接收时间
/// </summary>
public Nullable<DateTime> NoticeDate { get; set; }
/// <summary>
/// 订舱ID
/// </summary>
public Nullable<long> BookingId { get; set; }
/// <summary>
/// 提取签单方式名称
/// </summary>
public string TakeIssueTypeName { get; set; }
/// <summary>
/// 签单方式名称
/// </summary>
public string IssueType { get; set; }
}
public class TaskSISubmittedShowDto : TaskSISubmittedDto
{
/// <summary>
/// 是否已完成
/// </summary>
public bool IsComplete { get; set; }
/// <summary>
/// 完成时间
/// </summary>
public Nullable<DateTime> CompleteTime { get; set; }
}
}

4
ds-wms-service/DS.WMS.Core/TaskPlat/Entity/TaskSiSubmitted.cs
Unescape Escape View File

@ -225,7 +225,7 @@ namespace DS.WMS.Core.TaskPlat.Entity
/// 是否设置了自动更新订舱
/// </summary>
[SugarColumn(ColumnDescription = "是否设置了自动更新订舱", IsNullable = true, Length = 1)]
public UInt64? IS_SET_AUTO_UPD_BOOKING { get; set; }
public Nullable<bool> IS_SET_AUTO_UPD_BOOKING { get; set; }
/// <summary>
/// 处理结果
@ -249,7 +249,7 @@ namespace DS.WMS.Core.TaskPlat.Entity
/// 是否已更新订舱
/// </summary>
[SugarColumn(ColumnDescription = "是否已更新订舱", IsNullable = true, Length = 1)]
public UInt64? IS_UPDATE_BOOKING { get; set; }
public Nullable<bool> IS_UPDATE_BOOKING { get; set; }
/// <summary>
/// 更新订舱时间

53
ds-wms-service/DS.WMS.Core/TaskPlat/Interface/SISubmitted/ITaskManageSISubmittedService.cs
Unescape Escape View File

@ -0,0 +1,53 @@
using DS.Module.Core;
using DS.Module.DjyServiceStatus;
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 ITaskManageSISubmittedService
{
/// <summary>
/// 通过任务主键获取截止时间变更详情
/// </summary>
/// <param name="taskPkId">截止时间变更任务主键</param>
/// <returns>返回回执</returns>
Task<DataResult<TaskSISubmittedShowDto>> GetInfoByTaskId(long taskPKId);
/// <summary>
/// 检索对应的订舱订单并保存订舱ID
/// </summary>
/// <param name="taskPKId">截止时间变更任务主键</param>
/// <returns>返回回执</returns>
Task<DataResult<SeaExportOrderExtension>> SearchAndMarkBookingOrder(long taskPKId);
/// <summary>
/// 处理SI截单回执
/// </summary>
/// <param name="taskPkId">截单回执任务主键</param>
/// <returns>返回回执</returns>
Task<DataResult> ProcessSISubmitted(long taskPkId);
/// <summary>
/// 获取订舱详情
/// </summary>
/// <param name="taskPKId">任务主键</param>
/// <returns>返回结果</returns>
Task<TaskBookingOrderDto> GetBookingOrderInfo(long taskPKId);
/// <summary>
/// 获取SI反馈信息
/// </summary>
/// <param name="taskPKId">任务主键</param>
/// <returns>返回结果</returns>
Task<TaskSIFeedBackResultDto> GetSIFeedBackInfo(long taskPKId);
}
}

1235
ds-wms-service/DS.WMS.Core/TaskPlat/Method/SISubmitted/TaskManageSISubmittedService.cs
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save