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-01 17:08:38 +08:00
parent 4e3926ff89
commit 165db0ead4
4 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/WMS.Web.Core/Dto/Erp/ErpNumberDto.cs
View File

@@ -20,4 +20,30 @@ namespace WMS.Web.Core.Dto.Erp
[JsonProperty("FNumber")]
public string Number { get; set; }
}
/// <summary>
/// 盘点子仓库
/// </summary>
public class ErpSubStockDto
{
public ErpSubStockDto() { }
public ErpSubStockDto(string code)
{
if (code.Equals("GD"))
this.GD = new ErpNumberDto(code);
if (code.Equals("HD"))
this.HD = new ErpNumberDto(code);
}
/// <summary>
/// GD仓
/// </summary>
[JsonProperty("FSTOCKLOCID__FF100005")]
public ErpNumberDto GD { get; set; } = new ErpNumberDto("");
/// <summary>
/// HD仓
/// </summary>
[JsonProperty("FSTOCKLOCID__FF100007")]
public ErpNumberDto HD { get; set; } = new ErpNumberDto("");
}
}

2
src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs
View File

@@ -108,7 +108,7 @@ namespace WMS.Web.Core.Dto.Erp.TakeStock
/// 仓位ID
/// </summary>
[JsonProperty("FStockLocId")]
public string SubStockId { get; set; }
public ErpSubStockDto SubStockId { get; set; }
/// <summary>
/// 盘点前数量（wms系统数量）
/// </summary>

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

@@ -803,7 +803,7 @@ namespace WMS.Web.Domain.Services.Public
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public async Task<Result<ErpMaterialDto>> BillQueryForMaterial(int id)
public async Task<Result<ErpMaterialDto>> BillQueryForMaterial(int id)
{
//1.获取缓存中的物料数据；
var cache_key = "erp_materials_list";
@@ -1276,8 +1276,9 @@ namespace WMS.Web.Domain.Services.Public
list.Add(lis);
}
//5.供应商集合进行缓存
_memoryCache.Set(cache_key, list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12)));
//5.供应商集合进行缓存 只有查询全部的时候才缓存
if (code == null)
_memoryCache.Set(cache_key, list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12)));
_logger.LogInformation($"子仓库拉取-总条数：{list.Count}");
return ResultList<ErpStockDto>.ReSuccess(list);
}
@@ -1306,7 +1307,7 @@ namespace WMS.Web.Domain.Services.Public
var token_result = await this.Init();
if (!token_result.IsSuccess)
return Result<string>.ReFailure(token_result.Message, token_result.Status);
var query = new ErpBillQueryDto(token_result.Data,formId);
var query = new ErpBillQueryDto(token_result.Data, formId);
var param = new ErpSave<T>(formId, dto);
query.Data = JsonConvert.SerializeObject(param);
//保存
@@ -1317,7 +1318,7 @@ namespace WMS.Web.Domain.Services.Public
if (jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower() == "true")
{
//保存成功后返回Id 后续操作根据Id操作
string id =jobject["Result"]["ResponseStatus"]["SuccessEntitys"][0]["Id"].ToString();
string id = jobject["Result"]["ResponseStatus"]["SuccessEntitys"][0]["Id"].ToString();
return Result<string>.ReSuccess(id);
}

6
src/WMS.Web.Domain/Services/TakeStockService.cs
View File

@@ -129,11 +129,13 @@ namespace WMS.Web.Domain.Services
var materials = materials_result.Data.ToList();
var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, entity.MaterialId);
var res = await _erpService.BillQueryForStock();
var resSub = await _erpService.BillQueryForSubStock();
var stock = res.Data.FirstOrDefault(f => f.Code == entity.StockCode);//需要根据单点code搜索
var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
var subStock = resSub.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
if (stock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
//组装dto
#region 组装dto
//子仓库 ORICO_JD：1000008 GD：1000005 HD：1000007 AD：1000004
List<ErpTakeStockDetailsSaveDto> detils = new List<ErpTakeStockDetailsSaveDto>();
detils.Add(new ErpTakeStockDetailsSaveDto()
{
@@ -142,7 +144,7 @@ namespace WMS.Web.Domain.Services
MaterialId = new ErpNumberDto(_erpBasicDataExtendService.GetMaterialNumber(materials, entity.MaterialId)),
UnitId = new ErpNumberDto(unitNumber), //物料带出来
StockId = new ErpNumberDto(stock.Code),
SubStockId = subStock?.Id.ToString(),
SubStockId =new ErpSubStockDto(resSub.Data.FirstOrDefault(f => f.Id == entity.Erp_SubStockId).Code),
BeforeQty = entity.BeforeQty,
AfterQty = entity.AfterQty,
FinalQty = entity.FinalQty,