From 0ed63549d28d28cb5128d77bf0d20742e7b383f8 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Fri, 28 Jun 2024 14:50:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=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.cs                    | 25 +++++++++++--------
 .../NoPoASN/AsnMstr.cs                        |  6 +----
 2 files changed, 16 insertions(+), 15 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 8c8b34e..728526c 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
@@ -115,12 +115,10 @@ namespace Win_in.Sfs.Scp.WebApi
                                 var jsonString = noPoAsn.JsonString;
                                 try
                                 {
-                                    var a = 0;
-                                    var ss = 8 / a;
                                     var result = await _postService.PostAsync(baseUrl, apiUrl, jsonString, username, password);
                                     if (result == null)
                                     {
-                                        noPoAsn.SetError("Boomi", EnumExchangeDataErrorCode.None, "Boomi没有返回值");
+                                        noPoAsn.SetError("Boomi", EnumExchangeDataErrorCode.None, "Boomi没有返回值","Boomi接口执行失败");
                                     }
                                     if (result?.Status == "SUCCESS")
                                     {
@@ -128,18 +126,18 @@ namespace Win_in.Sfs.Scp.WebApi
                                     }
                                     else if (result?.Status == "EXCEPTION")
                                     {
-                                        noPoAsn.SetError("Boomi", EnumExchangeDataErrorCode.Exception, "EXCEPTION" + result?.ErrorMessage);
+                                        noPoAsn.SetError("Boomi", EnumExchangeDataErrorCode.Exception, "EXCEPTION" + result?.ErrorMessage, "Boomi接口执行失败");
                                     }
                                     else if (result?.Status == "FAIL")
                                     {
-                                        noPoAsn.SetError("Boomi", EnumExchangeDataErrorCode.FAIL, "FAIL" + result?.ErrorMessage);
+                                        noPoAsn.SetError("Boomi", EnumExchangeDataErrorCode.FAIL, "FAIL" + result?.ErrorMessage, "Boomi接口执行失败");
                                     }
                                 }
                                 catch (Exception e)
                                 {
                                     Logger.LogException(e);
                                     e = e.GetBaseException();
-                                    noPoAsn.SetError("Boomi", EnumExchangeDataErrorCode.Exception, "接口程序异常"+e.Message);
+                                    noPoAsn.SetError("Boomi", EnumExchangeDataErrorCode.Exception, "接口程序异常"+e.Message, "Boomi接口执行失败");
                                 }
                                 finally
                                 {
@@ -187,7 +185,6 @@ namespace Win_in.Sfs.Scp.WebApi
                 vendorCode = asn.VendId,
                 contacts = asn.ReceiveUser,
                 phone = "",
-                status = null,
                 truckNbr = asn.PlateNumber,
                 whse = "",
                 dock = asn.Dock,
@@ -195,10 +192,11 @@ namespace Win_in.Sfs.Scp.WebApi
                 dueDate = asn.ReceiveTime,
                 timeWindow = asn.ReceivedPort,
                 remark = asn.Remark,
+                subsite=asn.WebSubSite
             };
-            if (string.IsNullOrEmpty(asnMstr.TimeWindow))
+            if (string.IsNullOrEmpty(asnMstr.timeWindow))
             {
-                asnMstr.TimeWindow = "00:00-00:00";
+                asnMstr.timeWindow = "00:00-00:00";
             }
             foreach (var barcode in barcodes)
             {
@@ -291,7 +289,14 @@ namespace Win_in.Sfs.Scp.WebApi
                 {
                     exist.JsonString = x12Asn.JsonString;
                     exist.EdiString = x12Asn.EdiString;
-                    exist.Reset();
+                    if(x12Asn.Status== EnumExchangeDataStatus.Finish)
+                    {
+                        exist.SetSuccess(x12Asn.Reader);
+                    }
+                    else
+                    {
+                        exist.SetError(x12Asn.Reader, (EnumExchangeDataErrorCode) x12Asn.ErrorCode, x12Asn.ErrorMessage, x12Asn.Remark);
+                    }
                     await x12AsnRepository.UpdateAsync(exist);
                 }
             }
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 4a64f83..119fd0e 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
@@ -44,10 +44,6 @@ namespace Win_in.Sfs.Scp.WebApi
         /// 渚涘簲鍟�
         /// </summary>
         public virtual string vendorCode { get; set; }
-        /// <summary>
-        /// 鐘舵��
-        /// </summary>
-        public string status { get; set; }
 
         /// <summary>
         /// 鑱旂郴浜�
@@ -97,7 +93,7 @@ namespace Win_in.Sfs.Scp.WebApi
         /// <summary>
         /// 宸ュ巶缂栫爜
         /// </summary>
-        public virtual string Subsite { get; set; }
+        public virtual string subsite { get; set; }
 
         public virtual List<AsnDet> details { get; set; } = new List<AsnDet>();