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

修改bug1

Browse Source
This commit is contained in:
tongfei
2024-04-08 09:53:19 +08:00
parent b85f09dbe9
commit c2b51ebf66
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -995,7 +995,7 @@
明细 明细
</summary> </summary>
</member> </member>
<member name="M:WMS.Web.Domain.Entitys.InStockTask.Create(WMS.Web.Domain.Values.InstockType,System.String,System.DateTime)"> <member name="M:WMS.Web.Domain.Entitys.InStockTask.Create(WMS.Web.Domain.Values.InstockType,System.String,System.DateTime,System.Int32)">
<summary> <summary>
创建 创建
</summary> </summary>

3
src/WMS.Web.Domain/Entitys/InstockTask.cs
View File

@@ -95,7 +95,7 @@ namespace WMS.Web.Domain.Entitys
/// <param name="type"></param> /// <param name="type"></param>
/// <param name="sourceBillNo"></param> /// <param name="sourceBillNo"></param>
/// <param name="createTime"></param> /// <param name="createTime"></param>
public void Create(InstockType type,string sourceBillNo, DateTime createTime) public void Create(InstockType type,string sourceBillNo, DateTime createTime,int supplierId)
{ {
if (type == InstockType.Purchase) if (type == InstockType.Purchase)
this.Status = InstockStatus.Wait; this.Status = InstockStatus.Wait;
@@ -103,6 +103,7 @@ namespace WMS.Web.Domain.Entitys
this.Status = InstockStatus.WaitInStock; this.Status = InstockStatus.WaitInStock;
this.Type = type; this.Type = type;
this.SourceBillNo = sourceBillNo; this.SourceBillNo = sourceBillNo;
this.SupplierId = supplierId;
this.CreateTime = createTime; this.CreateTime = createTime;
} }

6
src/WMS.Web.Domain/Services/InStockTaskService.cs
View File

@@ -457,7 +457,7 @@ namespace WMS.Web.Domain.Services
{ {
var current_order = erp_list.Where(x => x.BillNo == item).FirstOrDefault(); var current_order = erp_list.Where(x => x.BillNo == item).FirstOrDefault();
var dto = new InStockTask(); var dto = new InStockTask();
dto.Create((InstockType)current_order.Type, current_order.BillNo, current_order.CreateTime); dto.Create((InstockType)current_order.Type, current_order.BillNo, current_order.CreateTime, current_order.SupplierId);
//找到当前对应来源单据编号的集合数据 //找到当前对应来源单据编号的集合数据
var current_erp_details = erp_list.Where(x => x.BillNo == item).ToList(); var current_erp_details = erp_list.Where(x => x.BillNo == item).ToList();
@@ -574,7 +574,7 @@ namespace WMS.Web.Domain.Services
bool IsAny = details_Groups.Any(d => d.RealityQtyTotal != 0 && d.AccruedQtyTotal > d.RealityQtyTotal); bool IsAny = details_Groups.Any(d => d.RealityQtyTotal != 0 && d.AccruedQtyTotal > d.RealityQtyTotal);
if (IsAny) if (IsAny)
order.Status = InstockStatus.Part; order.Status = InstockStatus.Part;
else if (details_Groups.Sum(x => x.ReceiveQtyTotal) <= 0) else if (details_Groups.Sum(x => x.ReceiveQtyTotal) <= 0 && order.Type== InstockType.Purchase)
order.Status = InstockStatus.Wait; order.Status = InstockStatus.Wait;
else if (details_Groups.Sum(x => x.RealityQtyTotal) <= 0) else if (details_Groups.Sum(x => x.RealityQtyTotal) <= 0)
order.Status = InstockStatus.WaitInStock; order.Status = InstockStatus.WaitInStock;
@@ -609,7 +609,7 @@ namespace WMS.Web.Domain.Services
{ {
var current_order = erp_list.Where(x => x.BillNo == item).FirstOrDefault(); var current_order = erp_list.Where(x => x.BillNo == item).FirstOrDefault();
var dto = new InStockTask(); var dto = new InStockTask();
dto.Create((InstockType)current_order.Type, current_order.BillNo, current_order.CreateTime); dto.Create((InstockType)current_order.Type, current_order.BillNo, current_order.CreateTime, current_order.SupplierId);
//找到当前对应来源单据编号的集合数据 //找到当前对应来源单据编号的集合数据
var current_erp_details = erp_list.Where(x => x.BillNo == item).ToList(); var current_erp_details = erp_list.Where(x => x.BillNo == item).ToList();