From 73e496b9892fde5898b31b6cc817d4565a3f974e Mon Sep 17 00:00:00 2001
From: zhou keda <1315948824@qq.com>
Date: Tue, 16 Jul 2024 17:26:49 +0800
Subject: [PATCH] bug

---
 BasicData/Tnb.BasicData/ThirdApiRecordService.cs      | 11 ++++++++++-
 WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs     |  4 ++--
 .../Tnb.WarehouseMgr/WmsMaterialTransferService.cs    |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/BasicData/Tnb.BasicData/ThirdApiRecordService.cs b/BasicData/Tnb.BasicData/ThirdApiRecordService.cs
index 33ecc31a..742ed849 100644
--- a/BasicData/Tnb.BasicData/ThirdApiRecordService.cs
+++ b/BasicData/Tnb.BasicData/ThirdApiRecordService.cs
@@ -50,7 +50,16 @@ namespace Tnb.BasicData
             
             stopwatch.Stop();
             var elapsedMilliseconds = stopwatch.ElapsedMilliseconds;
-            ThirdResult thirdResult = JsonConvert.DeserializeObject<ThirdResult>(response);
+            ThirdResult thirdResult = null;
+            try
+            {
+                thirdResult = JsonConvert.DeserializeObject<ThirdResult>(response);
+            }
+            catch (Exception e)
+            {
+                thirdResult.Code = 500;
+                thirdResult.msgResult = response;
+            }
             if (thirdResult.Code == 200)
             {
                 await db.Updateable<ThirdWebapiRecord>()
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 2e5738d7..d972d069 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -2367,7 +2367,7 @@ namespace Tnb.WarehouseMgr
                             List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x=>ids.Contains(x.table_id)).ToListAsync();
                             string erpCreateId = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.create_id)?.user_id ?? "";
                             ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (wmsMaterialTransfer.org_id ?? WmsWareHouseConst.AdministratorOrgId));
-                            string nowStr = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss");
+                            string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                             
                             List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
                             Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
@@ -2423,7 +2423,7 @@ namespace Tnb.WarehouseMgr
                             thirdWebapiRecord.name = "其它入库";
                             thirdWebapiRecord.method = "POST";
                             thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN+"uapws/rest/generalin/save";
-                            thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData);
+                            thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
                             thirdWebapiRecord.create_time = DateTime.Now;
 
                             await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
index 991b0816..0e14bb2b 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
@@ -649,7 +649,7 @@ namespace Tnb.WarehouseMgr
 
                 List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
                 Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
-                string nowStr = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss");
+                string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                 erpRequestData.Add("billmaker",erpCreateId);
                 erpRequestData.Add("cdptid","1001A1100000000JRLI1A100");// 先写死
                 erpRequestData.Add("cdptvid","0001A11000000007GGO8");// 先写死