From 9b5422db1724a337304fe3cc57a831b34bc8e383 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 6 Dec 2023 09:56:07 +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 | 10 ++++++++++
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 16 +++++++++++++---
.../OutStockTaskQueryInfoResponse.cs | 10 ++++++++++
.../OutStockTaskRepositories.cs | 11 +++++++----
4 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 208e4e3d..33b3daaa 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -3856,6 +3856,16 @@
操作时间（出库时间）
+
+
+ 出库人
+
+
+
+
+ 出库时间
+
+
来源单号
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 4c142281..02c8e2c4 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -1304,12 +1304,22 @@
- 操作人（出库人）
+ 操作人
- 操作时间（出库时间）
+ 操作时间
+
+
+
+
+ 出库人
+
+
+
+
+ 出库时间
@@ -1322,7 +1332,7 @@
明细
-
+
出库 反写 任务单(返回 这个物料下面的来源单号出了多少数量)
diff --git a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs
index 92489fa9..9ccdbcc1 100644
--- a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs
+++ b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs
@@ -46,6 +46,16 @@ namespace WMS.Web.Core.Dto.OutStockTask
[Column("出库时间")]
public string OperateTime { get; set; }
///
+ /// 出库人
+ ///
+ [Column("出库人")]
+ public string OutStock { get; set; }
+ ///
+ /// 出库时间
+ ///
+ [Column("出库时间")]
+ public string OutStockTime { get; set; }
+ ///
/// 来源单号
///
[Column("来源单号")]
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index 70a4a6fe..ed247198 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -152,7 +152,7 @@ namespace WMS.Web.Repositories
public async Task Get(int id)
{
var res = await _context.OutStockTask
- .Include(s => s.Details).ThenInclude(x=>x.ErpDetails)
+ .Include(s => s.Details).ThenInclude(x => x.ErpDetails)
.FirstOrDefaultAsync(f => id == f.Id);
return res.Clone();
@@ -292,6 +292,9 @@ namespace WMS.Web.Repositories
RealityQty = s.detail.RealityQty,
CreateTime = s.order.CreateTime.DateToStringSeconds(),
OperateTime = s.order.OperateTime.DateToStringSeconds(),
+ Operator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.OperatorId ?? 0),
+ OutStockTime = s.order.OperateTime.DateToStringSeconds(),
+ OutStock = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.OutStockId ?? 0),
OutStockBeginTime = s.detail.OutStockBeginTime.DateToStringSeconds(),
OutStockEndTime = s.detail.OutStockEndTime.DateToStringSeconds(),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode + s.order.OrgCode),
@@ -309,7 +312,7 @@ namespace WMS.Web.Repositories
#endregion
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
- foreach(var l in list)
+ foreach (var l in list)
{
l.SourceBillNo = string.Join(",", l.SourceBillNoList.Distinct());
l.SaleBillNo = string.Join(",", l.SaleBillNoList.Distinct());
@@ -341,7 +344,7 @@ namespace WMS.Web.Repositories
{
var entity = list.FirstOrDefault(f => f.Id == r.Id);
r.StockCode = entity.StockCode;
- r.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode+ entity.OrgCode);
+ r.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode + entity.OrgCode);
}
//获取物料信息 显示物料三件套
foreach (var r in response.SelectMany(s => s.details))
@@ -428,7 +431,7 @@ namespace WMS.Web.Repositories
_transaction.Commit();
return true;
}
- catch(Exception e)
+ catch (Exception e)
{
if (_transaction != null)
_transaction.Rollback();