From 5ffe3e968652b17a2b7de39d809a099a05adadf4 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 02 12月 2024 09:41:04 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs | 72 +++++++++++++++++++++++++++++++++--
1 files changed, 67 insertions(+), 5 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
index 2b6dbf5..0b104e6 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
@@ -5,6 +5,8 @@
using System.Web;
using System.Text;
using System;
+using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
+
namespace Admin.NET.Application;
/// <summary>
/// 搴撳瓨淇℃伅鏈嶅姟
@@ -327,16 +329,17 @@
/// [HttpGet]
[ApiDescriptionSettings(Name = "ShortageList")]
[Description("WmsStockQuan/ShortageList")]
- public async Task<List<WmsShortageListOutput>> ShortageList(KittingListInput input)
+ public async Task<WmsShortageListOutput> ShortageList(KittingListInput input)
{
var listRes = await GetShortageListCore(input);
-
+ var resJson = new WmsShortageListOutput();
if (!string.IsNullOrWhiteSpace(input.UPI))
{
- listRes = listRes.Where(u => u.UPI == input.UPI).ToList();
+ resJson = listRes.FirstOrDefault(u => u.UPI == input.UPI);
+ //var filteredResult = listRes.FirstOrDefault(u => u.UPI == input.UPI);
}
- return listRes;
+ return resJson;
}
/// <summary>
@@ -371,6 +374,52 @@
};
}
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ缂烘枡娓呭崟 涓嶉綈鍖� -鎸夌収鐢熶骇鍗曞彿鍒嗙粍
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "ShortagePageGroupByInfo5")]
+ [Description("WmsStockQuan/ShortagePageGroupByInfo5")]
+ public async Task<SqlSugarPagedList<WmsShortageListOutput>> ShortagePageGroupByInfo5(KittingListInput input)
+ {
+ var listRes = await GetShortageListCore(input);
+
+ // 鎸夌収瀛楁 Info5 鍒嗙粍
+ var groupedList = listRes
+ .GroupBy(x => x.Info5) // 鏍规嵁 Info5 瀛楁杩涜鍒嗙粍
+ .Select(g => new WmsShortageListOutput // 鍋囪鎮ㄥ皢鍒嗙粍鍚庣殑缁撴灉杞崲涓� WmsShortageListOutput
+ {
+ Info5 = g.Key,
+ ShortageCount = g.Count(),
+ })
+ .ToList();
+
+ // 杩涜鍒嗛〉澶勭悊
+ var totalCount = groupedList.Count; // 鑾峰彇鎬绘暟
+ var pagedList = groupedList
+ //.OrderBy(x => x.Id) // 鏍规嵁闇�瑕佽繘琛屾帓搴�
+ .Skip((input.Page - 1) * input.PageSize)
+ .Take(input.PageSize)
+ .ToList();
+
+ // 鏋勯�犲苟杩斿洖鍒嗛〉缁撴灉
+ return new SqlSugarPagedList<WmsShortageListOutput>
+ {
+ Page = input.Page,
+ PageSize = input.PageSize,
+ Total = totalCount,
+ TotalPages = (int)Math.Ceiling((double)totalCount / input.PageSize),
+ Items = pagedList,
+ HasPrevPage = input.Page > 1,
+ HasNextPage = input.Page < ((int)Math.Ceiling((double)totalCount / input.PageSize))
+ };
+ }
+
+
+
/// <summary>
/// 缂哄寘鏁版嵁
/// </summary>
@@ -400,7 +449,20 @@
PackageCode = item.PackageCode,
DetailName = item.DetailName,
OrderId = item.OrderId,
- PlanNo = item.PlanNo
+ PlanNo = item.PlanNo,
+ Info5 = item.Info5,
+ Info4 = item.Info4,
+ Info10 = item.Info10,
+ Info11 = item.Info11,
+ Info12= item.Info12,
+ Info13 = item.Info13,
+ //Info14 = item.Info14,
+ Info15 = item.Info15,
+ Info16 = item.Info16,
+ Info18 = item.Info18,
+ Length = item.Length,
+ Width = item.Width,
+ Thk = item.Thk
});
}
}
--
Gitblit v1.9.3