From 00a72fff219241eb5b0405a066cc859d07cf7735 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 17 九月 2025 10:23:44 +0800
Subject: [PATCH] 1111

---
 service/Warehouse/MesXkyService.cs |  357 +++++++++++++++++++++++++++--------------------------------
 1 files changed, 165 insertions(+), 192 deletions(-)

diff --git a/service/Warehouse/MesXkyService.cs b/service/Warehouse/MesXkyService.cs
index 7377302..b68574a 100644
--- a/service/Warehouse/MesXkyService.cs
+++ b/service/Warehouse/MesXkyService.cs
@@ -1,37 +1,37 @@
-锘縰sing System.Collections;
-using System.Dynamic;
-using System.Net;
-using System.Net.Http.Headers;
-using System.Text;
+锘縰sing MES.Service.Models;
 using NewPdaSqlServer.DB;
-using NewPdaSqlServer.Dto.Xky;
-using NewPdaSqlServer.entity;
 using NewPdaSqlServer.util;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System.Collections;
+using System.Data;
+using System.Net;
+using System.Net.Http.Headers;
+using System.Text;
+using NewPdaSqlServer.Dto.Xky;
 using static NewPdaSqlServer.Controllers.Warehouse.MesXkyController;
 
-namespace NewPdaSqlServer.service.Warehouse;
+namespace NewPdaSqlServer.service.QC;
 
 public class MesXkyService : RepositoryNoEntity
 {
     /// <summary>
-    ///     閫佽揣鍗曟棩蹇楁ā鏉匡紙鐢ㄤ簬鎼哄浜戞帴鍙ｈ皟鐢ㄨ褰曪級
+    /// 閫佽揣鍗曟棩蹇楁ā鏉匡紙鐢ㄤ簬鎼哄浜戞帴鍙ｈ皟鐢ㄨ褰曪級
     /// </summary>
     private string _logMessageDHD = "";
 
     /// <summary>
-    ///     閫佽揣鍗曟潯鐮佹棩蹇楁ā鏉匡紙鐢ㄤ簬鎼哄浜戞帴鍙ｈ皟鐢ㄨ褰曪級
-    /// </summary>
-    private string _logMessageDhdBar = "";
-
-    /// <summary>
-    ///     閫佽揣鍗曟槑缁嗘棩蹇楁ā鏉匡紙鐢ㄤ簬鎼哄浜戞帴鍙ｈ皟鐢ㄨ褰曪級
+    /// 閫佽揣鍗曟槑缁嗘棩蹇楁ā鏉匡紙鐢ㄤ簬鎼哄浜戞帴鍙ｈ皟鐢ㄨ褰曪級
     /// </summary>
     private string _logMessageDhdDetail = "";
 
     /// <summary>
-    ///     閫佽揣鍗曡揣鐗╅�佽揪鏃ュ織妯℃澘锛堢敤浜庢惡瀹簯鎺ュ彛璋冪敤璁板綍锛�
+    /// 閫佽揣鍗曟潯鐮佹棩蹇楁ā鏉匡紙鐢ㄤ簬鎼哄浜戞帴鍙ｈ皟鐢ㄨ褰曪級
+    /// </summary>
+    private string _logMessageDhdBar = "";
+
+    /// <summary>
+    /// 閫佽揣鍗曡揣鐗╅�佽揪鏃ュ織妯℃澘锛堢敤浜庢惡瀹簯鎺ュ彛璋冪敤璁板綍锛�
     /// </summary>
     private string _logMessageDhdHwsd = "";
 
@@ -42,62 +42,58 @@
         /// <summary>
         /// 璇锋眰鎶ユ枃缂撳瓨锛堝瓨鍌ㄥ簭鍒楀寲鍚庣殑JSON璇锋眰鍐呭锛�
         /// </summary>
-        var _requestJson = string.Empty;
+        string _requestJson = string.Empty;
 
         /// <summary>
         /// 鍔ㄦ�佸搷搴斿璞★紙瀛樺偍鍙嶅簭鍒楀寲鐨勬惡瀹簯鎺ュ彛鍝嶅簲锛�
         /// </summary>
-        dynamic _responseData = new ExpandoObject();
+         dynamic _responseData = new System.Dynamic.ExpandoObject();
 
         /// <summary>
         /// 鎺ュ彛鎵ц鏃堕棿鎴筹紙鏍煎紡锛歽yyy-MM-dd HH:mm:ss锛�
         /// </summary>
-        var _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+         string _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
 
         /// <summary>
         /// 鎺ュ彛璋冪敤鐘舵�侊紙0-澶辫触 1-鎴愬姛锛�
         /// </summary>
-        var sendStatus = 0;
+         int sendStatus = 0;
 
         try
         {
-            var ErrorMsg = "";
-            var Apiparam = ApiCommonParam.NewApiCommon();
+            string ErrorMsg = "";
+            ApiCommonParam Apiparam = ApiCommonParam.NewApiCommon();
 
             _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             //string data_inserted = "{\r\n  \"startDate\": 1746759300000,\r\n  \"endDate\": 1746762300000,\r\n  \"erpCode\": \"GXF001\"\r\n}";
-            var sendJson = JsonConvert.SerializeObject(entity);
-            var SQLStringList = new ArrayList();
+            string sendJson = JsonConvert.SerializeObject(entity);
+            ArrayList SQLStringList = new ArrayList();
             // var client = new HttpClient();
             var url = "https://openapi.xiekeyun.com/delivery/getNoList.json";
-            var httpClient = new HttpClient();
-            httpClient.DefaultRequestHeaders.Accept.Add(
-                new MediaTypeWithQualityHeaderValue("application/json"));
+            HttpClient httpClient = new HttpClient();
+            httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
 
-            _requestJson = "{\"commonParam\":" +
-                           JsonConvert.SerializeObject(Apiparam) +
-                           ",\"body\":" + sendJson + "}";
-            var postData = Encoding.UTF8.GetBytes(_requestJson);
+            _requestJson = "{\"commonParam\":" + JsonConvert.SerializeObject(Apiparam) + ",\"body\":" + sendJson + "}";
+            byte[] postData = Encoding.UTF8.GetBytes(_requestJson);
 
             // 鍒涘缓璇锋眰瀵硅薄
-            var request = (HttpWebRequest)WebRequest.Create(
-                "https://openapi.xiekeyun.com/delivery/getNoList.json");
+            HttpWebRequest request = (HttpWebRequest)WebRequest.Create("https://openapi.xiekeyun.com/delivery/getNoList.json");
             request.Method = "POST";
             request.ContentType = "application/json";
             request.ContentLength = postData.Length;
 
             // 鍙戦�佽姹傛暟鎹�
-            using (var stream = request.GetRequestStream())
+            using (Stream stream = request.GetRequestStream())
             {
                 stream.Write(postData, 0, postData.Length);
             }
 
             // 鍙戦�佽姹傚苟鑾峰彇鍝嶅簲
-            var response = (HttpWebResponse)request.GetResponse();
-            using (var stream = response.GetResponseStream())
-            using (var reader = new StreamReader(stream))
+            HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+            using (Stream stream = response.GetResponseStream())
+            using (StreamReader reader = new StreamReader(stream))
             {
-                var result2 = reader.ReadToEnd();
+                string result2 = reader.ReadToEnd();
 
                 _responseData = JsonConvert.DeserializeObject(result2);
             }
@@ -138,8 +134,7 @@
                 edtUserGuid: Guid.Parse("11111111-1111-1111-1111-111111111111"),
                 abtGuid: null,
                 abtTable: "DELIVERY_NOTICE",
-                detail: _logMessageDHD +
-                        $"绯荤粺寮傚父閿欒锛歿e.Message}\n璺熻釜锛歿e.StackTrace}",
+                detail: _logMessageDHD+ $"绯荤粺寮傚父閿欒锛歿e.Message}\n璺熻釜锛歿e.StackTrace}",
                 orderNo: "",
                 sendJson: _requestJson,
                 rtnJson: JsonConvert.SerializeObject(_responseData),
@@ -150,20 +145,19 @@
             );
             throw new Exception(e.Message);
         }
