From 5ce969ed34e91c931cce38e2feb5d2c208633a96 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期日, 03 十一月 2024 18:34:53 +0800
Subject: [PATCH] 修改问题

---
 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs |   53 +++++++++++++++++++++++++++--------------------------
 1 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 242eccd..d7eeeee 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -394,7 +394,7 @@
                     sqlDetailStr += "LotNo,LotText,Qty,PackagNo,Price,Money,IsBale,IsBelt,SupplierLot,Status,Lot1,Lot2,UDF1,UDF2,UDF3,UDF4,UDF5,CreateUser) values ( ";
                     sqlDetailStr += $"'{model.ASNNo}','{detailModel.SkuNo}','{detailModel.SkuName}','{detailModel.Standard}', ";
                     sqlDetailStr += $"'{detailModel.LotNo}','{detailModel.LotText}','{detailModel.Qty}','{detailModel.PackagNo}','{detailModel.Price}', ";
-                    sqlDetailStr += $"'{detailModel.Money},'{detailModel.IsBale}','{detailModel.IsBelt}','{detailModel.SupplierLot}','0','{detailModel.Lot1}','{detailModel.Lot2}', ";
+                    sqlDetailStr += $"'{detailModel.Money}','{detailModel.IsBale}','{detailModel.IsBelt}','{detailModel.SupplierLot}','0','{detailModel.Lot1}','{detailModel.Lot2}', ";
                     sqlDetailStr += $"'{detailModel.UDF1}','{detailModel.UDF2}','{detailModel.UDF3}','{detailModel.UDF4}','{detailModel.UDF5}','{model.CreateUser}');";
 
                     if (model.Type == "0")//鎴愬搧鍏ュ簱鍗曚笅鍙慦CS淇℃伅
@@ -429,34 +429,34 @@
                 {
                     new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鍗曟嵁", model.ASNNo, "娣诲姞", $"娣诲姞浜嗗崟鎹彿涓簕model.ASNNo}鐨勫崟鎹俊鎭�", Convert.ToInt32(model.CreateUser));
 
-                    //if (addOder.Count > 0)
-                    //{
-                    //    // 姝e紡杩愯绋嬪簭鏀惧紑
-                    //    var jsonData = JsonConvert.SerializeObject(addOder);
-                    //    string response = "";
+                    if (addOder.Count > 0)
+                    {
+                        // 姝e紡杩愯绋嬪簭鏀惧紑
+                        var jsonData = JsonConvert.SerializeObject(addOder);
+                        string response = "";
 
-                    //    try
-                    //    {
-                    //        var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
-                    //        //缁橶CS涓嬪彂鍏ュ簱鍗曚俊鎭�
-                    //        response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
+                        try
+                        {
+                            var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+                            //缁橶CS涓嬪彂鍏ュ簱鍗曚俊鎭�
+                            response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
 
-                    //        //////瑙f瀽杩斿洖鏁版嵁 
-                    //        var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
-                    //        if (wcsModel.StatusCode == 0)
-                    //        {
-                                
-                    //        }
-                    //        if (wcsModel.StatusCode == -1)
-                    //        {
+                            //瑙f瀽杩斿洖鏁版嵁 
+                            var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
+                            if (wcsModel.StatusCode == 0)
+                            {
 
-                    //        }
-                    //    }
-                    //    catch (Exception ex)
-                    //    {
-                    //        throw new Exception(ex.Message);
-                    //    }
-                    //}
+                            }
+                            if (wcsModel.StatusCode == -1)
+                            {
+                                throw new Exception($"涓嬪彂WCS澶辫触锛歿wcsModel.Msg}");
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            throw new Exception(ex.Message);
+                        }
+                    }
                     return strMessage;
                 }
                 else
@@ -467,6 +467,7 @@
             }
             catch (Exception ex)
             {
+                Db.Ado.RollbackTran();
                 throw new Exception(ex.Message);
             }
         }

--
Gitblit v1.8.0