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

调整仓库在出库单的位置

Browse Source
This commit is contained in:
18942506660
2023-11-22 10:05:06 +08:00
parent e9d775870b
commit 21291356d7
10 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
View File

Binary file not shown.

30
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -994,6 +994,11 @@
收货客户
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStock.StockCode">
<summary>
仓库
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStock.CreatorId">
<summary>
创建人
@@ -1082,16 +1087,6 @@
序列号
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.StockCode">
<summary>
仓库
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.SubStockId">
<summary>
仓位
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.Qty">
<summary>
出库数量
@@ -1162,6 +1157,11 @@
收货客户
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockTask.StockCode">
<summary>
仓库ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockTask.Status">
<summary>
单据状态
@@ -1238,16 +1238,6 @@
物料Id
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.StockCode">
<summary>
仓库ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.SubStockId">
<summary>
仓位ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.AccruedQty">
<summary>
应出库数量

5
src/WMS.Web.Domain/Entitys/OutStock.cs
View File

@@ -47,6 +47,11 @@ namespace WMS.Web.Domain.Entitys
[Column("ReceiptCustomerId")]
public int ReceiptCustomerId { get; set; }
/// <summary>
/// 仓库
///</summary>
[Column("StockCode")]
public string StockCode { get; set; }
/// <summary>
/// 创建人
/// </summary>
[Column("CreatorId")]

16
src/WMS.Web.Domain/Entitys/OutStockDetails.cs
View File

@@ -35,16 +35,12 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
[Column("SerialNumbers")]
public List<string> SerialNumbers { get; set; } = new List<string>();
/// <summary>
/// 仓库
///</summary>
[Column("StockCode")]
public string StockCode { get; set; }
/// <summary>
/// 仓位
///</summary>
[Column("SubStockId")]
public string SubStockId { get; set; }
///// <summary>
///// 仓位
/////</summary>
//[Column("SubStockId")]
//public string SubStockId { get; set; }
/// <summary>
/// 出库数量
///</summary>

7
src/WMS.Web.Domain/Entitys/OutStockTask.cs
View File

@@ -39,6 +39,11 @@ namespace WMS.Web.Domain.Entitys
[Column("ReceiptCustomerId")]
public int ReceiptCustomerId { get; set; }
/// <summary>
/// 仓库ID
///</summary>
[Column("StockCode")]
public string StockCode { get; set; }
/// <summary>
/// 单据状态
/// </summary>
[Column("Status")]
@@ -175,7 +180,7 @@ namespace WMS.Web.Domain.Entitys
if (list.GroupBy(g => g.DeliveryOrgId).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError);
if (list.GroupBy(g => g.ReceiptCustomerId).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError);
var details = list.SelectMany(s => s.Details).ToList();
if (details.GroupBy(g => g.StockCode).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError);
if (list.GroupBy(g => g.StockCode).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError);
List<OutStockTaskDetails> details_new = new List<OutStockTaskDetails>();
//清空数据绑定

16
src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs
View File

@@ -32,16 +32,12 @@ namespace WMS.Web.Domain.Entitys
///</summary>
[Column("MaterialId")]
public int MaterialId { get; set; }
/// <summary>
/// 仓库ID
///</summary>
[Column("StockCode")]
public string StockCode { get; set; }
/// <summary>
/// 仓位ID
///</summary>
[Column("SubStockId")]
public int SubStockId { get; set; }
///// <summary>
///// 仓位ID
/////</summary>
//[Column("SubStockId")]
//public int SubStockId { get; set; }
/// <summary>
/// 应出库数量
///</summary>

4
src/WMS.Web.Domain/Services/OutStockService.cs
View File

@@ -114,8 +114,8 @@ namespace WMS.Web.Domain.Services
{
BoxId = boxId,
InventoryInOutMethod = dto.Method,
StockCode = outStockTask.Details.First().StockCode,
SubStockId = outStockTask.Details.First().SubStockId,
StockCode = outStockTask.StockCode,
SubStockId = 0,// outStockTask.Details.First().SubStockId,
Details = inventoryDetail
};
inventoryList.Add(inventory);

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

@@ -106,9 +106,11 @@ namespace WMS.Web.Domain.Services
foreach (var outStockTask in data_list)
{
var sourcNos = outStockTask.Details.SelectMany(s => s.ErpDetails).Select(s => s.SourceBillNo).ToList();
//仓库不同 拆分成不同的任务单
var erps = erp_list.Where(w => sourcNos.Contains(w.SourceBillNo)).ToList();
foreach (var erp in erps)
{
//仓库不同 拆分成不同的
var detail = outStockTask.Details.FirstOrDefault(w => w.MaterialId == erp.MaterialId);
if (detail == null)
{

4
src/WMS.Web.Repositories/OutStockRepositories.cs
View File

@@ -143,7 +143,7 @@ namespace WMS.Web.Repositories
if (dto.DeliveryOrgId != null)
query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId);
if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.detail.StockCode == dto.StockCode);
query = query.Where(w => w.order.StockCode == dto.StockCode);
if (dto.CreateBeginDate != null)
query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate);
if (dto.CreateEndDate != null)
@@ -159,7 +159,7 @@ namespace WMS.Web.Repositories
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
CreateTime = s.order.CreateTime.DateToStringSeconds(),
SuccessSync = s.order.SuccessSync == true ? "成功" : "失败",
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.order.StockCode),
SourceBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SourceBillNo)),
SaleBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SaleBillNo)),
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),

8
src/WMS.Web.Repositories/OutStockTaskRepositories.cs
View File

@@ -273,7 +273,7 @@ namespace WMS.Web.Repositories
if (dto.DeliveryOrgId != null)
query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId);
if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.detail.StockCode == dto.StockCode);
query = query.Where(w => w.order.StockCode == dto.StockCode);
if (dto.CreateBeginDate != null)
query = query.Where(w => w.order.OperateTime >= dto.CreateBeginDate);
if (dto.CreateEndDate != null)
@@ -291,7 +291,7 @@ namespace WMS.Web.Repositories
CreateTime = s.order.OperateTime.DateToStringSeconds(),
OutStockBeginTime = s.detail.OutStockBeginTime.DateToStringSeconds(),
OutStockEndTime = s.detail.OutStockEndTime.DateToStringSeconds(),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.order.StockCode),
SourceBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SourceBillNo)),
SaleBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SaleBillNo)),
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
@@ -331,7 +331,7 @@ namespace WMS.Web.Repositories
foreach (var r in response)
{
var entity = list.FirstOrDefault(f => f.Id == r.Id);
r.StockCode = entity.Details.First().StockCode;
r.StockCode = entity.StockCode;
r.StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, r.StockCode);
}
//获取物料信息 显示物料三件套
@@ -363,7 +363,7 @@ namespace WMS.Web.Repositories
if (entity == null) return new GetOutStockTaskByNoResponse();
var response = _mapper.Map<GetOutStockTaskByNoResponse>(entity);
response.StockCode = entity.Details.First().StockCode;
response.StockCode = entity.StockCode;
response.StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, response.StockCode);
//获取物料信息 显示物料三件套
foreach (var r in response.details)