From f1543a78d5b070eb4fc09f74574df6b10c82101e Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Fri, 10 Nov 2023 09:42:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3=E5=8F=82?=
=?UTF-8?q?=E6=95=B0=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/InStockTaskController.cs | 33 +++++--------------
src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml | 11 ++-----
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 10 ++++++
3 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/src/WMS.Web.Api/Controllers/InStockTaskController.cs b/src/WMS.Web.Api/Controllers/InStockTaskController.cs
index 32633471..0dfa36b9 100644
--- a/src/WMS.Web.Api/Controllers/InStockTaskController.cs
+++ b/src/WMS.Web.Api/Controllers/InStockTaskController.cs
@@ -68,54 +68,37 @@ namespace WMS.Web.Api.Controllers
return await _inStockService.Receive(dto, loginInfo);
}
- ///
- /// 采购订单-单据编号模糊-pad
- ///
- ///
- ///
- [HttpPost]
- [Route("Purchase/{code}")]
- public async Task> Purchase([FromRoute] string code)
- {
- var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
- if (loginInfo == null || loginInfo.UserInfo == null)
- return ResultList.ReFailure(ResultCodes.Token_Invalid_Error);
-
- var list= await _inStockTaskRepositories.GetListBy(new InStockTaskBillNoQueryRequest() { SourceBillNo=code,InstockType= (int)InstockType.Purchase });
- return ResultList.ReSuccess(list);
- }
-
///
/// 来源单-编号模糊查询-pad
///
- ///
+ /// 来源单号
///
[HttpGet]
- [Route("GetSourceOrder/{code}")]
- public async Task> GetSourceOrder([FromRoute] string code)
+ [Route("GetSourceOrder/{sourceBillNo}")]
+ public async Task> GetSourceOrder([FromRoute] string sourceBillNo)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList.ReFailure(ResultCodes.Token_Invalid_Error);
- var list= await _inStockTaskRepositories.GetListBy(new InStockTaskBillNoQueryRequest() { SourceBillNo = code, InstockType = null });
+ var list= await _inStockTaskRepositories.GetListBy(new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo, InstockType = null });
return ResultList.ReSuccess(list);
}
///
/// 来源单的信息校准-对应金蝶-pad
///
- ///
+ ///
///
[HttpGet]
- [Route("Adjust/{code}")]
- public async Task> Adjust([FromRoute] string code)
+ [Route("Adjust/{sourceBillNo}")]
+ public async Task> Adjust([FromRoute] string sourceBillNo)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList.ReFailure(ResultCodes.Token_Invalid_Error);
- return await _inStockTaskService.GetPurchaseInstockTask(code);
+ return await _inStockTaskService.GetPurchaseInstockTask(sourceBillNo);
}
///
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index 63950280..a8ce6d4e 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -108,25 +108,18 @@
-
-
- 采购订单-单据编号模糊-pad
-
-
-
-
来源单-编号模糊查询-pad
-
+ 来源单号
来源单的信息校准-对应金蝶-pad
-
+
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index a7d05bbc..5f2c49d8 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -2345,6 +2345,16 @@
移箱列表请求
+
+
+ 原仓位编码
+
+
+
+
+ 目标仓位编码
+
+
类型：1- 整箱移货上级，2-整箱移货下级