wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
马健
2024-09-04 09:08:56 +08:00
parent 6a5580bf3c cddca2a10a
commit 29a88e8349
9 changed files with 119 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -2505,8 +2505,8 @@ namespace Tnb.ProductionMgr
Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
erpRequestData.Add("auditer",erpCreateId);
erpRequestData.Add("billmaker",erpCreateId);
erpRequestData.Add("cdeptid","1001A1100000000JRLI1");//部门先写死
erpRequestData.Add("cdeptvid","0001A11000000007GGO8");//部门先写死
erpRequestData.Add("cdeptid","1001A1100000001JFOPQ");//部门先写死
erpRequestData.Add("cdeptvid","0001A1100000000AOMIQ");//部门先写死
erpRequestData.Add("taudittime",nowStr);
erpRequestData.Add("creationtime",nowStr);
erpRequestData.Add("creator",erpCreateId);
@@ -2524,8 +2524,8 @@ namespace Tnb.ProductionMgr
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
erpRequestDataDetails.Add(new Dictionary<string, object>()
{
["cbdeptid"] = "1001A1100000000JRLI1",//部门先写死
["cbdeptvid"] = "0001A11000000007GGO8",//部门先写死
["cbdeptid"] = "1001A1100000001JFOPQ",//部门先写死
["cbdeptvid"] = "0001A1100000000AOMIQ",//部门先写死
["cbmainmaterialid"] = erpExtendFields.Find(x=>x.table_id==report.material_id)?.cmaterialoid ?? "",
["cbmainmaterialvid"] = erpExtendFields.Find(x=>x.table_id==report.material_id)?.cmaterialvid ?? "",
["cbmaterialid"] = erpExtendFields.Find(x=>x.table_id==report.material_id)?.cmaterialvid ?? "",

9
ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs
View File

@@ -744,7 +744,14 @@ namespace Tnb.ProductionMgr
elapsedMilliseconds = stopwatch.ElapsedMilliseconds;
try
{
thirdResult = JsonConvert.DeserializeObject<ThirdResult>(response);
if (response != null && !response.IsEmpty())
{
thirdResult = JsonConvert.DeserializeObject<ThirdResult>(response);
}
else
{
thirdResult.Code = 500;
}
}
catch (Exception e)
{