From 2287bce2f5b671785355e84c3d1e046f03051f20 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Sat, 25 Nov 2023 11:27:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 20 +++++++++++++++++++
.../Dto/OutStock/OutStockQueryInfoResponse.cs | 10 ++++++++++
.../OutStockTaskQueryInfoResponse.cs | 10 ++++++++++
.../OutStockRepositories.cs | 9 +++++++--
.../OutStockTaskRepositories.cs | 9 +++++++--
5 files changed, 54 insertions(+), 4 deletions(-)
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index bb2783c4..4a81ef67 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -3666,6 +3666,16 @@
销售订单号
+
+
+ 来源单号(集合)
+
+
+
+
+ 销售订单号(集合)
+
+
发货组织
@@ -3856,6 +3866,16 @@
销售订单号
+
+
+ 来源单号(集合)
+
+
+
+
+ 销售订单号(集合)
+
+
发货组织
diff --git a/src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs b/src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs
index 0e81650f..415582cc 100644
--- a/src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs
+++ b/src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs
@@ -51,6 +51,16 @@ namespace WMS.Web.Core.Dto.OutStock
[Column("销售订单号")]
public string SaleBillNo { get; set; }
///
+ /// 来源单号(集合)
+ ///
+ [Ignore]
+ public List SourceBillNoList { get; set; } = new List();
+ ///
+ /// 销售订单号(集合)
+ ///
+ [Ignore]
+ public List SaleBillNoList { get; set; } = new List();
+ ///
/// 发货组织
///
[Column("发货组织")]
diff --git a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs
index e8b12e6c..92489fa9 100644
--- a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs
+++ b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs
@@ -56,6 +56,16 @@ namespace WMS.Web.Core.Dto.OutStockTask
[Column("销售订单号")]
public string SaleBillNo { get; set; }
///
+ /// 来源单号(集合)
+ ///
+ [Ignore]
+ public List SourceBillNoList { get; set; } = new List();
+ ///
+ /// 销售订单号(集合)
+ ///
+ [Ignore]
+ public List SaleBillNoList { get; set; } = new List();
+ ///
/// 发货组织
///
[Column("发货组织")]
diff --git a/src/WMS.Web.Repositories/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs
index 3e7d744f..a2b26aab 100644
--- a/src/WMS.Web.Repositories/OutStockRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockRepositories.cs
@@ -162,8 +162,8 @@ namespace WMS.Web.Repositories
CreateTime = s.order.CreateTime.DateToStringSeconds(),
SuccessSync = s.order.SuccessSync == true ? "成功" : "失败",
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode + s.order.OrgCode),
- SourceBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SourceBillNo).Distinct()),
- SaleBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SaleBillNo).Distinct()),
+ SourceBillNoList = s.detail.ErpDetails.Select(s => s.SourceBillNo).ToList(),
+ SaleBillNoList = s.detail.ErpDetails.Select(s => s.SaleBillNo).ToList(),
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
ReceiptCustomer = s.order.Type == OutStockType.Sal
? _erpBasicDataExtendService.GetCustomerName(customers, s.order.ReceiptCustomerId)
@@ -177,6 +177,11 @@ namespace WMS.Web.Repositories
#endregion
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
+ foreach (var l in list)
+ {
+ l.SourceBillNo = string.Join(",", l.SourceBillNoList.Distinct());
+ l.SaleBillNo = string.Join(",", l.SaleBillNoList.Distinct());
+ }
return (list, total);
}
///
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index 9a0d7935..f1784f4e 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -295,8 +295,8 @@ namespace WMS.Web.Repositories
OutStockBeginTime = s.detail.OutStockBeginTime.DateToStringSeconds(),
OutStockEndTime = s.detail.OutStockEndTime.DateToStringSeconds(),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode+s.order.OrgCode),
- SourceBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SourceBillNo).Distinct()),
- SaleBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SaleBillNo).Distinct()),
+ SourceBillNoList = s.detail.ErpDetails.Select(s=>s.SourceBillNo).ToList(),
+ SaleBillNoList = s.detail.ErpDetails.Select(s => s.SaleBillNo).ToList(),
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
ReceiptCustomer = s.order.Type == OutStockType.Sal
? _erpBasicDataExtendService.GetCustomerName(customers, s.order.ReceiptCustomerId)
@@ -308,6 +308,11 @@ namespace WMS.Web.Repositories
#endregion
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
+ foreach(var l in list)
+ {
+ l.SourceBillNo = string.Join(",", l.SourceBillNoList.Distinct());
+ l.SaleBillNo = string.Join(",", l.SaleBillNoList.Distinct());
+ }
return (list, total);
}
///