diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs index 9556645..8c8b34e 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs @@ -190,13 +190,16 @@ namespace Win_in.Sfs.Scp.WebApi status = null, truckNbr = asn.PlateNumber, whse = "", - dock = "", + dock = asn.Dock, shipDate = asn.ShipTime, dueDate = asn.ReceiveTime, timeWindow = asn.ReceivedPort, remark = asn.Remark, }; - + if (string.IsNullOrEmpty(asnMstr.TimeWindow)) + { + asnMstr.TimeWindow = "00:00-00:00"; + } foreach (var barcode in barcodes) { var det = new AsnDet() diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnMstr.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnMstr.cs index 50971f9..4a64f83 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnMstr.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnMstr.cs @@ -94,8 +94,10 @@ namespace Win_in.Sfs.Scp.WebApi /// public virtual string remark { get; set; } - - + /// + /// 工厂编码 + /// + public virtual string Subsite { get; set; } public virtual List details { get; set; } = new List(); diff --git a/WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Asns/TB_ASN.cs b/WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Asns/TB_ASN.cs index 42eac1f..de0b300 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Asns/TB_ASN.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Asns/TB_ASN.cs @@ -46,6 +46,11 @@ namespace Win_in.Sfs.Scp.v1.Domain.Asns public string SubSite { get; set; } public int IsPort { get; set; }//接口是否读取 + /// + /// 收货口 + /// + public string Dock { get; set; } + public string WebSubSite { get; set; } public Guid? TenantId { get; } } } \ No newline at end of file