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

bug

Browse Source
This commit is contained in:
周科达
2024-07-17 12:07:27 +08:00
parent ff038ff1d5
commit 96875e8afc
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BasicData/Tnb.BasicData/ThirdApiRecordService.cs
View File

@@ -50,7 +50,7 @@ namespace Tnb.BasicData
stopwatch.Stop(); stopwatch.Stop();
var elapsedMilliseconds = stopwatch.ElapsedMilliseconds; var elapsedMilliseconds = stopwatch.ElapsedMilliseconds;
ThirdResult thirdResult = null; ThirdResult thirdResult = new ThirdResult();
try try
{ {
thirdResult = JsonConvert.DeserializeObject<ThirdResult>(response); thirdResult = JsonConvert.DeserializeObject<ThirdResult>(response);

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

@@ -461,7 +461,7 @@ namespace Tnb.ProductionMgr
Stopwatch stopwatch = null; Stopwatch stopwatch = null;
string response = ""; string response = "";
var elapsedMilliseconds = 0l; var elapsedMilliseconds = 0l;
ThirdResult thirdResult = null; ThirdResult thirdResult = new ThirdResult();
foreach (var record in records) foreach (var record in records)
{ {
now = DateTime.Now; now = DateTime.Now;

4
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -2396,8 +2396,8 @@ namespace Tnb.WarehouseMgr
["cbodytranstypecode"] = "4A-01", ["cbodytranstypecode"] = "4A-01",
["cbodywarehouseid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "", ["cbodywarehouseid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "",
["cgeneralbid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "", ["cgeneralbid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "",
["cgeneralbid"] = item.id, ["cgeneralbid"] = item.erp_line_pk ?? "",
["cgeneralhid"] = item.bill_id, ["cgeneralhid"] = wmsMaterialTransfer.erp_pk ?? "",
["cmaterialoid"] = erpExtendFields.Find(x=>x.table_id==item.material_id)?.cmaterialoid ?? "", ["cmaterialoid"] = erpExtendFields.Find(x=>x.table_id==item.material_id)?.cmaterialoid ?? "",
["cmaterialvid"] = erpExtendFields.Find(x=>x.table_id==item.material_id)?.cmaterialvid ?? "", ["cmaterialvid"] = erpExtendFields.Find(x=>x.table_id==item.material_id)?.cmaterialvid ?? "",
["corpoid"] = erpOrg.corpoid, ["corpoid"] = erpOrg.corpoid,

7
WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
View File

@@ -641,7 +641,6 @@ namespace Tnb.WarehouseMgr
ids.Add(wmsMaterialTransfer.warehouse_instock); ids.Add(wmsMaterialTransfer.warehouse_instock);
ids.Add(wmsMaterialTransferd.material_id); ids.Add(wmsMaterialTransferd.material_id);
ids.Add(unitData.Id); ids.Add(unitData.Id);
List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x=>ids.Contains(x.table_id)).ToListAsync(); List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x=>ids.Contains(x.table_id)).ToListAsync();
ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (wmsMaterialTransfer.org_id ?? WmsWareHouseConst.AdministratorOrgId)); ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (wmsMaterialTransfer.org_id ?? WmsWareHouseConst.AdministratorOrgId));
@@ -655,7 +654,7 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("cdptvid","0001A11000000007GGO8");// 先写死 erpRequestData.Add("cdptvid","0001A11000000007GGO8");// 先写死
erpRequestData.Add("corpoid",erpOrg.corpoid); erpRequestData.Add("corpoid",erpOrg.corpoid);
erpRequestData.Add("corpvid",erpOrg.corpoid); erpRequestData.Add("corpvid",erpOrg.corpoid);
erpRequestData.Add("cothercalbodyoid",erpOrg.cdptid); erpRequestData.Add("cothercalbodyoid",erpOrg.pk_org);
erpRequestData.Add("cotherwhid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? ""); erpRequestData.Add("cotherwhid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "");
erpRequestData.Add("creationtime",nowStr); erpRequestData.Add("creationtime",nowStr);
erpRequestData.Add("creator",erpCreateId); erpRequestData.Add("creator",erpCreateId);
@@ -679,8 +678,8 @@ namespace Tnb.WarehouseMgr
["corpoid"] = erpOrg.corpoid, ["corpoid"] = erpOrg.corpoid,
["corpvid"] = erpOrg.corpvid, ["corpvid"] = erpOrg.corpvid,
["crowno"] = (dList.FindIndex(x=>x.id==wmsMaterialTransferd.id)+1) * 10, ["crowno"] = (dList.FindIndex(x=>x.id==wmsMaterialTransferd.id)+1) * 10,
["csourcebillbid"] = wmsMaterialTransferd.id, ["csourcebillbid"] = wmsMaterialTransferd.erp_line_pk ?? "",
["csourcebillhid"] = wmsMaterialTransferd.bill_id, ["csourcebillhid"] = wmsMaterialTransfer.erp_pk ?? "",
["cunitid"] = erpExtendFields.Find(x=>x.table_id==unitData.Id)?.cunitid ?? "", ["cunitid"] = erpExtendFields.Find(x=>x.table_id==unitData.Id)?.cunitid ?? "",
["cvendorid"] = "", ["cvendorid"] = "",
["cvendorvid"] = "", ["cvendorvid"] = "",