From f43b7df8400f4fcffc9f19dca0888d61e2b33d5f Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 12 三月 2025 18:41:52 +0800
Subject: [PATCH] WMS系统添加PDA权限,PDA程序

---
 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs |   82 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 82 insertions(+), 0 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs"
index fff5b33..dc8ce5c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs"
@@ -35,6 +35,87 @@
 
         public virtual PageGridData<StockViewDTO> GetPageData(PageDataOptions options)
         {
+
+            #region MyRegion
+            //try
+            //{
+            //    List<StockViewDTO> stockViewDTOs = new List<StockViewDTO>();
+
+            //    string where = string.Empty;
+            //    ISugarQueryable<Dt_StockInfo> sugarQueryable1 = _dbBase.Queryable<Dt_StockInfo>().Includes(x => x.Details);
+            //    if (!string.IsNullOrEmpty(options.Wheres))
+            //    {
+            //        try
+            //        {
+            //            List<SearchParameters> searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
+            //            if (searchParametersList.Count > 0)
+            //            {
+            //                {
+            //                    SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_StockInfoDetail.MaterielCode).FirstLetterToLower());
+            //                    if (searchParameters != null)
+            //                    {
+            //                        sugarQueryable1 = sugarQueryable1.Where(x => x.Details.Any(v => v.MaterielCode.Contains(searchParameters.Value)));
+            //                    }
+            //                }
+
+            //                {
+            //                    SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_StockInfoDetail.BatchNo).FirstLetterToLower());
+            //                    if (searchParameters != null)
+            //                    {
+            //                        sugarQueryable1 = sugarQueryable1.Where(x => x.Details.Any(v => v.BatchNo.Contains(searchParameters.Value)));
+            //                    }
+            //                }
+
+            //            }
+
+            //        }
+            //        catch { }
+            //    }
+            //    //string whereSto = GetDataRole(typeof(Dt_StockInfo));
+            //    //sugarQueryable1 = sugarQueryable1.Where(whereSto);
+            //    EntityProperties.ValidatePageOptions(options, ref sugarQueryable1);
+
+            //    //string whereLo = GetDataRole(typeof(Dt_LocationInfo));
+            //    //ISugarQueryable<Dt_LocationInfo> sugarQueryable = _dbBase.Queryable<Dt_LocationInfo>().Where(whereLo);
+
+            //    //EntityProperties.ValidatePageOptions(options, ref sugarQueryable);
+
+            //    ISugarQueryable<StockViewDTO> list = sugarQueryable1.InnerJoin(sugarQueryable, (b, a) => a.LocationCode == b.LocationCode).Select((b, a)
+            //        => new StockViewDTO
+            //        {
+            //            LocationCode = b.LocationCode,
+            //            Column = a.Column,
+            //            CreateDate = b.CreateDate,
+            //            Creater = b.Creater,
+            //            Depth = a.Depth,
+            //            EnalbeStatus = a.EnableStatus,
+            //            Layer = a.Layer,
+            //            LocationName = a.LocationName,
+            //            LocationStatus = a.LocationStatus,
+            //            LocationType = a.LocationType,
+            //            Modifier = b.Modifier,
+            //            ModifyDate = b.ModifyDate,
+            //            PalletCode = b.PalletCode,
+            //            StockRemark = b.Remark,
+            //            RoadwayNo = a.RoadwayNo,
+            //            Row = a.Row,
+            //            StockId = b.Id,
+            //            StockStatus = b.StockStatus,
+            //            Details = b.Details,
+            //        });
+
+            //    int totalCount = 0;
+
+            //    stockViewDTOs = list.ToPageList(options.Page, options.Rows, ref totalCount);
+            //    return new PageGridData<StockViewDTO>(totalCount, stockViewDTOs);
+            //}
+            //catch (Exception ex)
+            //{
+            //    return new PageGridData<StockViewDTO>();
+            //}
+            #endregion
+
+            #region MyRegion
             string where = options.ValidatePageOptions(typeof(StockViewDTO).GetProperties());
             //鑾峰彇鎺掑簭瀛楁
             //Dictionary<string, OrderByType> orderbyDic = options.GetPageDataSort(typeof(StockViewDTO).GetProperties());
@@ -78,6 +159,7 @@
                 Details = b.Details,
             }).ToPageList(options.Page, options.Rows, ref totalCount);
             return new PageGridData<StockViewDTO>(totalCount, list);
+            #endregion
 
         }
 

--
Gitblit v1.9.3