diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index e884672a..9b17d53e 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -2709,7 +2709,7 @@
-
+
采购上架-保存
diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs
index 73258194..9a1c244c 100644
--- a/src/WMS.Web.Domain/Services/InStockService.cs
+++ b/src/WMS.Web.Domain/Services/InStockService.cs
@@ -29,19 +29,21 @@ namespace WMS.Web.Domain.Services
private readonly IMapper _mapper;
private readonly IErpService _erpService;
private readonly ILoginService _loginService;
+ private readonly ISerialNumberService _serialNumberService;
private readonly IChangeMoveBoxService _changeMoveBoxService;
private readonly IBoxRepositories _boxRepositories;
private readonly IBasicsRepositories _basicsRepositories;
private readonly IInStockRepositories _inStockRepositories;
private readonly IInStockTaskRepositories _inStockTaskRepositories;
private readonly IErpBasicDataExtendService _erpBasicDataExtendService;
- public InStockService(IMapper mapper, IErpService erpService, ILoginService loginService, IBoxRepositories boxRepositories,
+ public InStockService(IMapper mapper, IErpService erpService, ISerialNumberService serialNumberService, ILoginService loginService, IBoxRepositories boxRepositories,
IBasicsRepositories basicsRepositories, IErpBasicDataExtendService erpBasicDataExtendService, IChangeMoveBoxService changeMoveBoxService,
IInStockRepositories inStockRepositories, IInStockTaskRepositories inStockTaskRepositories)
{
_mapper = mapper;
_erpService = erpService;
_loginService = loginService;
+ _serialNumberService = serialNumberService;
_boxRepositories = boxRepositories;
_changeMoveBoxService = changeMoveBoxService;
_basicsRepositories = basicsRepositories;
@@ -94,7 +96,7 @@ namespace WMS.Web.Domain.Services
bool isRollback = false;
bool isTransaction = false;
//1.添加入库单:(同步金蝶在save方法里面进行)
- var save_result = await this.ShelfSave(instock, InstockType.Purchase, loginInfo.UserInfo.StaffId, isTransaction);
+ var save_result = await this.ShelfSave(instock, InstockType.Purchase, loginInfo, isTransaction);
if (!save_result.IsSuccess) isRollback = true;
{
//2.修改入库任务单
@@ -180,12 +182,12 @@ namespace WMS.Web.Domain.Services
///
///
///
- private async Task ShelfSave(PurchaseShelfRequest dto, InstockType type, int staffId, bool isTransaction = true)
+ private async Task ShelfSave(PurchaseShelfRequest dto, InstockType type, LoginInDto loginInfo, bool isTransaction = true)
{
var entity = new InStock();
entity.Type = type;
entity.Details = _mapper.Map>(dto.Details);
- entity.Create(staffId);
+ entity.Create(loginInfo.UserInfo.StaffId);
//需要填写序列号
//需要修改库存
@@ -194,7 +196,13 @@ namespace WMS.Web.Domain.Services
entity = await _inStockRepositories.Add(entity, isTransaction);
if (entity != null)
+ {
+ //保存成功后:序列号跟踪流程添加
+ var serialNumber_result= await _serialNumberService.InStock(entity, loginInfo, isTransaction);
+ if (!serialNumber_result.IsSuccess)
+ return serialNumber_result;
return Result.ReSuccess();
+ }
else
return Result.ReFailure(ResultCodes.DateWriteError);
}
@@ -250,6 +258,11 @@ namespace WMS.Web.Domain.Services
if (!changeBoxSave_Result.IsSuccess)
return changeBoxSave_Result;
}
+
+ //保存成功后:序列号跟踪流程添加;备注:和上面的改箱操作后会记录序列号轨迹不冲突;
+ var serialNumber_result = await _serialNumberService.InStock(entity, loginInfo, isTransaction);
+ if (!serialNumber_result.IsSuccess)
+ return serialNumber_result;
return Result.ReSuccess();
}