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

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

@@ -122,7 +122,7 @@ namespace WMS.Web.Domain.IService.Public
/// 获取仓位信息信息 根据仓库编码
/// </summary>
/// <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);
//提交

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

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