18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改了些BUG

Browse Source
This commit is contained in:
18923810322
2025-07-15 16:03:57 +08:00
parent 1051075aa6
commit c47810947b
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/WMS.Web.Core/Dto/ProductInventory/ProductInventoryQueryResponse.cs
View File

@@ -68,18 +68,22 @@ namespace WMS.Web.Core.Dto.ProductInventory
/// <summary> /// <summary>
/// 产品线(1级) /// 产品线(1级)
/// </summary> /// </summary>
[Column("1级分类")]
public string FProductLines1FName { get; set; } public string FProductLines1FName { get; set; }
/// <summary> /// <summary>
/// 产品分类(2级) /// 产品分类(2级)
/// </summary> /// </summary>
[Column("2级分类")]
public string FProductCATs1FName { get; set; } public string FProductCATs1FName { get; set; }
/// <summary> /// <summary>
/// 产品分组(3级) /// 产品分组(3级)
/// </summary> /// </summary>
[Column("3级分类")]
public string FMaterialGroupFName { get; set; } public string FMaterialGroupFName { get; set; }
/// <summary> /// <summary>
/// SPU /// SPU
/// </summary> /// </summary>
[Column("SPU")]
public string F_Product { get; set; } public string F_Product { get; set; }

8
src/WMS.Web.Domain/Services/OutStockTaskService.cs
View File

@@ -640,12 +640,12 @@ namespace WMS.Web.Domain.Services
response.Details.Add(infoDetail); response.Details.Add(infoDetail);
} }
//排序和加序号值 //排序和加序号值
//response.Details = response.Details.OrderByDescending(s => s.Specifications) // response.Details = response.Details.OrderByDescending(s => s.Specifications);
// .ThenByDescending(s => s.Method).ThenByDescending(s => s.Qty).ToList(); // .ThenByDescending(s => s.Method).ThenByDescending(s => s.Qty).ToList();
// response.Details.ForEach(f => f.IndexNumber = response.Details.IndexOf(f) + 1); // response.Details.ForEach(f => f.IndexNumber = response.Details.IndexOf(f) + 1);
response.Details = response.Details.OrderByDescending(s => s.Method) response.Details = response.Details.OrderByDescending(s => s.Method).OrderByDescending(y=>y.Specifications)
.ThenByDescending(s => s.BoxBillNo).ThenBy(s => s.BoxLength).ToList(); .ThenByDescending(s => s.BoxBillNo).ThenBy(s => s.BoxLength).ToList();
//alter by yzh 20250715 加了：.OrderByDescending(y=>y.Specifications)
for (int i = 0; i < response.Details.Count(); i++) for (int i = 0; i < response.Details.Count(); i++)
{ {
if (i == 0) if (i == 0)
@@ -735,7 +735,7 @@ namespace WMS.Web.Domain.Services
BoxWeight = d.BoxWeight, BoxWeight = d.BoxWeight,
Qty = d.Qty, Qty = d.Qty,
AccruedQty = d.AccruedQty, AccruedQty = d.AccruedQty,
SerialNumbers = serialNumbers[0].TwoSerialNumber SerialNumbers = serialNumbers[0].IsTwo==1? serialNumbers[0].SerialNumber:serialNumbers[0].TwoSerialNumber
}); });
} }

2
src/WMS.Web.Domain/Services/Public/ErpService.cs
View File

@@ -2923,7 +2923,7 @@ namespace WMS.Web.Domain.Services.Public
//6.物料 物料属性=费用或资产或服务的排除 不拉取 //6.物料 物料属性=费用或资产或服务的排除 不拉取
//param.FilterString = "FDocumentStatus='C' and FBillTypeID='ad0779a4685a43a08f08d2e42d7bf3e9'"; //param.FilterString = "FDocumentStatus='C' and FBillTypeID='ad0779a4685a43a08f08d2e42d7bf3e9'";
param.FilterString = " 1=1"; param.FilterString = " 1=1";
if (isCheck) param.FilterString += " and FDocumentStatus='C' and FSrcType<>'SAL_SaleOrder'"; if (isCheck) param.FilterString += " and FDocumentStatus='C' and FSrcType<>'SAL_OUTSTOCK' ";
param.FilterString += " and FMaterialID.FERPCLSID not in (10,11,6)"; param.FilterString += " and FMaterialID.FERPCLSID not in (10,11,6)";
//param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")"; //param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
//param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")"; //param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")";

3
src/WMS.Web.Repositories/BoxInventoryRepositories.cs
View File

@@ -96,7 +96,8 @@ namespace WMS.Web.Repositories
.SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order }) .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
.GroupJoin(_context.Box, p => p.order.BoxId, t => t.Id, (p, ts) => new { p.detail, p.order, ts }) .GroupJoin(_context.Box, p => p.order.BoxId, t => t.Id, (p, ts) => new { p.detail, p.order, ts })
.SelectMany(x => x.ts.DefaultIfEmpty(), (p, box) => new { p.detail, p.order, box }) .SelectMany(x => x.ts.DefaultIfEmpty(), (p, box) => new { p.detail, p.order, box })
.Where(adv => 1 == 1 && adv.detail.Qty != 0); .Where(adv => 1 == 1 && adv.detail.Qty != 0)
;
if (!string.IsNullOrEmpty(dto.BoxBillNo)) if (!string.IsNullOrEmpty(dto.BoxBillNo))
query = query.Where(w => EF.Functions.Like(w.box.BoxBillNo, "%" + dto.BoxBillNo + "%")); query = query.Where(w => EF.Functions.Like(w.box.BoxBillNo, "%" + dto.BoxBillNo + "%"));