+
     }
 
     //瀵硅幏鍙栧埌鐨勬惡瀹簯閫佽揣鍗曞仛澶勭悊
     private int SaveDeliveryNotice(dynamic responseJson)
     {
         var result = 1;
-        List<DeliveryNotice> noticeList =
-            JsonConvert.DeserializeObject<List<DeliveryNotice>>(
-                responseJson.dataList.ToString());
+        List<DeliveryNotice> noticeList = JsonConvert.DeserializeObject<List<DeliveryNotice>>(responseJson.dataList.ToString());
 
         // 鏂板鍒楄〃绌哄�兼鏌�
         if (noticeList == null || !noticeList.Any() || noticeList.Count < 1)
         {
-            _logMessageDHD += "鏈鑾峰彇鏀惰揣鍗曟暟鎹负绌�";
+            _logMessageDHD += $"鏈鑾峰彇鏀惰揣鍗曟暟鎹负绌�";
             return result;
         }
 
@@ -171,42 +165,39 @@
         noticeList.ForEach(n => n.Id = Guid.NewGuid());
         noticeList.ForEach(n => n.orgId = "104554");
 
-        var deliveryNos =
-            noticeList.Select(n => n.DeliveryNo).Distinct().ToList();
+        var deliveryNos = noticeList.Select(n => n.DeliveryNo).Distinct().ToList();
         //var noticeIds = noticeList.Select(n => n.Id).ToList(); // 淇濇寔GUID绫诲瀷
 
         Db.Ado.UseTran(() =>
+        {
+            // 娣诲姞绌哄�兼鏌�
+            if (deliveryNos.Any())
             {
-                // 娣诲姞绌哄�兼鏌�
-                if (deliveryNos.Any())
-                {
-                    // 鍒犻櫎鍏宠仈閫佽揣鏄庣粏鏁版嵁
-                    Db.Deleteable<DeliveryNoticeDetail>()
-                        .Where(d => deliveryNos.Contains(d.DeliveryNo))
-                        .ExecuteCommand();
+                // 鍒犻櫎鍏宠仈閫佽揣鏄庣粏鏁版嵁
+                Db.Deleteable<DeliveryNoticeDetail>()
+                .Where(d => deliveryNos.Contains(d.DeliveryNo))
+                  .ExecuteCommand();
 
 
-                    //鍒犻櫎鍏宠仈閫佽揣鏉＄爜鏄庣粏
-                    Db.Deleteable<TblBarcodeInformation>()
-                        .Where(b => deliveryNos.Contains(b.DeliveryNo))
-                        .ExecuteCommand();
+                //鍒犻櫎鍏宠仈閫佽揣鏉＄爜鏄庣粏
+                Db.Deleteable<TblBarcodeInformation>()
+                  .Where(b => deliveryNos.Contains(b.DeliveryNo))
+                  .ExecuteCommand();
 
-                    //鍒犻櫎閫佽揣鍗�
-                    Db.Deleteable<DeliveryNotice>()
-                        .Where(n => deliveryNos.Contains(n.DeliveryNo))
-                        .ExecuteCommand();
-                }
+                //鍒犻櫎閫佽揣鍗�
+                Db.Deleteable<DeliveryNotice>()
+                  .Where(n => deliveryNos.Contains(n.DeliveryNo))
+                  .ExecuteCommand();
+            }
 
-                // 鎵归噺鎻掑叆浼樺寲
-                result = Db.Fastest<DeliveryNotice>().BulkCopy(noticeList);
-            },
-            ex =>
-            {
-                // 澧炲己寮傚父淇℃伅
-                //_logMessageDHD = _logMessageDHD + $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}";
-                throw new Exception(
-                    $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}");
-            });
+            // 鎵归噺鎻掑叆浼樺寲
+            result = Db.Fastest<DeliveryNotice>().BulkCopy(noticeList); 
+        }, 
+        ex => {
+            // 澧炲己寮傚父淇℃伅
+            //_logMessageDHD = _logMessageDHD + $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}";
+            throw new Exception($"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}");
+        });
 
         return result;
     }
