From 842b40ba0afed53b69cdb34b3e5ec27b8ca26f66 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 16 12月 2024 14:14:07 +0800
Subject: [PATCH] 22

---
 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs |  140 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 100 insertions(+), 40 deletions(-)

diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
index c77a4e3..4f70a84 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
@@ -10,6 +10,7 @@
 using Admin.NET.Application.Service.WmsCommonnQuery.Dto;
 using System.Collections.Generic;
 using Admin.NET.Application.CommonHelper;
+using System.Globalization;
 
 namespace Admin.NET.Application;
 /// <summary>
@@ -29,6 +30,7 @@
     private readonly SqlSugarRepository<Mes_Package_LineQueue> _mesPackage_LineQueueRep;
     private readonly SqlSugarRepository<WmsRecordUpiReplenish> _wmsRecordUpiReplenishRep;
     private readonly SqlSugarRepository<WmsRecordUpiProcess> _wmsRecordUpiProcessRep;
+    private readonly SqlSugarRepository<V_Station_Quan> _V_Station_Quan;
 
     public WmsCommonnQueryService(SqlSugarRepository<WmsRbLineTask> wmsRbLineTaskRep, SqlSugarRepository<WmsStockQuan> wmsStockQuanRep
         , SqlSugarRepository<Mes_Package_Gather> mesPackageGatherRep
@@ -39,6 +41,7 @@
         , SqlSugarRepository<Mes_Package_LineQueue> mesPackage_LineQueueRep
         , SqlSugarRepository<WmsRecordUpiReplenish> wmsRecordUpiReplenishRep
         , SqlSugarRepository<WmsRecordUpiProcess> wmsRecordUpiProcessRep
+        , SqlSugarRepository<V_Station_Quan> V_Station_Quan_Rep
         )
     {
         _wmsRecordUpiReplenishRep = wmsRecordUpiReplenishRep;
@@ -51,6 +54,7 @@
         _mesPackage_UnLine_RecordRep = mesPackage_UnLine_RecordRep;
         _mesPackage_LineQueueRep = mesPackage_LineQueueRep;
         _wmsRecordUpiProcessRep = wmsRecordUpiProcessRep;
+        _V_Station_Quan = V_Station_Quan_Rep;
     }
 
     /// <summary>
@@ -144,18 +148,36 @@
     [Description("WmsCommonnQuery/QueryCurrentOrder")]
     public async Task<Mes_Order_Gather> QueryCurrentOrder()
     {
-        //鑾峰彇涓婄彮鏃堕棿銆�
-        var sysConfig_wms_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.WmsBZ30_QiTao);
-        if (sysConfig_wms_wms_unline_oper == null || sysConfig_wms_wms_unline_oper.Value == "鏃�")
+        ////鑾峰彇涓婄彮鏃堕棿銆�
+        //var sysConfig_wms_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.WmsBZ30_QiTao);
+        //if (sysConfig_wms_wms_unline_oper == null || sysConfig_wms_wms_unline_oper.Value == "鏃�")
+        //{
+        //    return null;
+        //}
+        //var arr = sysConfig_wms_wms_unline_oper.Value.Split('|');
+        //var packagecode = arr[0];
+        //var packObj = await _mesPackageGatherRep.AsQueryable().FirstAsync(x => x.PackageCode == packagecode);
+        //if (packObj == null)
+        //{
+        //    throw Oops.Oh($"娌℃湁鎵惧埌鍖厈packagecode}鐨勬眹鎬绘暟鎹�");
+        //}
+
+        //var list = await _mesOrderGatherRep.AsQueryable()
+        //    .Where(x => x.Info5 == packObj.Info5)
+        //    .FirstAsync(); // 纭繚鑾峰彇缁撴灉涓� List
+
+        //return list; // 缁撴灉
+
+        var packageQueue = await _mesPackage_LineQueueRep.AsQueryable().Where(x => 1 == 1).ToListAsync();
+        var single_packageQueue = packageQueue.OrderBy(x => x.Id).FirstOrDefault();
+        if (single_packageQueue == null)
         {
             return null;
         }
-        var arr = sysConfig_wms_wms_unline_oper.Value.Split('|');
-        var packagecode = arr[0];
-        var packObj = await _mesPackageGatherRep.AsQueryable().FirstAsync(x => x.PackageCode == packagecode);
+        var packObj = await _mesPackageGatherRep.AsQueryable().FirstAsync(x => x.PackageCode == single_packageQueue.PackageCode);
         if (packObj == null)
         {
-            throw Oops.Oh($"娌℃湁鎵惧埌鍖厈packagecode}鐨勬眹鎬绘暟鎹�");
+            throw Oops.Oh($"娌℃湁鎵惧埌鍖厈single_packageQueue.PackageCode}鐨勬眹鎬绘暟鎹�");
         }
 
         var list = await _mesOrderGatherRep.AsQueryable()
