From d34ea2a9fc2334d2bf7383cb64562f301ffbda84 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 17 4月 2025 13:09:07 +0800
Subject: [PATCH] 包中只有一块板时，认定为 不齐包 【Editby shaocx,2025-04-01】
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs | 460 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 441 insertions(+), 19 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 2343cc0..636a1a6 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
@@ -9,6 +9,8 @@
using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
using Admin.NET.Application.Service.WmsCommonnQuery.Dto;
using System.Collections.Generic;
+using Admin.NET.Application.CommonHelper;
+using System.Globalization;
namespace Admin.NET.Application;
/// <summary>
@@ -26,6 +28,9 @@
private readonly SqlSugarRepository<Mes_Order_Gather> _mesOrderGatherRep;
private readonly SqlSugarRepository<Mes_Package_UnLine_Record> _mesPackage_UnLine_RecordRep;
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
@@ -34,8 +39,12 @@
, SqlSugarRepository<Mes_Order_Gather> mesOrderGatherRep
, SqlSugarRepository<Mes_Package_UnLine_Record> mesPackage_UnLine_RecordRep
, SqlSugarRepository<Mes_Package_LineQueue> mesPackage_LineQueueRep
+ , SqlSugarRepository<WmsRecordUpiReplenish> wmsRecordUpiReplenishRep
+ , SqlSugarRepository<WmsRecordUpiProcess> wmsRecordUpiProcessRep
+ , SqlSugarRepository<V_Station_Quan> V_Station_Quan_Rep
)
{
+ _wmsRecordUpiReplenishRep = wmsRecordUpiReplenishRep;
_sysConfigRep = sysConfigRep;
_mesPackageGatherRep = mesPackageGatherRep;
_wmsRbLineTaskRep = wmsRbLineTaskRep;
@@ -44,6 +53,8 @@
_mesOrderGatherRep = mesOrderGatherRep;
_mesPackage_UnLine_RecordRep = mesPackage_UnLine_RecordRep;
_mesPackage_LineQueueRep = mesPackage_LineQueueRep;
+ _wmsRecordUpiProcessRep = wmsRecordUpiProcessRep;
+ _V_Station_Quan = V_Station_Quan_Rep;
}
/// <summary>
@@ -60,7 +71,7 @@
.WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
.Where(x => ((DateTime)x.CreateTime).ToString("yyyyMMdd") == DateTime.Now.ToString("yyyyMMdd"))
- .Where(x => x.IsKitting == false)
+ .Where(x => x.IsUnline == null || x.IsUnline == false)
.OrderBy(g => g.Id)
.ToListAsync(); // 纭繚鑾峰彇缁撴灉涓� List
@@ -137,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()
@@ -235,28 +264,40 @@
// 鑾峰彇绗﹀悎鏉′欢鐨勮褰曪紝骞舵彁鍙栨墍闇�淇℃伅
var list = await _wmsStockQuanRep.AsQueryable()
.WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
- .Select(x => new { x.PackageCode })
+ .WhereIF(!string.IsNullOrWhiteSpace(input.PlanNo), u => u.PlanNo.Contains(input.PlanNo.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim()))
+ .Select(x => new { x.PackageCode, x.PlanNo, x.OrderId })
.ToListAsync();
// 鍒涘缓涓�涓垪琛ㄤ互瀛樺偍 WmsPackListOutput
var resultList = new List<WmsPackListOutput>();
// 鍒嗙粍骞惰绠楁瘡缁勪俊鎭�
- var groupedResult = list.GroupBy(x => x.PackageCode);
+ var groupedResult = list.GroupBy(x => new { x.PackageCode, x.PlanNo, x.OrderId });
foreach (var g in groupedResult)
{
// 鍦ㄨ繖閲岃绠楁瘡缁勭殑鎬绘暟
var count = g.Count();
- var mesTotalCount = await _mesBatchOrderUpiRep.AsQueryable().CountAsync(m => m.PackageCode == g.Key);
+ var mesTotalCount = await _mesBatchOrderUpiRep.AsQueryable().CountAsync(m => m.PackageCode == g.Key.PackageCode);
+ var isPack = count >= mesTotalCount; // 妫�鏌ユ槸鍚︽墦鍖�
+ var desc = "";
+ if (mesTotalCount == 1)
+ { //鍖呬腑鍙湁涓�鍧楁澘鏃讹紝璁ゅ畾涓� 涓嶉綈鍖� 銆怑ditby shaocx,2025-04-01銆�
+ isPack = false;
+ desc = "鍖呬腑鍙湁涓�鍧楁澘";
+ }
resultList.Add(new WmsPackListOutput
{
- PackageCode = g.Key,
+ PackageCode = g.Key.PackageCode,
+ PlanNo = g.Key.PlanNo,
+ OrderId = g.Key.OrderId,
Count = count,
MesTotalCount = mesTotalCount,
- IsPack = count >= mesTotalCount, // 妫�鏌ユ槸鍚︽墦鍖�
- LackCount = mesTotalCount - count
+ IsPack = isPack,
+ LackCount = mesTotalCount - count,
+ PackageDesc = desc
});
}
@@ -310,7 +351,7 @@
/// <summary>
- /// 涓嶅垎椤垫煡璇㈡壒娆＄己鏂欐竻鍗� 涓嶉綈鍖�
+ /// 浜哄伐琛ユ澘鍔ㄤ綔
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -325,6 +366,45 @@
{
resJson = listRes.FirstOrDefault(u => u.UPI == input.UPI);
//var filteredResult = listRes.FirstOrDefault(u => u.UPI == input.UPI);
+ }
+ var _cretaorName = App.User.FindFirst(ClaimConst.RealName)?.Value;
+ if (resJson != null)
+ {
+ //鎵ц浜哄伐琛ユ澘鍔ㄤ綔
+ var client = await WCFServiceHelper.GetWCFService_SAPCC_Client(_sysConfigRep);
+ var res = await client.WriteStation_AllowInAsync();
+ if (res.result == false)
+ {
+ throw Oops.Oh("琛ユ澘宸ヤ綅鍏佽杩涙澘璇锋眰澶辫触:" + res.resMsg);
+ }
+ //*/
+
+ //璁板綍琛ユ澘璁板綍鍜屾澘浠跺饱鍘�
+ var singleUpi = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.UPI == input.UPI).FirstAsync();
+ if (singleUpi == null)
+ {
+ throw Oops.Oh($"娌℃湁鎵惧埌閮ㄤ欢鏉＄爜{input.UPI}鐨勬暟鎹�");
+ }
+ WmsRecordUpiProcess wmsRecordUpi = new WmsRecordUpiProcess();
+ wmsRecordUpi = singleUpi.Adapt<WmsRecordUpiProcess>();
+ wmsRecordUpi.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ wmsRecordUpi.CreateTime = DateTime.Now;
+ wmsRecordUpi.CreateUserName = _cretaorName;
+ wmsRecordUpi.Location = "";
+ wmsRecordUpi.OperRemark = "浜哄伐琛ユ澘";
+ await _wmsRecordUpiProcessRep.InsertAsync(wmsRecordUpi);
+
+ WmsRecordUpiReplenish wmsRecordUpiNg = new WmsRecordUpiReplenish();
+ wmsRecordUpiNg = singleUpi.Adapt<WmsRecordUpiReplenish>();
+ wmsRecordUpiNg.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ wmsRecordUpiNg.CreateTime = DateTime.Now;
+ wmsRecordUpiNg.CreateUserName = _cretaorName;
+ wmsRecordUpiNg.OperRemark = "浜哄伐琛ユ澘";
+ await _wmsRecordUpiReplenishRep.InsertAsync(wmsRecordUpiNg);
+ }
+ else
+ {
+ throw Oops.Oh($"鏉夸欢'{input.UPI}'涓嶅湪缂哄寘娓呭崟涓�");
}
return resJson;
@@ -341,6 +421,11 @@
public async Task<SqlSugarPagedList<WmsShortageListOutput>> ShortagePage(KittingListInput input)
{
var listRes = await GetShortageListCore(input);
+ if (listRes?.Count > 0)
+ {
+ listRes = listRes.WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5 == input.Info5).ToList();
+ listRes = listRes.WhereIF(!string.IsNullOrWhiteSpace(input.DetailName), u => u.DetailName == input.DetailName).ToList();
+ }
// 杩涜鍒嗛〉澶勭悊
var totalCount = listRes.Count; // 鑾峰彇鎬绘暟
var pagedList = listRes
@@ -431,6 +516,7 @@
{
if (!listDaoUbi.Contains(item.UPI)) // 浣跨敤 HashSet 杩涜鏌ユ壘
{
+ var pc = await _mesPackageGatherRep.GetFirstAsync(x => x.PackageCode == item.PackageCode);
listRes.Add(new WmsShortageListOutput
{
UPI = item.UPI,
@@ -440,10 +526,10 @@
PlanNo = item.PlanNo,
Info5 = item.Info5,
Info4 = item.Info4,
- Info10 = item.Info10,
- Info11 = item.Info11,
- Info12 = item.Info12,
- Info13 = item.Info13,
+ Info10 = pc.Info10,
+ Info11 = pc.Info11,
+ Info12 = pc.Info12,
+ Info13 = pc.Info13,
//Info14 = item.Info14,
Info15 = item.Info15,
Info16 = item.Info16,
@@ -570,5 +656,341 @@
return groupedResult; // 杩斿洖鍒嗙粍缁撴灉
}
+
+ /// <summary>
+ /// 鏌ヨ鍖呮暟鎹�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "QueryPackage")]
+ [Description("WmsCommonnQuery/QueryPackage")]
+ public async Task<Mes_Package_Gather> QueryPackage(QueryPackageInput input)
+ {
+ if (input == null || input.PackageCode == null)
+ {
+ throw Oops.Oh("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ var package = await _mesPackageGatherRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync();
+ if (package == null)
+ {
+ throw Oops.Oh($"娌℃湁鎵惧埌鍖呭彿{input.PackageCode}鐨勬眹鎬绘暟鎹�");
+ }
+ return package;
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁鍖呭彿锛屾煡璇㈡煇涓寘涓嬬殑鏉夸欢鏁版嵁
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "QueryUpiListByPackage")]
+ [Description("WmsCommonnQuery/QueryUpiListByPackage")]
+ public async Task<List<Mes_BatchOrderUPI_New>> QueryUpiListByPackage(QueryPackageInput input)
+ {
+ if (input == null || input.PackageCode == null)
+ {
+ throw Oops.Oh("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ var package = await _mesPackageGatherRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync();
+ if (package == null)
+ {
+ throw Oops.Oh($"娌℃湁鎵惧埌鍖呭彿{input.PackageCode}鐨勬眹鎬绘暟鎹�");
+ }
+
+ var upiList = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).ToListAsync();
+
+ return upiList;
+ }
+
+ /// <summary>
+ /// 鏍规嵁鏌愪釜Upi锛屾煡璇㈡煇涓寘涓嬬殑鏉夸欢鏁版嵁
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "QueryUpiListByUpi")]
+ [Description("WmsCommonnQuery/QueryUpiListByUpi")]
+ public async Task<List<Mes_BatchOrderUPI_New>> QueryUpiListByUpi(QueryUpiListByUpiInput input)
+ {
+ if (input == null || input.Upi == null)
+ {
+ throw Oops.Oh("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ var singleUpi = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.UPI == input.Upi || x.PackageCode == input.Upi).FirstAsync();
+ if (singleUpi == null)
+ {
+ throw Oops.Oh($"娌℃湁鎵惧埌閮ㄤ欢鏉＄爜{input.Upi}鐨勬暟鎹�");
+ }
+
+ var package = await _mesPackageGatherRep.AsQueryable().Where(x => x.PackageCode == singleUpi.PackageCode).FirstAsync();
+ if (package == null)
+ {
+ throw Oops.Oh($"娌℃湁鎵惧埌鍖呭彿{singleUpi.PackageCode}鐨勬眹鎬绘暟鎹�");
+ }
+
+ var upiList = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.PackageCode == singleUpi.PackageCode).ToListAsync();
+ upiList = upiList.OrderBy(x => x.Shelf).ToList();
+
+ return upiList;
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁鏌愪釜Upi锛屾煡璇㈡澘浠舵暟鎹�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "QuerySingleUpiByUpi")]
+ [Description("WmsCommonnQuery/QuerySingleUpiByUpi")]
+ public async Task<List<Mes_BatchOrderUPI_New>> QuerySingleUpiByUpi(QueryUpiListByUpiInput input)
+ {
+ if (input == null || input.Upi == null)
+ {
+ throw Oops.Oh("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ var singleUpi = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.UPI == input.Upi).FirstAsync();
+ if (singleUpi == null)
+ {
+ throw Oops.Oh($"娌℃湁鎵惧埌閮ㄤ欢鏉＄爜{input.Upi}鐨勬暟鎹�");
+ }
+
+ List<Mes_BatchOrderUPI_New> upiList = new List<Mes_BatchOrderUPI_New>();
+ upiList.Add(singleUpi);
+ return upiList;
+ }
+
+
+
+ /// <summary>
+ /// 棣栭〉 鏈懆涓嬬嚎鐗╂枡淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "HomeOffOrderList")]
+ [Description("WmsCommonnQuery/HomeOffOrderList")]
+ public async Task<List<Home_Order_Info>> HomeOffOrderList()
+ {
+ List<Home_Order_Info> resultList = new List<Home_Order_Info>();
+ // 鑾峰彇褰撳墠鏃堕棿
+ DateTime currentDate = DateTime.Now;
+ // 璁＄畻涓�鍛ㄤ箣鍓嶇殑鏃堕棿
+ //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 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
+ });
+ resultList.Add(new Home_Order_Info
+ {
+ Name = "鏈懆涓嬬嚎鍖呮暟",
+ Value = packageCount
+ });
+ resultList.Add(new Home_Order_Info
+ {
+ Name = "鏈懆涓嬬嚎鏉挎暟",
+ Value = upiCount
+ });
+ return resultList; // 缁撴灉
+ }
+
+
+
+ /// <summary>
+ /// 涓婁笅鏋舵帹绉诲浘
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "HomeTytPage")]
+ [Description("WmsCommonnQuery/HomeTytPage")]
+ public async Task<List<WmsStockPassMapOutput>> HomeTytPage([FromQuery] WmsStockPassMapInput input)
+ {
+ List<WmsStockPassMapOutput> outputlist = new List<WmsStockPassMapOutput>();
+ DateTime currentDate = DateTime.Today;
+
+ //閫夋嫨涓�12鏃ョ殑鎯呭喌
+ if (input.DayOrWeekOrMonth == 1)
+ {
+ //鎬荤殑鏁版嵁
+ DateTime all_startDate = currentDate.AddDays(-11);
+ DateTime all_endDate = currentDate.Date.AddDays(1).AddTicks(-1);
+ 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++)
+ {
+ DateTime startDate = currentDate.AddDays(-i);
+ DateTime endDate = startDate.Date.AddDays(1).AddTicks(-1);
+
+ // 鏌ヨ鍦ㄨ繖涓�澶╁唴鐨勮褰�
+ var recordsOfDay = all_recordsOfDay.Where(r => r.CreateTime >= startDate && r.CreateTime <= endDate
+ ).ToList();
+
+
+ var summary = new WmsStockPassMapOutput
+ {
+ Time = 12 - i,
+ //InWare = recordsOfDay
+ //.ToList().Count(),
+ OutWare = recordsOfDay
+ .ToList().GroupBy(x => x.Info5).Count(),
+ StockNum = 0,
+ AveStockNum = 0,
+ Date = startDate.Date.ToString("yyyy-MM-dd")
+ };
+
+ outputlist.Add(summary);
+ }
+ }
+ //閫夋嫨12鍛�
+ else if (input.DayOrWeekOrMonth == 2)
+ {
+ //鎬荤殑鏁版嵁
+ DateTime all_startDate = GetStartOfWeek(currentDate).AddDays(-7 * 11);
+ DateTime all_endDate = GetEndOfWeek(currentDate);
+ 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++)
+ {
+ // 璁＄畻褰撳墠鍛ㄧ殑璧峰鏃ユ湡
+ DateTime startDate = GetStartOfWeek(currentDate).AddDays(-7 * i);
+ DateTime endDate = GetEndOfWeek(startDate);
+
+ // 鏌ヨ鍦ㄨ繖涓�鍛ㄥ唴鐨勫嚭鍏ュ簱璁板綍
+ var recordsOfWeek = all_recordsOfDay.Where(r => r.CreateTime >= startDate && r.CreateTime <= endDate).ToList();
+
+ // 姹囨�诲嚭鍏ュ簱璁板綍
+ var summary = new WmsStockPassMapOutput
+ {
+ Time = 12 - i,
+ //InWare = recordsOfWeek
+ //.ToList().Count(),
+ OutWare = recordsOfWeek
+ .ToList().GroupBy(x => x.Info5).Count(),
+ StockNum = 0,
+ AveStockNum = 0,
+ Date = startDate.Date.ToString("MMdd") + "锝�" + endDate.Date.ToString("MMdd")
+ };
+
+ outputlist.Add(summary);
+ }
+ }
+ //閫夋嫨12涓湀
+ else if (input.DayOrWeekOrMonth == 3)
+ {
+ //鎬荤殑鏁版嵁
+ DateTime all_startDate = currentDate.AddMonths(-11).AddDays(1 - currentDate.Day);
+ DateTime all_endDate = currentDate.AddMonths(1).AddDays(-1);
+ 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++)
+ {
+ DateTime startDate = currentDate.AddMonths(-i).AddDays(1 - currentDate.Day);
+ DateTime endDate = startDate.AddMonths(1).AddDays(-1);
+
+ // 鏌ヨ鍦ㄨ繖涓湀鍐呯殑鍑哄叆搴撹褰�
+ var recordsOfMonth = all_recordsOfDay.Where(r => r.CreateTime >= startDate && r.CreateTime <= endDate).ToList();
+
+ // 姹囨�诲嚭鍏ュ簱璁板綍
+ var summary = new WmsStockPassMapOutput
+ {
+ Time = 12 - i,
+ //InWare = recordsOfMonth
+ // .ToList().Count(),
+ OutWare = recordsOfMonth
+ .ToList().GroupBy(x => x.Info5).Count(),
+ StockNum = 0,
+ AveStockNum = 0,
+ Date = startDate.ToString("yyyy-MM")
+ };
+
+ outputlist.Add(summary);
+ }
+ }
+
+ //鎺掑簭
+ outputlist = outputlist.OrderBy(x => x.Time).ToList();
+
+ return outputlist;
+ }
+ // 鑾峰彇褰撳墠鏃ユ湡鎵�鍦ㄥ懆鐨勮捣濮嬫棩鏈燂紙鍛ㄤ竴锛�
+ private DateTime GetStartOfWeek(DateTime currentDate)
+ {
+ int diff = currentDate.DayOfWeek - DayOfWeek.Monday;
+ if (diff < 0) diff += 7; // 澶勭悊鍛ㄦ棩鐨勬儏鍐�
+ return currentDate.AddDays(-1 * diff).Date;
+ }
+
+ // 鑾峰彇褰撳墠鏃ユ湡鎵�鍦ㄥ懆鐨勭粨鏉熸棩鏈燂紙鍛ㄦ棩锛�
+ private DateTime GetEndOfWeek(DateTime startDate)
+ {
+ 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