From eb65436c2312821e3e513ab9ada41dd486d6d7cf Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 09 九月 2025 15:35:41 +0800
Subject: [PATCH] 同步为祈禧的代码
---
WebApi/Gs.Warehouse/Services/MesDepotSectionsManager.cs | 104 ++++++++++++----------------------------------------
1 files changed, 24 insertions(+), 80 deletions(-)
diff --git a/WebApi/Gs.Warehouse/Services/MesDepotSectionsManager.cs b/WebApi/Gs.Warehouse/Services/MesDepotSectionsManager.cs
index 4895098..9e4606c 100644
--- a/WebApi/Gs.Warehouse/Services/MesDepotSectionsManager.cs
+++ b/WebApi/Gs.Warehouse/Services/MesDepotSectionsManager.cs
@@ -1,11 +1,9 @@
-锘縰sing AngleSharp.Text;
-using Gs.Entity.BaseInfo;
-using Gs.Entity.Sys;
+锘縰sing Gs.Entity.BaseInfo;
using Gs.Toolbox;
using Gs.Toolbox.ApiCore.Abstract.Mvc;
using Gs.Toolbox.ApiCore.Common.Mvc;
using Gs.Toolbox.ApiCore.Group;
-using SqlSugar;
+using Microsoft.AspNetCore.Http;
using System.Data;
using System.Text;
@@ -15,50 +13,15 @@
public class MesDepotSectionsManager : Repository<MesDepotSections>,
IRomteService
{
+ private readonly IHttpContextAccessor _http;
- /// <summary>
- /// 鏌ヨ鍒楄〃锛屾敮鎸佸垎椤�
- /// </summary>
- /// <param name="query"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<PageList<MesDepotSections>> GetListPage(PageQuery query)
+ private readonly string _userCode, _userGuid, _orgFids;
+
+ public MesDepotSectionsManager()
{
- var pageList = new PageList<MesDepotSections>();
- try
- {
- var _sbWhere = new StringBuilder(" 1=1" + query.keyWhere);
- var _sbBy = new StringBuilder(query.sortName + " " + query.sortOrder);
- var totalCount = 0;
- // 鍏堟瀯寤哄熀纭�鏌ヨ
- var queryBase = Db.Queryable<MesDepots>()
- .LeftJoin<MesDepotSections>((a, b) => a.Guid == b.DepotGuid);
- //.LeftJoin<SysOrganization>((a, b, c) => a.FSubsidiary == c.Fid)
- //.LeftJoin<MesStaff>((a, b, c, d) => a.CreateBy == d.Id.ToString())
- //.LeftJoin<MesCustomer>((a, b, c, d, e) => e.Id.ToString() == a.ClientId)
- //.LeftJoin<MesSupplier>((a, b, c, d, e, f) => f.Id.ToString() == a.SuppLierId)
- //.LeftJoin<SysDepartment>((a, b, c, d, e, f, g) => g.Id.ToString() == a.department);
- // 鐒跺悗杩涜閫夋嫨鍜屽垎椤�
- var itemsList = queryBase.Select((a, b) => new MesDepotSections
- {
- Guid = b.Guid,
- DepotSectionCode = b.DepotSectionCode,
- DepotSectionName = b.DepotSectionName
- })
- .Where(_sbWhere.ToString())
- .OrderBy(_sbBy.ToString())
- .ToPageList(query.currentPage, query.everyPageSize, ref totalCount);
-
- pageList = new PageList<MesDepotSections>(itemsList, totalCount,
- query.everyPageSize);
- return ReturnDto<PageList<MesDepotSections>>.QuickReturn(pageList,
- ReturnCode.Success, "璇诲彇鎴愬姛");
- }
- catch (Exception ex)
- {
- return ReturnDto<PageList<MesDepotSections>>.QuickReturn(pageList,
- ReturnCode.Default, ex.Message);
- }
+ //_http = httpContextAccessor;
+ //(_userCode, _userGuid, _orgFids) =
+ // UtilityHelper.GetUserGuidAndOrgGuid(_http);
}
@@ -72,51 +35,30 @@
{
var currentPage = model.currentPage;
var everyPageSize = model.everyPageSize;
- var sortName = string.IsNullOrEmpty(model.sortName) ? "a.PAGE_GROUP" : model.sortName;
+ var sortName = string.IsNullOrEmpty(model.sortName) ? "a.USER_NAME" : model.sortName;
var keyWhere = model.keyWhere;
string keyType = model.keyType;
+ System.Text.StringBuilder sbJoin = new StringBuilder();
+ sbJoin.Append(" from [dbo].[MES_DEPOT_SECTIONS] a ");
+ sbJoin.Append(" left join [dbo].[MES_DEPOTS] d on a.depot_guid=d.depot_id");
+ sbJoin.Append(" left join SYS_ORGANIZATION org on d.FSubsidiary=org.FID");
+ sbJoin.Append(keyWhere);
var sbSql = new StringBuilder();
sbSql.Append(" SELECT * FROM ");
- sbSql.Append(" (SELECT N'(' +[Org].[FNumber] + N')' +[Org].[NAME] AS [FSubsidiary2] ,");
- sbSql.Append(" [Org].[NAME] AS [OrgName] , [Org].[FNumber] AS [OrgId] , CAST([c].[staff_name]");
- sbSql.Append(" AS NVARCHAR(MAX)) AS [CreateBy] , [d].[cust_name] AS [ClientId] ,");
- sbSql.Append(" [f].[supp_name] AS [SuppLierId] , [g].[departmentname] AS [department2] ,");
- sbSql.Append(" ( CASE WHEN ( [a].[is_ng] = N'A' ) THEN N'姝ｅ父' ELSE N'绂佺敤' END ) AS [IsNg] ");
- // 娣诲姞MesDepotSections琛ㄧ殑瀛楁
- sbSql.Append(" , [b].[DepotSectionCode] AS [DepotSectionCode] ");
- sbSql.Append(" , [b].[DepotSectionName] AS [DepotSectionName] ");
- sbSql.Append(" , [a].*,ROW_NUMBER() OVER(ORDER BY org.FNumber asc ,a.depot_code asc) AS RowIndex ");
+ sbSql.Append(" (SELECT N'(' +[Org].[FNumber] + N')' +[Org].[NAME] AS [FSubsidiary2]");
+ sbSql.Append(", a.depot_section_code as cwCode,a.depot_section_name as cwName,d.depot_name as ckName,d.depot_id as ckId,d.depot_code as ckCode ,ROW_NUMBER() OVER(ORDER BY a.depot_section_code asc) AS RowIndex ");
+ //濡傛灉鏃犲叧閿瓧锛屾棤闇�鎵炬煡缁戝畾
if (string.IsNullOrEmpty(keyType))
{
sbSql.Append(",cast(0 as bit) as chkInt");
}
else
- {
- sbSql.Append(",cast( (select count(1) from SYS_USER_BIND b where b.userGuid='" + keyType + "' and b.aboutGuid=a.guid) as bit) as chkInt ");
- }
- // 娣诲姞LEFT JOIN MesDepotSections琛�
- sbSql.Append(" FROM [MES_DEPOTS] [a] ");
- sbSql.Append(" Left JOIN [MES_DEPOT_SECTIONS] [b] ON [a].[Guid] = [b].[DepotGuid] "); // 鏂板鐨凧OIN
- sbSql.Append(" Left JOIN [SYS_ORGANIZATION] [Org] ON ( [a].[FSubsidiary] = [Org].[FID] )");
- sbSql.Append(" Left JOIN [MES_STAFF] [c] ON ( [a].[create_by] = CAST([c].[id] AS NVARCHAR(50))) ");
- sbSql.Append(" Left JOIN [MES_CUSTOMER] [d] ON (CAST([d].[id] AS NVARCHAR(50)) = CAST([a].[Client_Id] AS NVARCHAR(50))) ");
- sbSql.Append(" Left JOIN [MES_SUPPLIER] [f] ON (CAST([f].[id] AS NVARCHAR(50)) = CAST([a].[SUPPLIER_ID] AS NVARCHAR(50))) ");
- sbSql.Append(" Left JOIN [SYS_DEPARTMENT] [g] ON (CAST([g].[id] AS NVARCHAR(50)) = CAST([a].[department] AS NVARCHAR(50))) ");
- sbSql.Append(" WHERE 1=1");
- sbSql.Append(keyWhere);
+ sbSql.Append(",cast( (select count(1) from SYS_USER_BIND bind where bind.userGuid='" + keyType + "' and bind.aboutGuid=a.depot_section_code and bind.fType='搴撲綅') as bit) as chkInt ");
+ sbSql.Append(sbJoin);
sbSql.Append(") T");
sbSql.Append(" where T.rowindex>(" + currentPage + "-1)*" + everyPageSize + " and T.rowindex<=" + currentPage + "*" + everyPageSize);
-
- // 鍚屾椂闇�瑕佷慨鏀硅鏁版煡璇紝娣诲姞鐩稿悓鐨凧OIN鏉′欢
- sbSql.Append(" select count(1) as intTotal FROM [MES_DEPOTS] [a] ");
- sbSql.Append(" Left JOIN [MES_DEPOT_SECTIONS] [b] ON [a].[Guid] = [b].[DepotGuid] "); // 鏂板鐨凧OIN
- sbSql.Append(" Left JOIN [SYS_ORGANIZATION] [Org] ON ( [a].[FSubsidiary] = [Org].[FID] )");
- sbSql.Append(" Left JOIN [MES_STAFF] [c] ON ( [a].[create_by] = CAST([c].[id] AS NVARCHAR(50))) ");
- sbSql.Append(" Left JOIN [MES_CUSTOMER] [d] ON (CAST([d].[id] AS NVARCHAR(50)) = CAST([a].[Client_Id] AS NVARCHAR(50))) ");
- sbSql.Append(" Left JOIN [MES_SUPPLIER] [f] ON (CAST([f].[id] AS NVARCHAR(50)) = CAST([a].[SUPPLIER_ID] AS NVARCHAR(50))) ");
- sbSql.Append(" Left JOIN [SYS_DEPARTMENT] [g] ON (CAST([g].[id] AS NVARCHAR(50)) = CAST([a].[department] AS NVARCHAR(50))) ");
- sbSql.Append(" WHERE 1=1");
- sbSql.Append(keyWhere);
+ sbSql.Append(" select count(1) as intTotal ");
+ sbSql.Append(sbJoin);
var dset = new DataSet();
try
{
@@ -151,4 +93,6 @@
ReturnCode.Success, "璇诲彇鎴愬姛");
}
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3