From c1df32cdea3e0278849aa58048af132f962995ab Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Sun, 15 Sep 2024 10:45:17 +0800 Subject: [PATCH] =?UTF-8?q?erp=E9=BB=98=E8=AE=A4=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs | 12 ++++++------ .../Consts/WmsWareHouseConst.cs | 5 +++++ WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs | 6 ++++-- .../Tnb.WarehouseMgr/WmsMaterialSignHService.cs | 7 ++++--- .../Tnb.WarehouseMgr/WmsMaterialTransferService.cs | 6 ++++-- .../Tnb.WarehouseMgr/WmsPrdInstockHService.cs | 2 +- WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs | 10 ++++++---- WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs | 8 +++++--- .../Tnb.WarehouseMgr/WmsRawmatOutstockService.cs | 5 +++-- .../WmsRawmatTransferinstockService.cs | 5 ++--- .../WmsSterilizationInstockHService.cs | 6 +++--- .../Tnb.WarehouseMgr/WmsTransferInstockService.cs | 2 +- 12 files changed, 44 insertions(+), 30 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index c436b501..841d3e30 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -2500,17 +2500,17 @@ namespace Tnb.ProductionMgr .ToListAsync(); List erpExtendIds = new List(); - erpExtendIds.Add(report.create_id); + // erpExtendIds.Add(report.create_id); erpExtendIds.Add(WmsWareHouseConst.AdministratorOrgId); erpExtendIds.Add(report.material_id); // erpExtendIds.Add(report.unit_id); erpExtendIds.AddRange(unitDatas.Select(x => x.Id).ToList()); - List erpExtendFields = await _db.Queryable() - .Where(x => erpExtendIds.Contains(x.table_id)).ToListAsync(); - string erpCreateId = erpExtendFields.Find(x => x.table_id == report.create_id)?.user_id ?? ""; - ErpExtendField erpOrg = - erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); + string userId = report.create_id ?? WmsWareHouseConst.AdministratorUserId; + erpExtendIds.Add(userId); + List erpExtendFields = await _db.Queryable().Where(x => erpExtendIds.Contains(x.table_id)).ToListAsync(); + string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? WmsWareHouseConst.ERPUSERID; + ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs index b4a3fdcd..4c88aa7f 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs @@ -481,6 +481,11 @@ /// 组织Id(天益4厂) /// public const string AdministratorOrgId = "25193668006933"; + + /// + /// 默认传给erp的用户id + /// + public const string ERPUSERID = "1001A110000000003NBJ"; /// /// ERPId(天益4厂) /// diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index db00288b..7676a20d 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -3158,14 +3158,16 @@ namespace Tnb.WarehouseMgr .ToListAsync(); List ids = new List(); - ids.Add(wmsMaterialTransfer.create_id); + //ids.Add(wmsMaterialTransfer.create_id); ids.Add(WmsWareHouseConst.AdministratorOrgId); ids.Add(wmsMaterialTransfer.warehouse_instock); ids.AddRange(materialIds); ids.AddRange(unitDatas.Select(x => x.Id).ToList()); + string userId = wmsMaterialTransfer.create_id ?? WmsWareHouseConst.AdministratorUserId; + ids.Add(userId); List erpExtendFields = await db.Queryable().Where(x => ids.Contains(x.table_id)).ToListAsync(); - string erpCreateId = erpExtendFields.Find(x => x.table_id == wmsMaterialTransfer.create_id)?.user_id ?? ""; + string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? WmsWareHouseConst.ERPUSERID; ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (wmsMaterialTransfer.org_id ?? WmsWareHouseConst.AdministratorOrgId)); string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); List erpWarehouserelaHs = await _db.Queryable().Where(x => x.id != null).ToListAsync(); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs index f78fefa2..566df54a 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs @@ -310,15 +310,16 @@ namespace Tnb.WarehouseMgr string supplierId = WmsWareHouseConst.TIANYIGONGYINGSHANG_ID; List tableIds = new List(); - tableIds.Add( wmsMaterialSignH.create_id); + // tableIds.Add( wmsMaterialSignH.create_id); tableIds.Add(WmsWareHouseConst.AdministratorOrgId); tableIds.AddRange(materialIds); tableIds.Add(supplierId); tableIds.Add(wmsRawmatTransferoutstockD.unit_id); + string userId = input.create_id ?? WmsWareHouseConst.AdministratorUserId; + tableIds.Add(userId); List erpExtendFields = await _db.Queryable().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); - string userId = input.create_id; - string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? ""; + string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? WmsWareHouseConst.ERPUSERID; ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); List wmsErpWarehouserelaHs = await _db.Queryable().Where(x=>!SqlFunc.IsNullOrEmpty(x.id)).ToListAsync(); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs index cd44eef8..0dd770c0 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs @@ -1027,16 +1027,18 @@ namespace Tnb.WarehouseMgr .FirstAsync(); string unitId = unitData?.Id ?? ""; List ids = new List(); - ids.Add(wmsMaterialTransfer.create_id); + // ids.Add(wmsMaterialTransfer.create_id); ids.Add(WmsWareHouseConst.AdministratorOrgId); ids.Add(wmsMaterialTransfer.warehouse_outstock); ids.Add(wmsMaterialTransfer.warehouse_instock); ids.Add(wmsMaterialTransferd.material_id); ids.Add(unitId); + string userId = wmsMaterialTransfer.create_id ?? WmsWareHouseConst.AdministratorUserId; + ids.Add(userId); 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)); - string erpCreateId = erpExtendFields.Find(x => x.table_id == wmsMaterialTransfer.create_id)?.user_id ?? WmsWareHouseConst.AdministratorUserId; + string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? WmsWareHouseConst.ERPUSERID; List erpWarehouserelaHs = await _db.Queryable().Where(x=>x.id!=null).ToListAsync(); BasWarehouse outWarehouse = await _db.Queryable().SingleAsync(x=>x.id==wmsMaterialTransfer.warehouse_outstock); BasWarehouse inWarehouse = await _db.Queryable().SingleAsync(x=>x.id==wmsMaterialTransfer.warehouse_instock); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs index dddf2860..74e3e480 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs @@ -383,7 +383,7 @@ namespace Tnb.WarehouseMgr // tableIds.AddRange(unitIds); List erpExtendFields = await _db.Queryable().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); - string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? ""; + string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? WmsWareHouseConst.ERPUSERID; ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs index e8c1218b..a0cfd351 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs @@ -131,8 +131,8 @@ namespace Tnb.WarehouseMgr string tranTypeId = tranType?.Id ?? ""; string supplierId = wmsPurchaseOrderH?.supplier_id ?? ""; List tableIds = new List(); - tableIds.Add(_userManager.UserId); - tableIds.Add(wmsPurchaseH.create_id); + // tableIds.Add(_userManager.UserId); + // tableIds.Add(wmsPurchaseH.create_id); tableIds.Add(WmsWareHouseConst.AdministratorOrgId); tableIds.Add(instock.warehouse_id);// 1001A11000000002OOGU tableIds.AddRange(materialIds); @@ -140,11 +140,13 @@ namespace Tnb.WarehouseMgr tableIds.Add(tranTypeId); tableIds.AddRange(unitDatas.Select(x => x.Id).ToList()); + string userId = wmsPurchaseH.create_id ?? WmsWareHouseConst.AdministratorUserId; + tableIds.Add(userId); List erpExtendFields = await _db.Queryable().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); // 暂时传 1001A110000000003NBJ 陈书会 //string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? ""; - string erpCreateId = "1001A110000000003NBJ"; - //string erpCreateId = erpExtendFields.Find(x => x.table_id == wmsPurchaseH.create_id)?.user_id ?? ""; + //string erpCreateId = "1001A110000000003NBJ"; + string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? WmsWareHouseConst.ERPUSERID; ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs index 43966db8..a4d6dbb7 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs @@ -163,16 +163,18 @@ namespace Tnb.WarehouseMgr //WmsPurchaseOrderD wmsPurchaseOrderDs = await _db.Queryable().FirstAsync(x=>x.fk_wms_purchase_order_id==purchase.erp_bill_code); List ids = new List(); - ids.Add(_userManager.UserId); - ids.Add(WmsWareHouseConst.AdministratorUserId); + // ids.Add(_userManager.UserId); + // ids.Add(WmsWareHouseConst.AdministratorUserId); ids.Add(WmsWareHouseConst.AdministratorOrgId); ids.Add(purchase.warehouse_id); ids.AddRange(materialIds); ids.Add(wmsPurchaseOrderH.supplier_id); ids.AddRange(unitDatas.Select(x=>x.Id).ToList()); + string userId = _userManager.UserId ?? WmsWareHouseConst.AdministratorUserId; + ids.Add(userId); List erpExtendFields = await _db.Queryable().Where(x=>ids.Contains(x.table_id)).ToListAsync(); - string erpCreateId = erpExtendFields.Find(x=>x.table_id==_userManager.UserId || x.table_id==WmsWareHouseConst.AdministratorUserId)?.user_id ?? ""; + string erpCreateId = erpExtendFields.Find(x=>x.table_id==userId)?.user_id ?? WmsWareHouseConst.ERPUSERID; ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatOutstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatOutstockService.cs index 273021de..209a4a10 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatOutstockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatOutstockService.cs @@ -109,9 +109,10 @@ namespace Tnb.WarehouseMgr tableIds.Add(tranTypeDataEntity?.Id); tableIds.AddRange(unitDatas.Select(x => x.Id).ToList()); + string userId = wmsRawmatOutstockH.create_id ?? WmsWareHouseConst.AdministratorUserId; + tableIds.Add(userId); List erpExtendFields = await _db.Queryable().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); - string userId = wmsRawmatOutstockH.create_id; - string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? ""; + string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? WmsWareHouseConst.ERPUSERID; ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); List wmsErpWarehouserelaHs = await _db.Queryable().Where(x=>!SqlFunc.IsNullOrEmpty(x.id)).ToListAsync(); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs index 6251d7d1..bc56775e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs @@ -115,11 +115,10 @@ namespace Tnb.WarehouseMgr tableIds.AddRange(materialIds); tableIds.Add(supplierId); tableIds.AddRange(unitDatas.Select(x => x.Id).ToList()); - + List erpExtendFields = await _db.Queryable().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); // 暂时传 1001A110000000003NBJ 陈书会 - //string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? ""; - string erpCreateId = "1001A110000000003NBJ"; + string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? WmsWareHouseConst.ERPUSERID; ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs index ebc6167e..c98b9114 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs @@ -124,15 +124,15 @@ namespace Tnb.WarehouseMgr string supplierId = WmsWareHouseConst.TIANYIGONGYINGSHANG_ID; List tableIds = new List(); tableIds.Add(WmsWareHouseConst.AdministratorOrgId); - tableIds.Add(WmsWareHouseConst.AdministratorUserId); + // tableIds.Add(WmsWareHouseConst.AdministratorUserId); tableIds.AddRange(materialIds); tableIds.Add(supplierId); tableIds.AddRange(unitDatas.Select(x => x.Id).ToList()); - List erpExtendFields = await _db.Queryable().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); string userId = wmsRawmatTransferoutstockH.create_id ?? WmsWareHouseConst.AdministratorUserId; tableIds.Add(userId); - string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? ""; + List erpExtendFields = await _db.Queryable().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); + string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? WmsWareHouseConst.ERPUSERID; ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); List wmsErpWarehouserelaHs = await _db.Queryable().Where(x=>!SqlFunc.IsNullOrEmpty(x.id)).ToListAsync(); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferInstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferInstockService.cs index 8d3c1c3b..9745f72c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferInstockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferInstockService.cs @@ -103,7 +103,7 @@ namespace Tnb.WarehouseMgr tableIds.AddRange(unitDatas.Select(x => x.Id).ToList()); List erpExtendFields = await _db.Queryable().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); - string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? ""; + string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? WmsWareHouseConst.ERPUSERID; ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");