@@ -218,59 +209,56 @@
         /// <summary>
         /// 璇锋眰鎶ユ枃缂撳瓨锛堝瓨鍌ㄥ簭鍒楀寲鍚庣殑JSON璇锋眰鍐呭锛�
         /// </summary>
-        var _requestJson = string.Empty;
+        string _requestJson = string.Empty;
 
         /// <summary>
         /// 鍔ㄦ�佸搷搴斿璞★紙瀛樺偍鍙嶅簭鍒楀寲鐨勬惡瀹簯鎺ュ彛鍝嶅簲锛�
         /// </summary>
-        dynamic _responseData = new ExpandoObject();
+        dynamic _responseData = new System.Dynamic.ExpandoObject();
 
         /// <summary>
         /// 鎺ュ彛鎵ц鏃堕棿锛堟牸寮忥細yyyy-MM-dd HH:mm:ss锛�
         /// </summary>
-        var _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+        string _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
 
         /// <summary>
         /// 鎺ュ彛璋冪敤鐘舵�侊紙0-澶辫触 1-鎴愬姛锛�
         /// </summary>
-        var sendStatus = 0;
+        int sendStatus = 0;
 
         try
         {
-            var ErrorMsg = "";
-            var Apiparam = ApiCommonParam.NewApiCommon();
+            string ErrorMsg = "";
+            ApiCommonParam Apiparam = ApiCommonParam.NewApiCommon();
 
             _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-            var sendJson = JsonConvert.SerializeObject(entity);
-            var SQLStringList = new ArrayList();
+            string sendJson = JsonConvert.SerializeObject(entity);
+            ArrayList SQLStringList = new ArrayList();
             var url = "https://openapi.xiekeyun.com/delivery/getDetail.json";
-            var httpClient = new HttpClient();
-            httpClient.DefaultRequestHeaders.Accept.Add(
-                new MediaTypeWithQualityHeaderValue("application/json"));
+            HttpClient httpClient = new HttpClient();
+            httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
 
-            _requestJson = "{\"commonParam\":" +
-                           JsonConvert.SerializeObject(Apiparam) +
-                           ",\"body\":" + sendJson + "}";
-            var postData = Encoding.UTF8.GetBytes(_requestJson);
+            _requestJson = "{\"commonParam\":" + JsonConvert.SerializeObject(Apiparam) + ",\"body\":" + sendJson + "}";
+            byte[] postData = Encoding.UTF8.GetBytes(_requestJson);
 
             // 鍒涘缓璇锋眰瀵硅薄
-            var request = (HttpWebRequest)WebRequest.Create(url);
+            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
             request.Method = "POST";
             request.ContentType = "application/json";
             request.ContentLength = postData.Length;
 
             // 鍙戦�佽姹傛暟鎹�
-            using (var stream = request.GetRequestStream())
+            using (Stream stream = request.GetRequestStream())
             {
                 stream.Write(postData, 0, postData.Length);
             }
 
             // 鍙戦�佽姹傚苟鑾峰彇鍝嶅簲
-            var response = (HttpWebResponse)request.GetResponse();
-            using (var stream = response.GetResponseStream())
-            using (var reader = new StreamReader(stream))
+            HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+            using (Stream stream = response.GetResponseStream())
+            using (StreamReader reader = new StreamReader(stream))
             {
-                var result2 = reader.ReadToEnd();
+                string result2 = reader.ReadToEnd();
 
                 _responseData = JsonConvert.DeserializeObject(result2);
             }
@@ -311,8 +299,7 @@
                 edtUserGuid: Guid.Parse("11111111-1111-1111-1111-111111111111"),
                 abtGuid: null,
                 abtTable: "DELIVERY_NOTICE_DETAIL",
-                detail: _logMessageDhdDetail +
-                        $"绯荤粺寮傚父閿欒锛歿e.Message}\n璺熻釜锛歿e.StackTrace}",
+                detail: _logMessageDhdDetail + $"绯荤粺寮傚父閿欒锛歿e.Message}\n璺熻釜锛歿e.StackTrace}",
                 orderNo: "",
                 sendJson: _requestJson,
                 rtnJson: JsonConvert.SerializeObject(_responseData),
@@ -323,21 +310,21 @@
             );
             throw new Exception(e.Message);
         }
