From a0a0df2e824b6fe7e5a3c0afce78127fecf84fc9 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 03 十一月 2025 08:23:05 +0800
Subject: [PATCH] ERP接口代码更新，WCS代码优化，出入库分配优化
---
项目代码/WMS/WMSServices/WIDESEA_StockService/ProStockViewService.cs | 45 ++++++++++++++-------------------------------
1 files changed, 14 insertions(+), 31 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/ProStockViewService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/ProStockViewService.cs"
index a98b78c..9255975 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/ProStockViewService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/ProStockViewService.cs"
@@ -54,14 +54,11 @@
List<SearchParameters> searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
if (searchParametersList.Count > 0)
{
+ SearchParameters? searchParameters1 = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_ProStockInfoDetail.ProductCode).FirstLetterToLower());
+ if (searchParameters1 != null)
{
- SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_ProStockInfoDetail.ProductCode).FirstLetterToLower());
- if (searchParameters != null)
- {
- sugarQueryable1 = sugarQueryable1.Where(x => x.proStockInfoDetails.Any(v => v.ProductCode.Contains(searchParameters.Value)));
- }
+ sugarQueryable1 = sugarQueryable1.Where(x => x.proStockInfoDetails.Any(v => v.ProductCode.Contains(searchParameters1.Value)));
}
-
}
}
@@ -76,12 +73,12 @@
EntityProperties.ValidatePageOptions(options, ref sugarQueryable);
- ISugarQueryable<ProStockViewDTO> list = sugarQueryable1.InnerJoin(sugarQueryable, (b, a) => a.LocationCode == b.LocationCode).Select((b, a)
+ ISugarQueryable<ProStockViewDTO> list = sugarQueryable1.InnerJoin(sugarQueryable, (b, a) => a.LocationCode == b.LocationCode).OrderByDescending(b=>b.CreateDate).Select((b, a)
=> new ProStockViewDTO
{
ProStockAttribute=b.ProStockAttribute,
LocationCode = b.LocationCode,
- Column = a.Column,
+ Column = a.Columns,
WarehouseId = b.WarehouseId,
CreateDate = b.CreateDate,
Creater = b.Creater,
@@ -100,36 +97,20 @@
SumStocks=b.proStockInfoDetails.Sum(x=>x.StockQty)
});
- var pklist = sugarQueryable1.Where(b => b.LocationCode == "鎴愬搧寰呭彂璐у尯" || b.LocationCode == "鎴愬搧鍖呰鎷ｈ揣鍖�").Select(b => new ProStockViewDTO
- {
- ProStockAttribute = b.ProStockAttribute,
- LocationCode = b.LocationCode,
- WarehouseId = b.WarehouseId,
- CreateDate = b.CreateDate,
- Creater = b.Creater,
- LocationName = b.LocationCode,
- Modifier = b.Modifier,
- ModifyDate = b.ModifyDate,
- PalletCode = b.PalletCode,
- StockRemark = b.Remark,
- ProStockId = b.Id,
- StockStatus = b.StockStatus,
- Details = b.proStockInfoDetails,
- SumStocks = b.proStockInfoDetails.Sum(x => x.StockQty)
- });
-
int totalCount = 0;
int pktotalCount = 0;
stockViewDTOs = list.ToPageList(options.Page, options.Rows, ref totalCount);
- stockViewDTOs.AddRange(pklist.ToPageList(options.Page, options.Rows, ref pktotalCount));
stockViewDTOs.ForEach(x =>
{
x.ProductCode = string.Join(",", x.Details.Select(x => x.ProductCode).Distinct());
+ x.ProductName = x.Details.FirstOrDefault()?.ProductName ?? "";
+ x.ProductSpec = x.Details.FirstOrDefault()?.ProductSpec ?? "";
+ x.ProductUnit = x.Details.FirstOrDefault()?.ProductUnit ?? "";
}
);
- return new PageGridData<ProStockViewDTO>(totalCount + pktotalCount, stockViewDTOs.OrderByDescending(x=>x.CreateDate).ToList());
+ return new PageGridData<ProStockViewDTO>(totalCount + pktotalCount, stockViewDTOs.ToList());
}
catch (Exception ex)
{
@@ -211,7 +192,7 @@
{
ProStockAttribute = b.ProStockAttribute,
LocationCode = b.LocationCode,
- Column = a.Column,
+ Column = a.Columns,
WarehouseId = b.WarehouseId,
CreateDate = b.CreateDate,
Creater = b.Creater,
@@ -259,7 +240,9 @@
stockViewDTOs.ForEach(x =>
{
x.ProductCode = string.Join(",", x.Details.Select(x => x.ProductCode).Distinct());
- x.StockRemark = warehouses.FirstOrDefault(v => v.WarehouseId == x.WarehouseId).WarehouseName;
+ x.ProductName = x.Details.FirstOrDefault()?.ProductName ?? "";
+ x.ProductSpec = x.Details.FirstOrDefault()?.ProductSpec ?? "";
+ x.ProductUnit = x.Details.FirstOrDefault()?.ProductUnit ?? "";
}
);
@@ -289,7 +272,7 @@
{
if (userRole.WarehouseIds.Count > 0)
{
- return $"{nameof(BaseWarehouseEntity.WarehouseId)} in ({userRole.WarehouseIds.Serialize().Replace("[", "").Replace("]", "")})";
+ return $"{nameof(BaseWarehouseEntity.WarehouseId)} in ({userRole.WarehouseIds.OrderBy(x=>x).Serialize().Replace("[", "").Replace("]", "")})";
}
else
--
Gitblit v1.9.3