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-15 14:11:05 +08:00
parent 4fdb8b96d1
commit 73589f0dc3
7 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,11 +31,6 @@ namespace WMS.Web.Domain.Entitys
[Column("BillNo")]
public string BillNo { get; set; }
/// <summary>
/// 来源单号
///</summary>
[Column("SourceBillNo")]
public string SourceBillNo { get; set; }
/// <summary>
/// 单据类型
/// </summary>
[Column("Type")]

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

@@ -30,8 +30,12 @@ namespace WMS.Web.Domain.Entitys
/// 销售订单号
///</summary>
[Column("SaleBillNo")]
public string SaleBillNo { get; set; }
public List<string> SaleBillNos { get; set; }
/// <summary>
/// 来源单号
///</summary>
[Column("SourceBillNo")]
public List<string> SourceBillNos { get; set; }
/// <summary>
/// 物料Id
///</summary>

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

@@ -42,7 +42,7 @@ namespace WMS.Web.Domain.Entitys
/// 销售订单号
///</summary>
[Column("SaleBillNo")]
public string SaleBillNo { get; set; }
public List<string> SaleBillNos { get; set; }
/// <summary>
/// 物料Id
///</summary>

5
src/WMS.Web.Domain/Services/SerialNumberService.cs
View File

@@ -187,6 +187,7 @@ namespace WMS.Web.Domain.Services
foreach (var entity in entityList)
{
var box = boxList.FirstOrDefault(f => f.Id == entity.BoxId);
var outstockDetail = outStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId);
//修改序列号和箱绑定关系
entity.OutStock(outStock.BillNo, outStock.Type);
@@ -200,14 +201,14 @@ namespace WMS.Web.Domain.Services
OperateTime = DateTime.Now,
OperateType = OutStockTypeConvert(outStock.Type),
OperateUser = userName,
Remark = "来源单号:" + outStock.SourceBillNo + "\r\n" + "出库单号:" + outStock.BillNo
Remark = "来源单号:" + string.Join(",",outstockDetail.SourceBillNos) + "\r\n" + "出库单号:" + outStock.BillNo
};
if (outStock.Type == OutStockType.Sal)
{
var detail = outStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId);
var res_c = await _erpService.BillQueryForCustomer();
var customer = res_c.Data.FirstOrDefault(f => f.Id == outStock.ReceiptCustomerId);
op.Remark += "\r\n" + "销售订单号:" + detail.SaleBillNo;
op.Remark += "\r\n" + "销售订单号:" + string.Join(",", detail.SaleBillNos);
op.Remark += "\r\n" + "客户:" + customer?.Name;
}
sList.Add(op);