+
     }
 
     //瀵硅幏鍙栧埌鐨勬惡瀹簯閫佽揣鍗曞仛澶勭悊
-    private int SaveDeliveryNoticeDetail(dynamic responseJson,
-        string deliveryNo)
+    private int SaveDeliveryNoticeDetail(dynamic responseJson,string deliveryNo)
     {
         var result = 1;
         // 杞崲purchaseDesc瀵硅薄涓哄瓧绗︿覆
         var jsonData = JArray.Parse(responseJson.data.lineList.ToString());
         foreach (var item in jsonData)
-            item["purchaseDesc"] =
-                item["purchaseDesc"]?.ToString(Formatting.None);
-
-        List<DeliveryNoticeDetail> noticeList =
-            jsonData.ToObject<List<DeliveryNoticeDetail>>();
+        {
+                item["purchaseDesc"] = item["purchaseDesc"]?.ToString(Formatting.None);
+        }
+        
+        List<DeliveryNoticeDetail> noticeList = jsonData.ToObject<List<DeliveryNoticeDetail>>();
 
         // 鏂板鍒楄〃绌哄�兼鏌�
         if (noticeList == null || !noticeList.Any() || noticeList.Count < 1)
@@ -349,9 +336,10 @@
 
         // 鑾峰彇閫佽揣鍗曞彿骞舵牎楠�
         var deliveryNoObj = responseJson.data.deliveryNo;
-        if (deliveryNoObj == null ||
-            string.IsNullOrEmpty(deliveryNoObj.ToString()))
+        if (deliveryNoObj == null || string.IsNullOrEmpty(deliveryNoObj.ToString()))
+        {
             throw new Exception($"銆愬紓甯搞�戣幏鍙栭�佽揣鍗曞け璐ワ細{responseJson}");
+        }
         deliveryNo = deliveryNoObj.ToString();
 
         //璧嬪�糶uid鍜屽埌璐у崟鍙�
@@ -361,23 +349,20 @@
 
 
         Db.Ado.UseTran(() =>
-            {
-                // 鍒犻櫎鍏宠仈閫佽揣鏄庣粏鏁版嵁
-                Db.Deleteable<DeliveryNoticeDetail>()
-                    .Where(d => d.DeliveryNo == deliveryNo)
-                    .ExecuteCommand();
+        {
+            // 鍒犻櫎鍏宠仈閫佽揣鏄庣粏鏁版嵁
+            Db.Deleteable<DeliveryNoticeDetail>()
+            .Where(d => d.DeliveryNo == deliveryNo)
+              .ExecuteCommand();
 
-                // 鎵归噺鎻掑叆浼樺寲
-                result = Db.Fastest<DeliveryNoticeDetail>()
-                    .BulkCopy(noticeList);
-            },
-            ex =>
-            {
-                // 澧炲己寮傚父淇℃伅
-                //_logMessageDhdDetail = _logMessageDhdDetail + $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}";
-                throw new Exception(
-                    $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}");
-            });
+            // 鎵归噺鎻掑叆浼樺寲
+            result = Db.Fastest<DeliveryNoticeDetail>().BulkCopy(noticeList);
+        },
+        ex => {
+            // 澧炲己寮傚父淇℃伅
+            //_logMessageDhdDetail = _logMessageDhdDetail + $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}";
+            throw new Exception($"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}");
+        });
 
         return result;
     }
