From 96875e8afc0b83342941510ec5db9b4b91c876a6 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Wed, 17 Jul 2024 12:07:27 +0800 Subject: [PATCH] bug --- BasicData/Tnb.BasicData/ThirdApiRecordService.cs | 2 +- ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs | 2 +- WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs | 4 ++-- .../Tnb.WarehouseMgr/WmsMaterialTransferService.cs | 7 +++---- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/BasicData/Tnb.BasicData/ThirdApiRecordService.cs b/BasicData/Tnb.BasicData/ThirdApiRecordService.cs index 742ed849..d6bfbd27 100644 --- a/BasicData/Tnb.BasicData/ThirdApiRecordService.cs +++ b/BasicData/Tnb.BasicData/ThirdApiRecordService.cs @@ -50,7 +50,7 @@ namespace Tnb.BasicData stopwatch.Stop(); var elapsedMilliseconds = stopwatch.ElapsedMilliseconds; - ThirdResult thirdResult = null; + ThirdResult thirdResult = new ThirdResult(); try { thirdResult = JsonConvert.DeserializeObject(response); diff --git a/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs b/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs index 55add93a..c407d322 100644 --- a/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs @@ -461,7 +461,7 @@ namespace Tnb.ProductionMgr Stopwatch stopwatch = null; string response = ""; var elapsedMilliseconds = 0l; - ThirdResult thirdResult = null; + ThirdResult thirdResult = new ThirdResult(); foreach (var record in records) { now = DateTime.Now; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index d972d069..2fa300cd 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -2396,8 +2396,8 @@ namespace Tnb.WarehouseMgr ["cbodytranstypecode"] = "4A-01", ["cbodywarehouseid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "", ["cgeneralbid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "", - ["cgeneralbid"] = item.id, - ["cgeneralhid"] = item.bill_id, + ["cgeneralbid"] = item.erp_line_pk ?? "", + ["cgeneralhid"] = wmsMaterialTransfer.erp_pk ?? "", ["cmaterialoid"] = erpExtendFields.Find(x=>x.table_id==item.material_id)?.cmaterialoid ?? "", ["cmaterialvid"] = erpExtendFields.Find(x=>x.table_id==item.material_id)?.cmaterialvid ?? "", ["corpoid"] = erpOrg.corpoid, diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs index 0e14bb2b..17e3d2d4 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs @@ -641,7 +641,6 @@ namespace Tnb.WarehouseMgr ids.Add(wmsMaterialTransfer.warehouse_instock); ids.Add(wmsMaterialTransferd.material_id); ids.Add(unitData.Id); - List erpExtendFields = await _db.Queryable().Where(x=>ids.Contains(x.table_id)).ToListAsync(); 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("corpoid",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("creationtime",nowStr); erpRequestData.Add("creator",erpCreateId); @@ -679,8 +678,8 @@ namespace Tnb.WarehouseMgr ["corpoid"] = erpOrg.corpoid, ["corpvid"] = erpOrg.corpvid, ["crowno"] = (dList.FindIndex(x=>x.id==wmsMaterialTransferd.id)+1) * 10, - ["csourcebillbid"] = wmsMaterialTransferd.id, - ["csourcebillhid"] = wmsMaterialTransferd.bill_id, + ["csourcebillbid"] = wmsMaterialTransferd.erp_line_pk ?? "", + ["csourcebillhid"] = wmsMaterialTransfer.erp_pk ?? "", ["cunitid"] = erpExtendFields.Find(x=>x.table_id==unitData.Id)?.cunitid ?? "", ["cvendorid"] = "", ["cvendorvid"] = "",