From 1b3db8f5683373dd8e179b006e7314783dd1f9db Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期三, 10 九月 2025 14:42:12 +0800
Subject: [PATCH] 文件补充
---
WebApi/Gs.Warehouse/Services/MesDepotSectionsManager.cs | 127 ++++++++++++++++++++++++++++++------------
1 files changed, 90 insertions(+), 37 deletions(-)
diff --git a/WebApi/Gs.Warehouse/Services/MesDepotSectionsManager.cs b/WebApi/Gs.Warehouse/Services/MesDepotSectionsManager.cs
index 3e8c2fc..4895098 100644
--- a/WebApi/Gs.Warehouse/Services/MesDepotSectionsManager.cs
+++ b/WebApi/Gs.Warehouse/Services/MesDepotSectionsManager.cs
@@ -1,11 +1,13 @@
-锘縰sing System.Data;
-using System.Text;
+锘縰sing AngleSharp.Text;
using Gs.Entity.BaseInfo;
+using Gs.Entity.Sys;
using Gs.Toolbox;
using Gs.Toolbox.ApiCore.Abstract.Mvc;
using Gs.Toolbox.ApiCore.Common.Mvc;
using Gs.Toolbox.ApiCore.Group;
-using Microsoft.AspNetCore.Http;
+using SqlSugar;
+using System.Data;
+using System.Text;
namespace Gs.Warehouse.Services;
@@ -13,9 +15,51 @@
public class MesDepotSectionsManager : Repository<MesDepotSections>,
IRomteService
{
- private readonly IHttpContextAccessor _http;
- private readonly string _userCode, _userGuid, _orgFids;
+ /// <summary>
+ /// 鏌ヨ鍒楄〃锛屾敮鎸佸垎椤�
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<PageList<MesDepotSections>> GetListPage(PageQuery query)
+ {
+ 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);
+ }
+ }
/// <summary>
@@ -28,39 +72,51 @@
{
var currentPage = model.currentPage;
var everyPageSize = model.everyPageSize;
- var sortName = string.IsNullOrEmpty(model.sortName)
- ? "a.USER_NAME"
- : model.sortName;
+ var sortName = string.IsNullOrEmpty(model.sortName) ? "a.PAGE_GROUP" : model.sortName;
var keyWhere = model.keyWhere;
- var keyType = model.keyType;
- var 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);
+ string keyType = model.keyType;
var sbSql = new StringBuilder();
sbSql.Append(" SELECT * FROM ");
- 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 ");
- //濡傛灉鏃犲叧閿瓧锛屾棤闇�鎵炬煡缁戝畾
+ 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 ");
if (string.IsNullOrEmpty(keyType))
+ {
sbSql.Append(",cast(0 as bit) as chkInt");
+ }
else
- 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(",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(") T");
- sbSql.Append(" where T.rowindex>(" + currentPage + "-1)*" +
- everyPageSize + " and T.rowindex<=" + currentPage + "*" +
- everyPageSize);
- sbSql.Append(" select count(1) as intTotal ");
- sbSql.Append(sbJoin);
+ 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);
var dset = new DataSet();
try
{
@@ -69,10 +125,8 @@
catch (Exception ex)
{
LogHelper.Debug(ToString(), "GetListPage error锛�" + ex.Message);
- return ReturnDto<PageList<dynamic>>.QuickReturn(
- default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
+ return ReturnDto<PageList<dynamic>>.QuickReturn(default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
}
-
var _pglist = new PageList<dynamic>
{
total = 0,
@@ -83,8 +137,7 @@
if (dset != null && dset.Tables.Count > 0 &&
dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
{
- var intTotal =
- int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
+ var intTotal = int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
var pages = intTotal % everyPageSize != 0
? intTotal / everyPageSize + 1
: intTotal / everyPageSize;
@@ -94,8 +147,8 @@
var _dy = dset.Tables[0].TableToDynamicList();
_pglist.list = _dy;
}
-
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
ReturnCode.Success, "璇诲彇鎴愬姛");
}
+
}
\ No newline at end of file
--
Gitblit v1.9.3