@@ -389,59 +374,56 @@
         /// <summary>
         /// 璇锋眰鎶ユ枃缂撳瓨锛堝瓨鍌ㄥ簭鍒楀寲鍚庣殑JSON璇锋眰鍐呭锛�
         /// </summary>
-        var _requestJson = string.Empty;
+        string _requestJson = string.Empty;
 
         /// <summary>
         /// 鍔ㄦ�佸搷搴斿璞★紙瀛樺偍鍙嶅簭鍒楀寲鐨勬惡瀹簯鎺ュ彛鍝嶅簲锛�
         /// </summary>
-        dynamic _responseData = new ExpandoObject();
+        dynamic _responseData = new System.Dynamic.ExpandoObject();
 
         /// <summary>
         /// 鎺ュ彛鎵ц鏃堕棿锛堟牸寮忥細yyyy-MM-dd HH:mm:ss锛�
         /// </summary>
-        var _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+        string _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
 
         /// <summary>
         /// 鎺ュ彛璋冪敤鐘舵�侊紙0-澶辫触 1-鎴愬姛锛�
         /// </summary>
-        var sendStatus = 0;
+        int sendStatus = 0;
 
         try
         {
-            var ErrorMsg = "";
-            var Apiparam = ApiCommonParam.NewApiCommon();
+            string ErrorMsg = "";
+            ApiCommonParam Apiparam = ApiCommonParam.NewApiCommon();
 
             _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-            var sendJson = JsonConvert.SerializeObject(entity);
-            var SQLStringList = new ArrayList();
+            string sendJson = JsonConvert.SerializeObject(entity);
+            ArrayList SQLStringList = new ArrayList();
             var url = "https://openapi.xiekeyun.com/barcode/byDeliveryNo.json";
-            var httpClient = new HttpClient();
-            httpClient.DefaultRequestHeaders.Accept.Add(
-                new MediaTypeWithQualityHeaderValue("application/json"));
+            HttpClient httpClient = new HttpClient();
+            httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
 
-            _requestJson = "{\"commonParam\":" +
-                           JsonConvert.SerializeObject(Apiparam) +
-                           ",\"body\":" + sendJson + "}";
-            var postData = Encoding.UTF8.GetBytes(_requestJson);
+            _requestJson = "{\"commonParam\":" + JsonConvert.SerializeObject(Apiparam) + ",\"body\":" + sendJson + "}";
+            byte[] postData = Encoding.UTF8.GetBytes(_requestJson);
 
             // 鍒涘缓璇锋眰瀵硅薄
-            var request = (HttpWebRequest)WebRequest.Create(url);
+            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
             request.Method = "POST";
             request.ContentType = "application/json";
             request.ContentLength = postData.Length;
 
             // 鍙戦�佽姹傛暟鎹�
-            using (var stream = request.GetRequestStream())
+            using (Stream stream = request.GetRequestStream())
             {
                 stream.Write(postData, 0, postData.Length);
             }
 
             // 鍙戦�佽姹傚苟鑾峰彇鍝嶅簲
-            var response = (HttpWebResponse)request.GetResponse();
-            using (var stream = response.GetResponseStream())
-            using (var reader = new StreamReader(stream))
+            HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+            using (Stream stream = response.GetResponseStream())
+            using (StreamReader reader = new StreamReader(stream))
             {
-                var result2 = reader.ReadToEnd();
+                string result2 = reader.ReadToEnd();
 
                 _responseData = JsonConvert.DeserializeObject(result2);
             }
@@ -482,8 +464,7 @@
                 edtUserGuid: Guid.Parse("11111111-1111-1111-1111-111111111111"),
                 abtGuid: null,
                 abtTable: "TBL_BARCODE_INFORMATION",
-                detail: _logMessageDhdBar +
-                        $"绯荤粺寮傚父閿欒锛歿e.Message}\n璺熻釜锛歿e.StackTrace}",
+                detail: _logMessageDhdBar + $"绯荤粺寮傚父閿欒锛歿e.Message}\n璺熻釜锛歿e.StackTrace}",
                 orderNo: "",
                 sendJson: _requestJson,
                 rtnJson: JsonConvert.SerializeObject(_responseData),
@@ -494,15 +475,14 @@
             );
             throw new Exception(e.Message);
         }
