diff --git a/src/WMS.Web.Api/Controllers/OutStockController.cs b/src/WMS.Web.Api/Controllers/OutStockController.cs
index 944c0757..0fba0703 100644
--- a/src/WMS.Web.Api/Controllers/OutStockController.cs
+++ b/src/WMS.Web.Api/Controllers/OutStockController.cs
@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
+using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.OutStock;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Infrastructure;
@@ -69,17 +70,17 @@ namespace WMS.Web.Api.Controllers
///
/// 同步金蝶
///
- ///
+ ///
///
- [HttpGet]
+ [HttpPost]
[Route("Sync")]
- public async Task Sync([FromRoute] int id)
+ public async Task Sync(OperateRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result.ReFailure(ResultCodes.Token_Invalid_Error);
- return await _outStockService.Sync(id);
+ return await _outStockService.Sync(dto);
}
}
}
diff --git a/src/WMS.Web.Api/Controllers/TakeStockController.cs b/src/WMS.Web.Api/Controllers/TakeStockController.cs
index dbf30c36..bd55e172 100644
--- a/src/WMS.Web.Api/Controllers/TakeStockController.cs
+++ b/src/WMS.Web.Api/Controllers/TakeStockController.cs
@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
+using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.TakeStock;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Infrastructure;
@@ -69,11 +70,11 @@ namespace WMS.Web.Api.Controllers
///
/// 同步金蝶
///
- ///
+ ///
///
[HttpGet]
[Route("Sync")]
- public async Task Sync([FromRoute] int id)
+ public async Task Sync(OperateRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
diff --git a/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs b/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
index bf87a0c3..5519ffc2 100644
--- a/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
+++ b/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
@@ -41,6 +41,10 @@ namespace WMS.Web.Core.Dto.OutStock
[Required(ErrorMessage = "仓库不能为空")]
public int StockId { get; set; }
///
+ /// 仓位ID
+ ///
+ public int? SubStockId { get; set; }
+ ///
/// 出库数量
///
[Required(ErrorMessage = "出库数量不能为空")]
diff --git a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs
index 18670e9e..14d9aec8 100644
--- a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs
@@ -56,6 +56,11 @@ namespace WMS.Web.Domain.Entitys
[Column("StockId")]
public int StockId { get; set; }
///
+ /// 仓位ID
+ ///
+ [Column("SubStockId")]
+ public int? SubStockId { get; set; }
+ ///
/// 出库数量
///
[Column("Qty")]
diff --git a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs
index 4b1d43e9..f94a86b5 100644
--- a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs
@@ -55,6 +55,11 @@ namespace WMS.Web.Domain.Entitys
[Column("StockId")]
public int StockId { get; set; }
///
+ /// 仓位ID
+ ///
+ [Column("SubStockId")]
+ public int? SubStockId { get; set; }
+ ///
/// 应出库数量
///
[Column("AccruedQty")]
diff --git a/src/WMS.Web.Domain/IService/IOutStockService.cs b/src/WMS.Web.Domain/IService/IOutStockService.cs
index a2915edc..244d4b0a 100644
--- a/src/WMS.Web.Domain/IService/IOutStockService.cs
+++ b/src/WMS.Web.Domain/IService/IOutStockService.cs
@@ -18,7 +18,7 @@ namespace WMS.Web.Domain.IService
//出库单保存
Task Save(List dto, LoginInDto loginInfo);
// 同步金蝶
- Task Sync(int id);
+ Task Sync(OperateRequest dto);
//出库任务作废
Task Repeal(OperateRequest dto, LoginInDto loginInfo);
//出库任务作废
diff --git a/src/WMS.Web.Domain/IService/ITakeStockService.cs b/src/WMS.Web.Domain/IService/ITakeStockService.cs
index 5772c63b..4e90d113 100644
--- a/src/WMS.Web.Domain/IService/ITakeStockService.cs
+++ b/src/WMS.Web.Domain/IService/ITakeStockService.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
+using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.Login;
using WMS.Web.Core.Dto.TakeStock;
using WMS.Web.Core.Internal.Results;
@@ -16,6 +17,6 @@ namespace WMS.Web.Domain.IService
//保存
Task Save(List dto, LoginInDto loginInfo);
// 同步金蝶
- Task Sync(int id);
+ Task Sync(OperateRequest dto);
}
}
diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs
index d2846b24..7a8abce9 100644
--- a/src/WMS.Web.Domain/Services/OutStockService.cs
+++ b/src/WMS.Web.Domain/Services/OutStockService.cs
@@ -70,9 +70,9 @@ namespace WMS.Web.Domain.Services
///
/// 同步金蝶
///
- ///
+ ///
///
- public Task Sync(int id)
+ public Task Sync(OperateRequest dto)
{
return Task.FromResult(Result.ReSuccess());
}
diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs
index 4ed44446..c00e0c78 100644
--- a/src/WMS.Web.Domain/Services/TakeStockService.cs
+++ b/src/WMS.Web.Domain/Services/TakeStockService.cs
@@ -4,6 +4,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
+using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.Login;
using WMS.Web.Core.Dto.TakeStock;
using WMS.Web.Core.Internal.Results;
@@ -65,9 +66,9 @@ namespace WMS.Web.Domain.Services
///
/// 同步金蝶
///
- ///
+ ///
///
- public Task Sync(int id)
+ public Task Sync(OperateRequest dto)
{
return Task.FromResult(Result.ReSuccess());
}