diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs index 2a9af63b..0412945a 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs @@ -412,10 +412,10 @@ namespace Tnb.ProductionMgr { foreach (var item in input.details) { - // if (!inputMaterials.Contains(item.material_id)) - // { - // throw new Exception("该物料不是生产bom投入物料,不能签收"); - // } + if (!inputMaterials.Contains(item.material_id)) + { + throw new Exception("该物料不是生产bom投入物料,不能签收"); + } PrdMaterialReceiptD? detail = null; if (carry.carrystd_id == WmsWareHouseConst.CARRY_ZYXCSTD_ID || carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID) diff --git a/common/Tnb.Common.Core/Manager/DataBase/DataBaseManager.cs b/common/Tnb.Common.Core/Manager/DataBase/DataBaseManager.cs index d00984a1..e912189f 100644 --- a/common/Tnb.Common.Core/Manager/DataBase/DataBaseManager.cs +++ b/common/Tnb.Common.Core/Manager/DataBase/DataBaseManager.cs @@ -498,8 +498,7 @@ public class DataBaseManager : IDataBaseManager, ITransient if (_sqlSugarClient.CurrentConnectionConfig.DbType == SqlSugar.DbType.Oracle) strSql = strSql.Replace(";", string.Empty); - - Log.Information("查找报错sql:"+strSql); + var data = _sqlSugarClient.Ado.GetDataTable(strSql, parameters); _sqlSugarClient.ChangeDatabase(_connectionStrings.ConfigId); return data;