@@ -747,24 +769,46 @@
         // 鑾峰彇褰撳墠鏃堕棿
         DateTime currentDate = DateTime.Now;
         // 璁$畻涓�鍛ㄤ箣鍓嶇殑鏃堕棿
-        DateTime oneWeekAgo = currentDate.AddDays(-7);
+        //DateTime oneWeekAgo = currentDate.AddDays(-7);
+        
+        // 鑾峰彇褰撳墠鏂囧寲淇℃伅
+        CultureInfo cultureInfo = CultureInfo.CurrentCulture;
+
+        // DayOfWeek.Monday 琛ㄧず涓�鍛ㄧ殑绗竴澶╂槸鍛ㄤ竴
+        int diff = (int)cultureInfo.DateTimeFormat.FirstDayOfWeek - (int)DateTime.Now.DayOfWeek;
+
+        // 濡傛灉闇�瑕侊紝瀵瑰樊鍊艰繘琛岃皟鏁翠互纭繚鏄繃鍘荤殑鏃ユ湡
+        if (diff < 0) diff += 7;
+        DateTime oneWeekAgo = DateTime.Now.AddDays(diff).Date;
+        //*/
+
         // 鏌ヨ鏈�杩戜竴鍛ㄧ殑涓嬬嚎璁㈠崟鏁�
-        var orderCount = await _mesOrderGatherRep.AsQueryable().Where(x => x.UnlineTime >= oneWeekAgo && x.UnlineTime <= currentDate).CountAsync();
+        var dataList = await _mesPackage_UnLine_RecordRep.AsQueryable().Where(x => x.CreateTime >= oneWeekAgo && x.CreateTime <= currentDate).ToListAsync();
+
+        var packageList = dataList.GroupBy(x => x.PackageCode);//涓嬬嚎鍖�
+
+        var orderCount = dataList.GroupBy(x => x.Info5).Count();//涓嬬嚎璁㈠崟鏁�
+        var packageCount = packageList.Count();//涓嬬嚎鍖呮暟
+        var upiCount = 0;
+        foreach (var item in packageList)
+        {
+            upiCount += Convert.ToInt32(item.ToList().First().Info12);
+        }
+
         resultList.Add(new Home_Order_Info
         {
-            Name = "鏈懆涓嬬嚎璁㈠崟鏁�",
-            Value = orderCount // 灏嗘煡璇㈠埌鐨勬暟閲忚祴鍊�
+            Name = "鏈懆鐢熶骇璁㈠崟鏁�",
+            Value = orderCount
         });
         resultList.Add(new Home_Order_Info
         {
-            Name = "涓嬬嚎鍖呮暟",
-            Value = 8
-            // Value = await _mesPackage_UnLine_RecordRep  鏌ヨ鏈�杩戜竴鍛ㄧ殑涓嬬嚎璁㈠崟鏁�
+            Name = "鏈懆涓嬬嚎鍖呮暟",
+            Value = packageCount
         });
         resultList.Add(new Home_Order_Info
         {
-            Name = "涓嬬嚎鏉挎暟",
-            Value = 3 // 杩欓噷绀轰緥鍊间负3锛屽彲浠ユ牴鎹疄闄呴�昏緫璋冩暣
+            Name = "鏈懆涓嬬嚎鏉挎暟",
+            Value = upiCount
         });
         return resultList; // 缁撴灉
     }
@@ -790,10 +834,8 @@
             //鎬荤殑鏁版嵁
             DateTime all_startDate = currentDate.AddDays(-11);
             DateTime all_endDate = currentDate.Date.AddDays(1).AddTicks(-1);
-            var all_recordsOfDay = await _mesOrderGatherRep.AsQueryable()
+            var all_recordsOfDay = await _mesPackage_UnLine_RecordRep.AsQueryable()
                 .Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
-                //&& (r.OrderStatus == OrderStatusEnum.宸插畬鎴�)
-                //&& (r.OrderType == OrderTypeEnum.涓婃灦鍗� || r.OrderType == OrderTypeEnum.涓嬫灦鍗�)
                ).ToListAsync();
 
 