+
     }
 
     //瀵硅幏鍙栧埌鐨勬惡瀹簯閫佽揣鍗曟潯鐮佸仛澶勭悊
-    private int SaveDeliveryNoticeBar(dynamic responseJson, string deliveryNo)
+    private int SaveDeliveryNoticeBar(dynamic responseJson,string deliveryNo)
     {
         var result = 1;
-        List<XkyBarcodeDataDto> noticeList =
-            JsonConvert.DeserializeObject<List<XkyBarcodeDataDto>>(
-                responseJson.dataList.ToString());
+        List<XkyBarcodeDataDto> noticeList = JsonConvert.DeserializeObject<List<XkyBarcodeDataDto>>(responseJson.dataList.ToString());
 
         if (noticeList == null || !noticeList.Any())
         {
@@ -547,31 +527,28 @@
             Customize3 = n.DynamicData?.Customize3,
 
             // 鍏朵粬瀛楁
-            DnLines =
-                n.DnLines // 鏍规嵁鏁版嵁搴撴敞閲婏紝ExtendN01瀵瑰簲椤圭洰(鍗曡韩extendN01)锛岃繖閲屾槧灏刣nLines
+            DnLines = n.DnLines // 鏍规嵁鏁版嵁搴撴敞閲婏紝ExtendN01瀵瑰簲椤圭洰(鍗曡韩extendN01)锛岃繖閲屾槧灏刣nLines
         }).ToList();
 
