1.完成销售管理模块

2.修复档案查询与新增单据查询
2025-09-02 22:42:09 +08:00
parent 0720f7a904
commit 864e17ceda
9 changed files with 714 additions and 1571 deletions
@@ -845,7 +845,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
        /// <param name="cAccId">系统号</param>
        /// <param name="cCardNum">单据类型编码</param>
        /// <param name="input">查询条件</param>
-        /// <param name="cCardPostion">查询所属区域 H:表头，B:表体</param>
+        /// <param name="cCardPostion">查询所属区域 H:表头，B:表体, L:列表</param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        [HttpPost]
@@ -890,7 +890,12 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                {
                    DbType = DbType.SqlServer,
                    ConfigId = cAccId,
-                    ConnectionString = baseLogin.UFDataConnstringForNet
+                    ConnectionString = baseLogin.UFDataConnstringForNet,
+                    IsAutoCloseConnection = true,
+                    MoreSettings = new ConnMoreSettings()
+                    {
+                        IsWithNoLockQuery = true
+                    }
                });

                var cBTQName = vouchers.cBTQName;
@@ -907,7 +912,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8

                if (cCardPostion == "H")
                {
-                    tableName = cBWQName;
+                    tableName = cBTQName;
                }

                if (cCardPostion == "B")
@@ -915,6 +920,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                    tableName = cBWQName;
                }

+                if (cCardPostion == "L")
+                {
+                    tableName = cBWQName;
+                }
+
+
+
                var cDefWhere = vouchers.cDefWhere;

                var query = db.Queryable<dynamic>().AS(cBTQName, cBTQName);
@@ -927,7 +939,12 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8

                    if (bodyCols != null && bodyCols.Count > 0)
                    {
-                        colsBodyList.AddRange(from col in bodyCols where !col.DbColumnName.ToLower().Contains("ufts") && col.DbColumnName.ToLower()!=voucherIdFieldName select $"{cBWQName}.[{col.DbColumnName}]");
+                        colsBodyList.AddRange(from col in bodyCols where !col.DbColumnName.ToLower().Contains("ufts") && col.DbColumnName.ToLower()!=voucherIdFieldName select $"{cBWQName}.[{col.DbColumnName.ToLower()}]");
+
+                        if (cCardPostion == "B" && !colsBodyList.Contains(voucherIdFieldName.ToLower()))
+                        {
+                            colsBodyList.Add($"{cBWQName}.[{voucherIdFieldName.ToLower()}]");
+                        }
                    }
                }

@@ -1075,6 +1092,20 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                    }
                }

+                if (cCardPostion == "L")
+                {
+                    colsBodyList.AddRange(colsHeadList);
+
+                    if (bExtBody)
+                    {
+                        query.Select($"{string.Join(",",colsBodyList)}").Distinct();
+                    }
+                    else
+                    {
+                        query.Select($"{string.Join(",", colsBodyList)}").Distinct();
+                    }
+                }
+
                _logInfo.Debug(query.ToSqlString());
                
                return new BaseResult<dynamic>() { bSuccess = true, message = "查询成功", result = await query.ToListAsync() };