diff --git a/src/WMS.Web.Domain/Entitys/InstockTask.cs b/src/WMS.Web.Domain/Entitys/InstockTask.cs index 03f00e5f..dd6b1510 100644 --- a/src/WMS.Web.Domain/Entitys/InstockTask.cs +++ b/src/WMS.Web.Domain/Entitys/InstockTask.cs @@ -1,4 +1,5 @@ -using System; +using NPOI.OpenXmlFormats.Dml.Diagram; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; @@ -103,6 +104,8 @@ namespace WMS.Web.Domain.Entitys { if (type == InstockType.Purchase) this.Status = InstockStatus.Wait; + else if (type == InstockType.ProduceSotck) + this.Status = InstockStatus.Wait; else this.Status = InstockStatus.WaitInStock; this.Type = type; diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs index 7b3cf3e3..b118e9cc 100644 --- a/src/WMS.Web.Domain/Services/InStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs @@ -78,6 +78,11 @@ namespace WMS.Web.Domain.Services var result = await this.SsynPurchaseInStock(billNos, isTransaction); if (!result.IsSuccess) isRollback = true; } + else if(task.Type==InstockType.ProduceSotck) + { + var result = await this.SsynProduceSotck(billNos, isTransaction); + if (!result.IsSuccess) isRollback = true; + } else if (task.Type == InstockType.Miscellaneous) { var result = await this.SysnMiscellaneous(billNos, isTransaction); diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 094b6f8e..bb112f40 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -795,6 +795,7 @@ namespace WMS.Web.Domain.Services.Public lis.ErpDetailId = Convert.ToInt32(item[12]); lis.Type = (int)InstockType.ProduceSotck; lis.SaleBillNo = item[1]; + erp_list.Add(lis); } //_logger.LogInformation("分步式调入条数:" + erp_list.Count);