@@ -810,12 +852,10 @@
                 var summary = new WmsStockPassMapOutput
                 {
                     Time = 12 - i,
-                    InWare = recordsOfDay
-                    // .Where(x => x.OrderType == OrderTypeEnum.涓婃灦鍗�)
-                    .ToList().Count(),
+                    //InWare = recordsOfDay
+                    //.ToList().Count(),
                     OutWare = recordsOfDay
-                    //  .Where(x => x.OrderType == OrderTypeEnum.涓嬫灦鍗�)
-                    .ToList().Count(),
+                    .ToList().GroupBy(x => x.Info5).Count(),
                     StockNum = 0,
                     AveStockNum = 0,
                     Date = startDate.Date.ToString("yyyy-MM-dd")
@@ -830,9 +870,7 @@
             //鎬荤殑鏁版嵁
             DateTime all_startDate = GetStartOfWeek(currentDate).AddDays(-7 * 11);
             DateTime all_endDate = GetEndOfWeek(currentDate);
-            var all_recordsOfDay = await _mesOrderGatherRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
-               //&& (r.OrderStatus == OrderStatusEnum.宸插畬鎴�)
-               //&& (r.OrderType == OrderTypeEnum.涓婃灦鍗� || r.OrderType == OrderTypeEnum.涓嬫灦鍗�)
+            var all_recordsOfDay = await _mesPackage_UnLine_RecordRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
                ).ToListAsync();
 
             for (int i = 0; i < 12; i++)
@@ -848,12 +886,10 @@
                 var summary = new WmsStockPassMapOutput
                 {
                     Time = 12 - i,
-                    InWare = recordsOfWeek
-                    // .Where(x => x.OrderType == OrderTypeEnum.涓婃灦鍗�) .Sum(x => x.Quantity),
-                    .ToList().Count(),
+                    //InWare = recordsOfWeek
+                    //.ToList().Count(),
                     OutWare = recordsOfWeek
-                      //  .Where(x => x.OrderType == OrderTypeEnum.涓嬫灦鍗�)
-                      .ToList().Count(),
+                      .ToList().GroupBy(x => x.Info5).Count(),
                     StockNum = 0,
                     AveStockNum = 0,
                     Date = startDate.Date.ToString("MMdd") + "锝�" + endDate.Date.ToString("MMdd")
@@ -868,9 +904,7 @@
             //鎬荤殑鏁版嵁
             DateTime all_startDate = currentDate.AddMonths(-11).AddDays(1 - currentDate.Day);
             DateTime all_endDate = currentDate.AddMonths(1).AddDays(-1);
-            var all_recordsOfDay = await _mesOrderGatherRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
-               //&& (r.OrderStatus == OrderStatusEnum.宸插畬鎴�)
-               //&& (r.OrderType == OrderTypeEnum.涓婃灦鍗� || r.OrderType == OrderTypeEnum.涓嬫灦鍗�)
+            var all_recordsOfDay = await _mesPackage_UnLine_RecordRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
                ).ToListAsync();
 
             for (int i = 0; i < 12; i++)
@@ -885,12 +919,10 @@
                 var summary = new WmsStockPassMapOutput
                 {
                     Time = 12 - i,
-                    InWare = recordsOfMonth
-                    //.Where(x => x.OrderType == OrderTypeEnum.涓婃灦鍗�)
-                     .ToList().Count(),
+                    //InWare = recordsOfMonth
+                    // .ToList().Count(),
                     OutWare = recordsOfMonth
-                     // .Where(x => x.OrderType == OrderTypeEnum.涓嬫灦鍗�)
-                     .ToList().Count(),
+                     .ToList().GroupBy(x => x.Info5).Count(),
                     StockNum = 0,
                     AveStockNum = 0,
                     Date = startDate.ToString("yyyy-MM")
@@ -919,5 +951,33 @@
         return startDate.AddDays(6); // 鍥犱负璧峰鏃ユ湡宸茬粡鏄懆涓�锛屾墍浠ョ洿鎺ュ姞6澶╁嵆鍙緱鍒板懆鏃�
     }
 
+
+
+
+    /// <summary>
+    /// 涓嶅垎椤垫煡璇㈠簱浣嶄俊鎭�
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpGet]
+    [ApiDescriptionSettings(Name = "ListView")]
+    [Description("WmsCommonnQuery/ListView")]
+    public async Task<List<LocationViewOutput>> ListView([FromQuery] WmsBasePlaceInput input)
+    {
+        var query = await _V_Station_Quan.AsQueryable()
+        .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
+        u.PlaceCode.Contains(input.SearchKey.Trim())
+        //  || u.WareContainerCode.Contains(input.SearchKey.Trim())
+        //|| u.Lane==input.Lane
+        //|| u.Row==input.Row  
+        )
+        .OrderBy(u => u.LaneNo)
+        //.OrderBy(u => u.Row)
+        .OrderBy(u => u.LayerNo)
+        .OrderBy(u => u.ColumnNo)
+        .Select<LocationViewOutput>().ToListAsync();
+        return query;
+    }
+
 }
 

--
Gitblit v1.9.3