-        Db.Ado.UseTran(() =>
-            {
-                // 鍒犻櫎鍏宠仈閫佽揣鏄庣粏鏁版嵁
-                Db.Deleteable<TblBarcodeInformation>()
-                    .Where(d => d.DeliveryNo == deliveryNo)
-                    .ExecuteCommand();
+        Db.Ado.UseTran(() => 
+        {
+            // 鍒犻櫎鍏宠仈閫佽揣鏄庣粏鏁版嵁
+            Db.Deleteable<TblBarcodeInformation>()
+            .Where(d => d.DeliveryNo == deliveryNo)
+            .ExecuteCommand();
 
-                // 鎵归噺鎻掑叆浼樺寲锛堜娇鐢ㄦ纭殑barcodeList锛�
-                result = Db.Fastest<TblBarcodeInformation>()
-                    .BulkCopy(barcodeList);
-            },
-            ex =>
-            {
-                // 澧炲己寮傚父淇℃伅
-                //_logMessageDhdBar = _logMessageDhdBar + $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}";
-                throw new Exception(
-                    $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}");
-            });
+            // 鎵归噺鎻掑叆浼樺寲锛堜娇鐢ㄦ纭殑barcodeList锛�
+            result = Db.Fastest<TblBarcodeInformation>().BulkCopy(barcodeList);
+        },
+        ex => {
+            // 澧炲己寮傚父淇℃伅
+            //_logMessageDhdBar = _logMessageDhdBar + $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}";
+            throw new Exception($"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}");
+        });
 
         return result;
     }
+
 
 
     public dynamic GetXkyHwsd(XKYGetDhdHwsdRequest entity)
@@ -580,60 +557,56 @@
         /// <summary>
         /// 璇锋眰鎶ユ枃缂撳瓨锛堝瓨鍌ㄥ簭鍒楀寲鍚庣殑JSON璇锋眰鍐呭锛�
         /// </summary>
-        var _requestJson = string.Empty;
+        string _requestJson = string.Empty;
 
         /// <summary>
         /// 鍔ㄦ�佸搷搴斿璞★紙瀛樺偍鍙嶅簭鍒楀寲鐨勬惡瀹簯鎺ュ彛鍝嶅簲锛�
         /// </summary>
