From 332b3bd991a4c973e23793f473b9617f008def04 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期日, 13 十月 2024 08:56:35 +0800
Subject: [PATCH] Revert "修改问题"
---
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 67 ++++++++++++++++-----------------
1 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index c09515a..34dfe6f 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -373,49 +373,48 @@
rowDetailCount = Db.Ado.ExecuteCommand(sqlDetailStr);
}
Db.Ado.CommitTran();
- //if (rowCount > 0 && rowDetailCount > 0) 鍒ゆ柇闇�瑕佹坊鍔犱笂鍗曟嵁绫诲瀷
- //{
- // new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鍗曟嵁", model.ASNNo, "娣诲姞", $"娣诲姞浜嗗崟鎹彿涓簕model.ASNNo}鐨勫崟鎹俊鎭�", Convert.ToInt32(model.CreateUser));
+ if (rowCount > 0 && rowDetailCount > 0)
+ {
+ new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鍗曟嵁", model.ASNNo, "娣诲姞", $"娣诲姞浜嗗崟鎹彿涓簕model.ASNNo}鐨勫崟鎹俊鎭�", Convert.ToInt32(model.CreateUser));
- // if (addOder.Count > 0)
- // {
- // // 姝ｅ紡杩愯绋嬪簭鏀惧紑
- // var jsonData = JsonConvert.SerializeObject(addOder);
- // string response = "";
+ if (addOder.Count > 0)
+ {
+ // 姝ｅ紡杩愯绋嬪簭鏀惧紑
+ 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");
- // //////瑙ｆ瀽杩斿洖鏁版嵁
- // var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
- // if (wcsModel.StatusCode == 0)
- // {
+ //////瑙ｆ瀽杩斿洖鏁版嵁
+ var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
+ if (wcsModel.StatusCode == 0)
+ {
- // }
- // if (wcsModel.StatusCode == -1)
- // {
+ }
+ if (wcsModel.StatusCode == -1)
+ {
- // }
- // }
- // catch (Exception ex)
- // {
- // throw new Exception(ex.Message);
- // }
- // }
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
return strMessage;
- //}
- //else
- //{
- // Db.Ado.RollbackTran();
- // return "-2:娣诲姞澶辫触鏁版嵁鍥炴粴!";
- //}
+ }
+ else
+ {
+ Db.Ado.RollbackTran();
+ return "-2:娣诲姞澶辫触鏁版嵁鍥炴粴!";
+ }
}
catch (Exception ex)
{
- Db.Ado.RollbackTran();
throw new Exception(ex.Message);
}
}
--
Gitblit v1.8.0