diff --git a/UFIDA.U8.Framework.Api/App_Data/U8API.xml b/UFIDA.U8.Framework.Api/App_Data/U8API.xml index f819433..c4eb208 100644 --- a/UFIDA.U8.Framework.Api/App_Data/U8API.xml +++ b/UFIDA.U8.Framework.Api/App_Data/U8API.xml @@ -1350,7 +1350,7 @@ 日志组件 - + 新增单据 @@ -1365,7 +1365,7 @@ 是否生成时审核 - + 新增单据 diff --git a/UFIDA.U8.Framework.Api/Controllers/U8/MOController.cs b/UFIDA.U8.Framework.Api/Controllers/U8/MOController.cs index 10876d0..b7d8826 100644 --- a/UFIDA.U8.Framework.Api/Controllers/U8/MOController.cs +++ b/UFIDA.U8.Framework.Api/Controllers/U8/MOController.cs @@ -89,6 +89,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8 var cBTQName = vouchers.cBTTblName; var cBWQName = vouchers.cBWTblName; + var cExtQName = "mom_morder"; var cBTTblExtName = $"{vouchers.cBTTblName}_extradefine"; var cBWTblExtName = $"{vouchers.cBWTblName}_extradefine"; @@ -147,6 +148,22 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8 } } + cols = db.DbMaintenance.GetColumnInfosByTableName(cExtQName); + + if (cols != null && cols.Count > 0) + { + foreach (var col in cols.Where(col => !colList.ContainsKey(col.DbColumnName.ToLower()))) + { + if (!colList.ContainsKey(col.DbColumnName.ToLower())) + { + if (cCardPostion == "B" || cCardPostion == "L") + colList.Add(col.DbColumnName.ToLower(), $"{cExtQName}.[{col.DbColumnName}]"); + + colListBody.Add(col.DbColumnName.ToLower(), $"{cExtQName}.[{col.DbColumnName}]"); + } + } + } + if (db.DbMaintenance.IsAnyTable(cBWTblExtName)) { bExtBody = true; @@ -183,6 +200,11 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8 query.AddJoinInfo(cBWQName, cBWQName, $"{cBTQName}.[{voucherIdFieldName}]={cBWQName}.[{voucherIdFieldName}]"); + if (cCardNum == "MO21") + { + query.AddJoinInfo(cExtQName, cExtQName, $"{cBWQName}.[{vouchersIdFieldName}]={cExtQName}.[{vouchersIdFieldName}]"); + } + if (bExtBody) { query.AddJoinInfo(cBWTblExtName, cBWTblExtName, $"{cBWQName}.[{vouchersIdFieldName}]={cBWTblExtName}.[{vouchersIdFieldName}]");