From ceea849da8aaa5b81db47f2b77b7bd928a8e34a1 Mon Sep 17 00:00:00 2001 From: "mingliang.tang" <1448969505@qq.com> Date: Fri, 4 Aug 2023 13:25:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsnBackgroundWorker/AsnBackgroundWorker.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 3e4dc12..c22c5ce 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 @@ -147,15 +147,18 @@ namespace Win_in.Sfs.Scp.WebApi VendorCode = asn.VendId, Contacts = asn.ReceiveUser, Phone = "", - TruckNbr = asn.PlateNumber, + TruckNbr = asn.PlateNumber, Whse = "", - Dock = "", + Dock = "RM1", ShipDate = asn.ShipTime, DueDate = asn.ReceiveTime, - TimeWindow = asn.ReceivedPort, + 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() From a6c2ec7857c6e2b8568cf01e2bbb45a9c2dbf036 Mon Sep 17 00:00:00 2001 From: qian Date: Wed, 29 May 2024 16:44:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20dock=20=E7=81=B5?= =?UTF-8?q?=E6=B4=BB=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsnBackgroundWorker/AsnBackgroundWorker.cs | 3 ++- .../Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnMstr.cs | 5 ++++- WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Asns/TB_ASN.cs | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) 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 c22c5ce..6b2e59d 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 @@ -149,11 +149,12 @@ namespace Win_in.Sfs.Scp.WebApi Phone = "", TruckNbr = asn.PlateNumber, Whse = "", - Dock = "RM1", + Dock = asn.Dock, ShipDate = asn.ShipTime, DueDate = asn.ReceiveTime, TimeWindow =asn.ReceivedPort, Remark = asn.Remark, + Subsite =asn.WebSubSite, }; if (string.IsNullOrEmpty(asnMstr.TimeWindow)) { 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 9a6ffa6..e4cdf93 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 @@ -88,7 +88,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