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

修复bug

Browse Source
This commit is contained in:
18942506660
2023-12-20 10:49:10 +08:00
parent 26f9e47f4f
commit 0f6581beab
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,9 +215,9 @@ namespace WMS.Web.Api.Controllers
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"))
return Result<List<UcStockResponse>>.ReSuccess(list); return Result<List<UcStockResponse>>.ReSuccess(list);
var subs = await _erpService.BillQueryForSubStock(number, orgCode); var subs = await _erpService.BillQueryForSubStock();
//var subs = await _erpService.BillQueryForSubStock(null, null); //var subs = await _erpService.BillQueryForSubStock(null, null);
list = subs.Data.Where(w => w.Name.Contains(name)).Select(s => new UcStockResponse() list = subs.Data.Where(w => w.Name.Equals(name) && w.OrgCode.Equals(orgCode)).Select(s => new UcStockResponse()
{ {
Id = s.Id, Id = s.Id,
Code = s.Code, Code = s.Code,

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

@@ -58,8 +58,9 @@ namespace WMS.Web.Api.Controllers
{ {
OperateRequest dto = new OperateRequest(); OperateRequest dto = new OperateRequest();
dto.Ids.Add(54); dto.Ids.Add(54);
var result = await this._erpService.BillQueryForSubStock();
//await _outStockService.Sync(dto, null); //await _outStockService.Sync(dto, null);
var b = await _takeStockService.Sync(dto); //var b = await _takeStockService.Sync(dto);
// List<ErpCustomerDto> list = null; // List<ErpCustomerDto> list = null;
//var b= list.FirstOrDefault(f => f.Id == 123); //var b= list.FirstOrDefault(f => f.Id == 123);
//var entity=await _takeStockRepositories.GetEntityList(new List<int>() {2 }); //var entity=await _takeStockRepositories.GetEntityList(new List<int>() {2 });

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

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

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

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

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

@@ -1240,7 +1240,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, string orgCode = null) public async Task<ResultList<ErpStockDto>> BillQueryForSubStock()
{ {
try try
{ {
@@ -1254,10 +1254,9 @@ namespace WMS.Web.Domain.Services.Public
return ResultList<ErpStockDto>.ReFailure(token_result); return ResultList<ErpStockDto>.ReFailure(token_result);
var query = new ErpBillQueryDto(token_result.Data); var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.BD_STOCK.ToString()); var param = new ErpBillQueryParamDto(FormIdParam.BD_STOCK.ToString());
param.FieldKeys = "FStockFlexDetail_FDetailID,FFlexEntryName,FFlexEntryId,'0'"; param.FieldKeys = "FStockFlexDetail_FDetailID,FFlexEntryName,FFlexEntryId,FUseOrgId.FNumber";
param.Limit = 100000; param.Limit = 100000;
if (!string.IsNullOrEmpty(code)) param.FilterString = $"FNumber='HD' or FNumber='GD'";//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);
@@ -1272,12 +1271,11 @@ namespace WMS.Web.Domain.Services.Public
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];
lis.OrgId = Convert.ToInt32(item[3]); lis.OrgCode = item[3];
list.Add(lis); list.Add(lis);
} }
//5.供应商集合进行缓存 只有查询全部的时候才缓存 //5.供应商集合进行缓存 只有查询全部的时候才缓存
if (code == null)
_memoryCache.Set(cache_key, list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12))); _memoryCache.Set(cache_key, list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12)));
_logger.LogInformation($"子仓库拉取-总条数：{list.Count}"); _logger.LogInformation($"子仓库拉取-总条数：{list.Count}");
return ResultList<ErpStockDto>.ReSuccess(list); return ResultList<ErpStockDto>.ReSuccess(list);
@@ -2080,7 +2078,7 @@ namespace WMS.Web.Domain.Services.Public
{ {
var lis = new ErpSalOutStockDetailsSaveDto(); var lis = new ErpSalOutStockDetailsSaveDto();
lis.DetailId = item[1]; lis.DetailId = item[1];
lis.Qty =Convert.ToDecimal(item[2]); lis.Qty = Convert.ToDecimal(item[2]);
lis.DeliveryNoticeDetailId = ""; lis.DeliveryNoticeDetailId = "";
erp_list.Details.Add(lis); erp_list.Details.Add(lis);
} }