-        dynamic _responseData = new ExpandoObject();
+        dynamic _responseData = new System.Dynamic.ExpandoObject();
 
         /// <summary>
         /// 鎺ュ彛鎵ц鏃堕棿锛堟牸寮忥細yyyy-MM-dd HH:mm:ss锛�
         /// </summary>
-        var _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+        string _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
 
         /// <summary>
         /// 鎺ュ彛璋冪敤鐘舵�侊紙0-澶辫触 1-鎴愬姛锛�
         /// </summary>
-        var sendStatus = 0;
+        int sendStatus = 0;
 
         try
         {
-            var ErrorMsg = "";
-            var Apiparam = ApiCommonParam.NewApiCommon();
+            string ErrorMsg = "";
+            ApiCommonParam Apiparam = ApiCommonParam.NewApiCommon();
 
             _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-            var sendJson = JsonConvert.SerializeObject(entity);
-            var SQLStringList = new ArrayList();
-            var url =
-                "https://openapi.xiekeyun.com/delivery/updateDeliveryStatus.json";
-            var httpClient = new HttpClient();
-            httpClient.DefaultRequestHeaders.Accept.Add(
-                new MediaTypeWithQualityHeaderValue("application/json"));
+            string sendJson = JsonConvert.SerializeObject(entity);
+            ArrayList SQLStringList = new ArrayList();
+            var url = "https://openapi.xiekeyun.com/delivery/updateDeliveryStatus.json";
+            HttpClient httpClient = new HttpClient();
+            httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
 
-            _requestJson = "{\"commonParam\":" +
-                           JsonConvert.SerializeObject(Apiparam) +
-                           ",\"body\":" + sendJson + "}";
-            var postData = Encoding.UTF8.GetBytes(_requestJson);
+            _requestJson = "{\"commonParam\":" + JsonConvert.SerializeObject(Apiparam) + ",\"body\":" + sendJson + "}";
+            byte[] postData = Encoding.UTF8.GetBytes(_requestJson);
 
             // 鍒涘缓璇锋眰瀵硅薄
-            var request = (HttpWebRequest)WebRequest.Create(url);
+            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
             request.Method = "POST";
             request.ContentType = "application/json";
             request.ContentLength = postData.Length;
 
             // 鍙戦�佽姹傛暟鎹�
-            using (var stream = request.GetRequestStream())
+            using (Stream stream = request.GetRequestStream())
             {
                 stream.Write(postData, 0, postData.Length);
             }
 
             // 鍙戦�佽姹傚苟鑾峰彇鍝嶅簲
-            var response = (HttpWebResponse)request.GetResponse();
-            using (var stream = response.GetResponseStream())
-            using (var reader = new StreamReader(stream))
+            HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+            using (Stream stream = response.GetResponseStream())
+            using (StreamReader reader = new StreamReader(stream))
             {
-                var result2 = reader.ReadToEnd();
+                string result2 = reader.ReadToEnd();
 
                 _responseData = JsonConvert.DeserializeObject(result2);
             }
@@ -669,8 +642,7 @@
                 edtUserGuid: Guid.Parse("11111111-1111-1111-1111-111111111111"),
                 abtGuid: null,
                 abtTable: "MES_INV_ITEM_ARN",
-                detail: _logMessageDhdBar +
-                        $"绯荤粺寮傚父閿欒锛歿e.Message}\n璺熻釜锛歿e.StackTrace}",
+                detail: _logMessageDhdBar + $"绯荤粺寮傚父閿欒锛歿e.Message}\n璺熻釜锛歿e.StackTrace}",
                 orderNo: "",
                 sendJson: _requestJson,
                 rtnJson: JsonConvert.SerializeObject(_responseData),
@@ -681,5 +653,6 @@
             );
             throw new Exception(e.Message);
         }
+
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3