From 509a51cc80ecd383c0e7824917a59fc406329afb Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Mon, 19 Aug 2024 16:24:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/WmsErpWarehouserelaH.cs | 10 ++++++++++ WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsErpWarehouserelaH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsErpWarehouserelaH.cs index 3a6d8455..32eced5f 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsErpWarehouserelaH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsErpWarehouserelaH.cs @@ -43,6 +43,16 @@ public partial class WmsErpWarehouserelaH : BaseEntity /// erp仓库编码 /// public string? erp_warehousecode { get; set; } + + /// + /// erp仓库id + /// + public string? erp_warehouseid { get; set; } + + /// + /// erp仓库vid + /// + public string? erp_warehousevid { get; set; } /// /// wms仓库编码 diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs index febc7e39..1cc587f9 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs @@ -340,6 +340,7 @@ namespace Tnb.WarehouseMgr .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode)) .Select((x, y) => y) .ToListAsync(); + List erpWarehouserelaHs = await _db.Queryable().Where(x=>x.id!=null).ToListAsync(); DictionaryDataEntity tranType = await _db.Queryable().Where(x=>x.DictionaryTypeId=="25043925951909" && x.EnCode==wmsPurchaseH.transaction_type).FirstAsync(); string tranTypeId = tranType?.Id ?? ""; @@ -371,7 +372,8 @@ namespace Tnb.WarehouseMgr erpRequestData.Add("ctrantypeid", erpExtendFields.Find(x => x.table_id == tranTypeId)?.transaction_type_id ?? ""); erpRequestData.Add("cvendorid", erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? ""); erpRequestData.Add("cvendorvid", erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? ""); - erpRequestData.Add("cwarehouseid", erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "");//类型视图里取 + // erpRequestData.Add("cwarehouseid", erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "");//类型视图里取 + erpRequestData.Add("cwarehouseid", erpWarehouserelaHs.Find(x => x.erp_warehousecode == wmsPurchaseD.erp_wh_type)?.erp_warehouseid ?? "");//类型视图里取 erpRequestData.Add("dbilldate", nowStr); erpRequestData.Add("dmakedate", nowStr); erpRequestData.Add("fbillflag", 2);