diff --git a/src/WMS.Web.Core/Dto/ProductInventory/ProductInventoryQueryResponse.cs b/src/WMS.Web.Core/Dto/ProductInventory/ProductInventoryQueryResponse.cs
index bb9a6f26..691c3da5 100644
--- a/src/WMS.Web.Core/Dto/ProductInventory/ProductInventoryQueryResponse.cs
+++ b/src/WMS.Web.Core/Dto/ProductInventory/ProductInventoryQueryResponse.cs
@@ -68,18 +68,22 @@ namespace WMS.Web.Core.Dto.ProductInventory
///
/// 产品线(1级)
///
+ [Column("1级分类")]
public string FProductLines1FName { get; set; }
///
/// 产品分类(2级)
///
+ [Column("2级分类")]
public string FProductCATs1FName { get; set; }
///
/// 产品分组(3级)
///
+ [Column("3级分类")]
public string FMaterialGroupFName { get; set; }
///
/// SPU
///
+ [Column("SPU")]
public string F_Product { get; set; }
diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs
index d394fff0..fc64f484 100644
--- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs
+++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs
@@ -640,12 +640,12 @@ namespace WMS.Web.Domain.Services
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();
// 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();
-
+ //alter by yzh 20250715 加了:.OrderByDescending(y=>y.Specifications)
for (int i = 0; i < response.Details.Count(); i++)
{
if (i == 0)
@@ -735,7 +735,7 @@ namespace WMS.Web.Domain.Services
BoxWeight = d.BoxWeight,
Qty = d.Qty,
AccruedQty = d.AccruedQty,
- SerialNumbers = serialNumbers[0].TwoSerialNumber
+ SerialNumbers = serialNumbers[0].IsTwo==1? serialNumbers[0].SerialNumber:serialNumbers[0].TwoSerialNumber
});
}
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index b1527391..bec2310e 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -2923,7 +2923,7 @@ namespace WMS.Web.Domain.Services.Public
//6.物料 物料属性=费用或资产或服务的排除 不拉取
//param.FilterString = "FDocumentStatus='C' and FBillTypeID='ad0779a4685a43a08f08d2e42d7bf3e9'";
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 FStockID.FNumber in (" + stocks_codes + ")";
//param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")";
diff --git a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
index 30cc6c26..638c58b3 100644
--- a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
+++ b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
@@ -96,7 +96,8 @@ namespace WMS.Web.Repositories
.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 })
.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))
query = query.Where(w => EF.Functions.Like(w.box.BoxBillNo, "%" + dto.BoxBillNo + "%"));