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

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-11-25 16:46:20 +08:00
parent 45e3338247 79bab503d7
commit 0320d4cc2c
7 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/WMS.Web.Api/Controllers/SysConfigController.cs
View File

@@ -198,19 +198,20 @@ namespace WMS.Web.Api.Controllers
/// <param name="name">模糊匹配</param> /// <param name="name">模糊匹配</param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Route("GetErp_SubUcStock/{number}")] [Route("GetErp_SubUcStock/{number}/{orgCode}")]
public async Task<Result<List<UcStockResponse>>> GetErp_SubUcStock([FromRoute] string number, [FromQuery] string name) public async Task<Result<List<UcStockResponse>>> GetErp_SubUcStock([FromRoute] string number,[FromRoute] string orgCode, [FromQuery] string name)
{ {
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null) if (loginInfo == null || loginInfo.UserInfo == null)
return Result<List<UcStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error); return Result<List<UcStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
List<UcStockResponse> list = new List<UcStockResponse>(); List<UcStockResponse> list = new List<UcStockResponse>();
if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD")) //if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD"))
//{
//var subs = await _erpService.BillQueryForSubStock(number,orgCode);
var subs = await _erpService.BillQueryForSubStock(null, null);
foreach (var s in subs.Data.Skip(0).Take(10))//.Where(w => w.Name.Contains(name)
{ {
var subs = await _erpService.BillQueryForSubStock(number);
foreach (var s in subs.Data.Where(w => EF.Functions.Like(w.Name, "%" + name + "%")))
{
list.Add(new UcStockResponse() list.Add(new UcStockResponse()
{ {
Id = s.Id, Id = s.Id,
@@ -219,7 +220,7 @@ namespace WMS.Web.Api.Controllers
Disable = false Disable = false
}); });
} }
} //}
return Result<List<UcStockResponse>>.ReSuccess(list); return Result<List<UcStockResponse>>.ReSuccess(list);
} }

2
src/WMS.Web.Api/Controllers/TestController.cs
View File

@@ -46,7 +46,7 @@ namespace WMS.Web.Api.Controllers
[Route("hj")] [Route("hj")]
public async Task<string> TestHJ() public async Task<string> TestHJ()
{ {
var c = await _erpService.BillQueryForCustomer(); var c = await _erpService.BillQueryForSubStock(null,null);
//var bc2 = await _erpService.BillQueryForMisDeliveryOutStock(null, DateTime.Now.AddDays(-10)); //var bc2 = await _erpService.BillQueryForMisDeliveryOutStock(null, DateTime.Now.AddDays(-10));
//var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10)); //var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10));
//var b=await _erpService.BillQueryForAssembledAppOutStock_Assembly(null, DateTime.Now.AddDays(-1)); //var b=await _erpService.BillQueryForAssembledAppOutStock_Assembly(null, DateTime.Now.AddDays(-1));

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

@@ -481,7 +481,7 @@
<param name="id">仓库id</param> <param name="id">仓库id</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetErp_SubUcStock(System.String,System.String)"> <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetErp_SubUcStock(System.String,System.String,System.String)">
<summary> <summary>
根据仓库获取金蝶子仓库 根据仓库获取金蝶子仓库
</summary> </summary>

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

@@ -2741,7 +2741,7 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForSubStock(System.String)"> <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForSubStock(System.String,System.String)">
<summary> <summary>
获取仓位信息信息 根据仓库编码 获取仓位信息信息 根据仓库编码
</summary> </summary>
@@ -4021,7 +4021,7 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForSubStock(System.String)"> <member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForSubStock(System.String,System.String)">
<summary> <summary>
根据仓库编码获取仓位 根据仓库编码获取仓位
</summary> </summary>

1
src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
View File

@@ -42,7 +42,6 @@ namespace WMS.Web.Core.Dto.TakeStock
/// <summary> /// <summary>
/// 序列号 /// 序列号
/// </summary> /// </summary>
[Required(ErrorMessage = "序列号不能为空")]
public List<string> SerialNumbers { get; set; } = new List<string>(); public List<string> SerialNumbers { get; set; } = new List<string>();
/// <summary> /// <summary>
/// 备注 /// 备注

2
src/WMS.Web.Domain/IService/Public/IErpService.cs
View File

@@ -122,7 +122,7 @@ namespace WMS.Web.Domain.IService.Public
/// 获取仓位信息信息 根据仓库编码 /// 获取仓位信息信息 根据仓库编码
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
Task<ResultList<ErpStockDto>> BillQueryForSubStock(string code=null); Task<ResultList<ErpStockDto>> BillQueryForSubStock(string code=null, string orgCode = null);
//同步数据(保存提交审核) //同步数据(保存提交审核)
Task<Result<string>> Save<T>(T dto, string formId); Task<Result<string>> Save<T>(T dto, string formId);
//提交 //提交

5
src/WMS.Web.Domain/Services/Public/ErpService.cs
View File

@@ -1131,7 +1131,7 @@ namespace WMS.Web.Domain.Services.Public
/// </summary> /// </summary>
/// <param name="code"></param> /// <param name="code"></param>
/// <returns></returns> /// <returns></returns>
public async Task<ResultList<ErpStockDto>> BillQueryForSubStock(string code = null) public async Task<ResultList<ErpStockDto>> BillQueryForSubStock(string code = null,string orgCode=null)
{ {
try try
{ {
@@ -1148,7 +1148,7 @@ namespace WMS.Web.Domain.Services.Public
param.FieldKeys = "FStockFlexDetail_FDetailID,FFlexEntryName,FFlexEntryId,'0'"; param.FieldKeys = "FStockFlexDetail_FDetailID,FFlexEntryName,FFlexEntryId,'0'";
param.Limit = 100000; param.Limit = 100000;
if (!string.IsNullOrEmpty(code)) if (!string.IsNullOrEmpty(code))
param.FilterString = "FNumber='" + code + "'";//FNumber='C' param.FilterString = $"FNumber='{code}' and FUseOrgId.FNumber='{orgCode}'";//FNumber='C'
query.Data = JsonConvert.SerializeObject(param); query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query); var json = JsonConvert.SerializeObject(query);
@@ -1159,6 +1159,7 @@ namespace WMS.Web.Domain.Services.Public
foreach (var item in result) foreach (var item in result)
{ {
var lis = new ErpStockDto(); var lis = new ErpStockDto();
if (item[0] == "0") continue;
lis.Id = int.Parse(item[0]); lis.Id = int.Parse(item[0]);
lis.Name = item[1]; lis.Name = item[1];
lis.Code = item[2]; lis.Code = item[2];