From f6a81c5426bfa0000113729bff128abb87576623 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期六, 23 八月 2025 16:17:49 +0800
Subject: [PATCH] 1增加了通用控件选择库位 2增加撤回报工，自动入库维护功能
---
WebApi/Gs.Warehouse/Services/MesDepotSectionsManager.cs | 144 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 144 insertions(+), 0 deletions(-)
diff --git a/WebApi/Gs.Warehouse/Services/MesDepotSectionsManager.cs b/WebApi/Gs.Warehouse/Services/MesDepotSectionsManager.cs
index ef3683f..d3bcde8 100644
--- a/WebApi/Gs.Warehouse/Services/MesDepotSectionsManager.cs
+++ b/WebApi/Gs.Warehouse/Services/MesDepotSectionsManager.cs
@@ -1,7 +1,12 @@
锘縰sing 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 SqlSugar;
+using System.Data;
+using System.Text;
namespace Gs.Warehouse.Services;
@@ -9,4 +14,143 @@
public class MesDepotSectionsManager : Repository<MesDepotSections>,
IRomteService
{
+
+ /// <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 itemsList = Db.Queryable<MesDepots,MesDepotSections, SysOrganization, MesStaff, MesCustomer, MesSupplier, SysDepartment>(
+ (a, b,Org, c, d, f, g) => new object[]
+ {
+ JoinType.Left, a.Guid == b.DepotGuid,
+ JoinType.Left, a.FSubsidiary == Org.Fid,
+ JoinType.Left, a.CreateBy == c.Id.ToString(),
+ JoinType.Left,d.Id.ToString()==a.ClientId.ToString(),
+ JoinType.Left,f.Id.ToString()==a.SuppLierId.ToString(),
+ JoinType.Left,g.Id.ToString()==a.department.ToString(),
+ }).Select((a, b, Org, c, d, f, g) => new MesDepotSections
+ {
+ Guid=b.Guid,
+ DepotSectionCode=b.DepotSectionCode.ToString(),
+ DepotSectionName=b.DepotSectionName.ToString(),
+ CreateBy = c.StaffName.ToString()
+
+ }, true)
+ .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>
+ /// 鏌ヨ鍒楄〃锛屾敮鎸佸垎椤�,鐢ㄤ簬鍚勭缁戝畾
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<PageList<dynamic>> GetListPage2(PageQuery model)
+ {
+ var currentPage = model.currentPage;
+ var everyPageSize = model.everyPageSize;
+ var sortName = string.IsNullOrEmpty(model.sortName) ? "a.PAGE_GROUP" : model.sortName;
+ var keyWhere = model.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(" [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 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);
+
+ // 鍚屾椂闇�瑕佷慨鏀硅鏁版煡璇紝娣诲姞鐩稿悓鐨凧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
+ {
+ dset = DbHelperSQL.Query(sbSql.ToString());
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(), "GetListPage error锛�" + ex.Message);
+ return ReturnDto<PageList<dynamic>>.QuickReturn(default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
+ }
+ var _pglist = new PageList<dynamic>
+ {
+ total = 0,
+ everyPageSize = 0,
+ pages = 0,
+ list = new List<dynamic>()
+ };
+ 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 pages = intTotal % everyPageSize != 0
+ ? intTotal / everyPageSize + 1
+ : intTotal / everyPageSize;
+ _pglist.total = intTotal;
+ _pglist.everyPageSize = everyPageSize;
+ _pglist.pages = pages;
+ 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