From a6c2ec7857c6e2b8568cf01e2bbb45a9c2dbf036 Mon Sep 17 00:00:00 2001
From: qian <feng.qian@ccwin-in.com>
Date: Wed, 29 May 2024 16:44:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20dock=20=E7=81=B5=E6=B4=BB?=
 =?UTF-8?q?=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
         /// 备注
         /// </summary>
         public virtual string Remark { get; set; }
-
+        /// <summary>
+        /// 工厂编码
+        /// </summary>
+        public virtual string Subsite { get; set; }
 
         public virtual List<AsnDet> Details { get; set; } = new List<AsnDet>();
 
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; }//接口是否读取
+        /// <summary>
+        /// 收货口
+        /// </summary>
+        public string Dock { get; set; }
+        public string WebSubSite { get; set; }
         public Guid? TenantId { get; }       
     }
 }
\ No newline at end of file