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

海运出口列表简化返回字段

Browse Source
dev
cjy 2 weeks ago
parent 3f2a020ef8
commit faaa642e9e
4 changed files with 424 additions and 8 deletions
Show Stats Download Patch File Download Diff File

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

@ -107,7 +107,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary>
/// 列表数据
/// </summary>
public List<SeaExportRes> List { get; set; }
public List<SeaExportShortListRes> List { get; set; }
/// <summary>
/// 合计数

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

@ -0,0 +1,416 @@
using DS.Module.Core;
using DS.Module.Core.Enums;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DS.WMS.Core.Op.Dtos
{
/// <summary>
/// 海运出口简略列表
/// </summary>
public class SeaExportShortListRes
{
/// <summary>
/// 主键Id
/// </summary>
public long Id { get; set; }
/// <summary>
/// 业务状态名称
/// </summary>
public string BusinessStatusName { get; set; }
/// <summary>
/// 委托编号 可以根据规则生成
/// </summary>
public string CustomerNo { get; set; }
/// <summary>
/// 委托单位 t_info_client CUSTNAME
/// </summary>
public string CustomerName { get; set; }
/// <summary>
/// 客户编号
/// </summary>
public string CustomerNum { get; set; }
/// <summary>
/// 国内发货人 t_info_client CUSTNAME
/// </summary>
public string ShipperCn { get; set; }
/// <summary>
/// 集装箱
/// </summary>
public string CntrTotal { get; set; }
/// <summary>
/// 报价
/// </summary>
public int? QuotePrice { get; set; }
/// <summary>
/// 底价
/// </summary>
public int? FloorPrice { get; set; }
/// <summary>
/// 订舱编号
/// </summary>
public string BookingNo { get; set; }
/// <summary>
/// 主提单号
/// </summary>
public string MBLNO { get; set; }
/// <summary>
/// 船名 t_code_vessel
/// </summary>
public string Vessel { get; set; }
/// <summary>
/// 船司航次
/// </summary>
public string InnerVoyno { get; set; }
/// <summary>
/// 海关航次
/// </summary>
public string Voyno { get; set; }
/// <summary>
/// 船公司
/// </summary>
public string Carrier { get; set; }
/// <summary>
/// 开船日期
/// </summary>
public DateTime? ETD { get; set; }
/// <summary>
/// 装货港
/// </summary>
public string LoadPort { get; set; }
/// <summary>
/// 卸货港
/// </summary>
public string DischargePort { get; set; }
/// <summary>
/// 交货地
/// </summary>
public string DeliveryPlace { get; set; }
/// <summary>
/// 运输条款 CY-CY t_code_service
/// </summary>
public string Service { get; set; }
/// <summary>
/// 预抵日期
/// </summary>
public DateTime? ETA { get; set; }
/// <summary>
/// 货代公司（订舱口）
/// </summary>
public string Forwarder { get; set; }
/// <summary>
/// Desc:运踪状态 虚值
/// </summary>
public string BookStatus { get; set; }
/// <summary>
/// 箱状态
/// </summary>
public List<CntrNoRes> StatusLog { get; set; }
/// <summary>
/// 揽货人
/// </summary>
public string Sale { get; set; }
/// <summary>
/// 客服名称
/// </summary>
public string CustomerServiceName { get; set; }
/// <summary>
/// 操作员名称
/// </summary>
public string OperatorName { get; set; }
/// <summary>
/// Desc:单证人员
/// </summary>
public string DocName { get; set; }
/// <summary>
/// 航线人员名称
/// </summary>
public string Laner { get; set; }
/// <summary>
/// 约主名称
/// </summary>
public string ContractClientName { get; set; }
/// <summary>
/// 运费协议号(约号)
/// </summary>
public string ContractNo { get; set; }
/// <summary>
/// 最后格式单比对状态 NO_DIFF-无异常;DIFF-有差异;
/// </summary>
public string LstDraftCompareRlt { get; set; }
/// <summary>
/// 最后下货纸比对状态 NO_DIFF-无异常;DIFF-有差异;NO_YARD-无场站数据;EXPT-异常
/// </summary>
public string LstShipOrderCompareRlt { get; set; }
/// <summary>
/// 应收费用状态
/// </summary>
public BillFeeStatus? ARFeeStatus { get; set; }
/// <summary>
/// 应付费用状态
/// </summary>
public BillFeeStatus? APFeeStatus { get; set; }
/// <summary>
/// 应收开票状态
/// </summary>
public BillInvoiceStatus? ARInvoiceStatus { get; set; }
/// <summary>
/// 应付开票状态
/// </summary>
public BillInvoiceStatus? APInvoiceStatus { get; set; }
/// <summary>
/// 应收对账状态
/// </summary>
public BillCheckStatusEnum? ARCheckStatus { get; set; }
/// <summary>
/// Desc:是否业务锁定
/// </summary>
public bool? IsBusinessLocking { get; set; } = false;
/// <summary>
/// Desc:是否费用锁定
/// </summary>
public bool? IsFeeLocking { get; set; } = false;
/// <summary>
/// 财务日期
/// </summary>
public string AccountDate { get; set; }
/// <summary>
/// Desc:业务来源代码
/// </summary>
public string SourceCode { get; set; }
/// <summary>
/// Desc:业务来源明细名称
/// </summary>
public string SourceDetailName { get; set; }
/// <summary>
/// Desc:结算方式
/// </summary>
public string StlName { get; set; }
/// <summary>
/// Desc:月结算时间
/// </summary>
public DateTime? StlDate { get; set; }
/// <summary>
/// 船代
/// </summary>
public string ShipAgency { get; set; }
/// <summary>
/// 截单日期
/// </summary>
public DateTime? CloseDocDate { get; set; }
/// <summary>
/// 截港日期
/// </summary>
public DateTime? ClosingDate { get; set; }
/// <summary>
/// 中转港
/// </summary>
public string TransPort { get; set; }
/// <summary>
/// 场站 t_crm_client CUSTNAME
/// </summary>
public string Yard { get; set; }
/// <summary>
/// 报关行
/// </summary>
public string Customser { get; set; }
/// <summary>
/// 承运车队
/// </summary>
public string Trucker { get; set; }
/// <summary>
/// 国外代理人 t_info_client CUSTNAME
/// </summary>
public string Agent { get; set; }
/// <summary>
/// 发货人 t_info_client CUSTNAME
/// </summary>
public string Shipper { get; set; }
/// <summary>
/// 收货人 t_info_client CUSTNAME
/// </summary>
public string Consignee { get; set; }
/// <summary>
/// 通知人 t_info_client CUSTNAME
/// </summary>
public string NotifyParty { get; set; }
/// <summary>
/// 收货地
/// </summary>
public string ReceiptPlace { get; set; }
/// <summary>
/// 包装名称 t_code_package
/// </summary>
public string KindPkgsName { get; set; }
/// <summary>
/// 件数
/// </summary>
public int? PKGS { get; set; }
/// <summary>
/// 毛重
/// </summary>
public decimal? KGS { get; set; }
/// <summary>
/// 尺码
/// </summary>
public decimal? CBM { get; set; }
/// <summary>
/// 唛头 N/M
/// </summary>
public string Marks { get; set; }
/// <summary>
/// 货物描述
/// </summary>
public string Description { get; set; }
/// <summary>
/// 品名 t_code_goods
/// </summary>
public string GoodsName { get; set; }
/// <summary>
/// Desc:海关代码
/// </summary>
public string HSCode { get; set; }
/// <summary>
/// 货物标识 S/R/D/O
/// </summary>
public string CargoId { get; set; }
/// <summary>
/// 签单日期
/// </summary>
public DateTime? IssueDate { get; set; }
/// <summary>
/// 签单方式 t_code_issutype
/// </summary>
public string IssueType { get; set; }
/// <summary>
/// 签单地点
/// </summary>
public string IssuePlace { get; set; }
/// <summary>
/// 提单份数
/// </summary>
public string NoBill { get; set; }
/// <summary>
/// 副本份数
/// </summary>
public string CopyNoBill { get; set; }
/// <summary>
/// Desc:MBL付费方式 t_code_frt
/// </summary>
public string MBLFrt { get; set; }
/// <summary>
/// 预付地点
/// </summary>
public string PrepareAt { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Note { get; set; } = "";
/// <summary>
/// 订舱状态
/// </summary>
public List<BookingStatusRes> BookingStatus { get; set; }
/// <summary>
/// 箱TEU
/// </summary>
public int TEU { get; set; }
/// <summary>
/// 箱型1
/// </summary>
public int Cntr1 { get; set; }
/// <summary>
/// 箱型2
/// </summary>
public int Cntr2 { get; set; }
/// <summary>
/// 箱型3
/// </summary>
public int Cntr3 { get; set; }
/// <summary>
/// 箱型4
/// </summary>
public int Cntr4 { get; set; }
/// <summary>
/// 箱型5
/// </summary>
public int Cntr5 { get; set; }
/// <summary>
/// 箱型6
/// </summary>
public int Cntr6 { get; set; }
/// <summary>
/// 箱型7
/// </summary>
public int Cntr7 { get; set; }
/// <summary>
/// 箱型8
/// </summary>
public int Cntr8 { get; set; }
/// <summary>
/// 箱型9
/// </summary>
public int Cntr9 { get; set; }
/// <summary>
/// 箱型10
/// </summary>
public int Cntr10 { get; set; }
/// <summary>
/// 其他箱型
/// </summary>
public int OtherCntr { get; set; }
}
}

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

@ -76,7 +76,7 @@ namespace DS.WMS.Core.Op.Method
.InnerJoin<BusinessFeeStatus>((a, b) => a.Id == b.BusinessId)
//.LeftJoin<SysOrg>((a, b, c) => a.SaleOrgId == c.Id, "shippingweb8_dev.sys_org")
//.LeftJoin<SysOrg>((a, b, c) => a.SaleDeptId == c.Id, "shippingweb8_dev.sys_org")
.Select((a, b) => new SeaExportRes()
.Select((a, b) => new SeaExportShortListRes()
{
//SaleDeptName = c.OrgName,
},
@ -85,7 +85,7 @@ namespace DS.WMS.Core.Op.Method
.MergeTable()
.Mapper(it =>
{
it.BookingStatus = statusList.Where(x => x.BusinessId == it.Id).ToList();
//it.BookingStatus = statusList.Where(x => x.BusinessId == it.Id).ToList();
//it.BookingStatus = tenantDb.Queryable<BookingStatus>().Where(x => x.BusinessId == it.Id).Select<BookingStatusRes>().ToList();
})
@ -96,8 +96,8 @@ namespace DS.WMS.Core.Op.Method
var totalData = new SeaExportDataTotalRes()
{
MainCount = list.Where(x => x.ParentId == 0).Count(),
PartCount = list.Where(x => x.ParentId != 0).Count(),
MainCount = list.Count(),
PartCount = list.Count(),//Where(x => x.ParentId != 0)
ReturnCount = 0,
TEU = list.Sum(x => x.TEU),
PKGS = list.Sum(x => x.PKGS),

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

@ -127,7 +127,7 @@ public partial class SeaExportService : ISeaExportService
.InnerJoin<BusinessFeeStatus>((a, b) => a.Id == b.BusinessId)
//.LeftJoin<SysOrg>((a, b, c) => a.SaleOrgId == c.Id, "shippingweb8_dev.sys_org")
//.LeftJoin<SysOrg>((a, b, c) => a.SaleDeptId == c.Id, "shippingweb8_dev.sys_org")
.Select((a, b) => new SeaExportRes()
.Select((a, b) => new SeaExportShortListRes()
{
//SaleDeptName = c.OrgName,
QuotePrice = SqlFunc.Subqueryable<BusinessCtnPrice>()
@ -156,8 +156,8 @@ public partial class SeaExportService : ISeaExportService
var totalData = new SeaExportDataTotalRes()
{
MainCount = list.Where(x => x.ParentId == 0).Count(),
PartCount = list.Where(x => x.ParentId != 0).Count(),
MainCount = list.Count(),
PartCount = list.Count(),
ReturnCount = 0,
TEU = list.Sum(x => x.TEU),
PKGS = list.Sum(x => x.PKGS),

Write Preview
Loading…
Cancel
Save