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

增加即时库存

Browse Source
This commit is contained in:
18942506660
2024-01-02 09:47:57 +08:00
parent 001c7a9774
commit 7a1d4bb52d
8 changed files with 72 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
View File

Binary file not shown.

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

@@ -62,8 +62,8 @@ namespace WMS.Web.Api.Controllers
[Route("hj")]
public async Task<string> TestHJ()
{
// OperateRequest dto = new OperateRequest();
// dto.Ids.Add(71);
//OperateRequest dto = new OperateRequest();
//dto.Ids.Add(95);
// var result = await this._erpService.BillQueryForSubStock();
//var ss= result.Data.Where(w => w.Name.Equals("Fares")).ToList();
//await _outStockService.Sync(dto, null);
@@ -73,7 +73,7 @@ namespace WMS.Web.Api.Controllers
//var entity=await _takeStockRepositories.GetEntityList(new List<int>() {2 });
//var r= await _takeStockService.Loss_Profit(entity.First());
//var list = await GetList();
//var c = await _erpService.BillQueryForSalOutStock("12709885");
var c = await _erpService.BillQueryForInventory("G03-60-551495", "101", "12485666");
//var c = await _erpService.BillQueryForAssembledAppOutStock_Assembly(new List<string>() { "ZZCX003061" }, DateTime.Now.AddDays(-10));
//var bc2 = await _erpService.BillQueryForDeliveryNoticeOutStock(new List<string>() { "FHTZD8022232" }, DateTime.Now.AddDays(-10));
//var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10));

9
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -1291,9 +1291,14 @@
仓位ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.AfterQty">
<member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.FinalQty">
<summary>
盘点实际数量（实际仓库数量）
盘盈数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.LossQty">
<summary>
盘亏数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.Fnote">

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

@@ -3095,6 +3095,12 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForInventory(System.String,System.String,System.String)">
<summary>
及时库存
</summary>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.IService.Public.ILoginService">
<summary>
登录服务接口

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

@@ -114,21 +114,21 @@ namespace WMS.Web.Core.Dto.Erp.TakeStock
///// </summary>
//[JsonProperty("FAcctQty")]
//public decimal BeforeQty { get; set; }
///// <summary>
///// 盘点实际数量（实际仓库数量）
///// </summary>
//[JsonProperty("FCountQty")]
//public decimal AfterQty { get; set; }
/// <summary>
/// 盘点实际数量（实际仓库数量）
/// 盘盈数量
/// </summary>
[JsonProperty("FCountQty")]
public decimal AfterQty { get; set; }
///// <summary>
///// 盘盈数量
///// </summary>
//[JsonProperty("FGainQty")]
//public decimal FinalQty { get; set; }
///// <summary>
///// 盘亏数量
///// </summary>
//[JsonProperty("FLossQty")]
//public decimal LossQty { get; set; }
[JsonProperty("FGainQty")]
public decimal FinalQty { get; set; }
/// <summary>
/// 盘亏数量
/// </summary>
[JsonProperty("FLossQty")]
public decimal LossQty { get; set; }
/// <summary>
/// 备注
/// </summary>

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

@@ -143,6 +143,11 @@ namespace WMS.Web.Domain.IService.Public
/// </summary>
/// <returns></returns>
Task<ResultList<Erp_SubStockDto>> BillQueryForSubStock();
/// <summary>
/// 及时库存
/// </summary>
/// <returns></returns>
Task<Result<decimal>> BillQueryForInventory(string materialId, string orgCode, string stockId);
//同步数据(保存提交审核)
Task<Result<string>> Save<T>(T dto, string formId);
//提交

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

@@ -2133,6 +2133,41 @@ namespace WMS.Web.Domain.Services.Public
}
}
public async Task<Result<decimal>> BillQueryForInventory(string materialId,string orgCode,string stockId)
{
try
{
//1.先登录金蝶-拿到token
var token_result = await this.Init();
if (!token_result.IsSuccess)
return Result<decimal>.ReFailure(token_result);
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto("STK_Inventory");
param.FieldKeys = "FQTY,FBASEAVBQTY,FMATERIALID.FNumber,FSTOCKORGID.FNumber,FSTOCKID.FNumber";
param.Limit = 100;
//param.FilterString = $"FMATERIALID.FNumber='{materialId}' and FSTOCKORGID.FNumber='{orgCode}'";
//param.FilterString = $"";
param.FilterString = $"FMATERIALID.FNumber='{materialId}' and FSTOCKORGID.FNumber='{orgCode}' and FSTOCKID.FNumber='{stockId}'";
query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
return Result<decimal>.ReSuccess(0);
}
catch (Exception ex)
{
return Result<decimal>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}
#endregion
}
}

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

@@ -218,7 +218,9 @@ namespace WMS.Web.Domain.Services
UnitId = new ErpNumberDto(unitNumber), //物料带出来
StockId = new ErpNumberDto(d.StockCode),
SubStockId = new ErpSubStockDto(d.StockCode, d.Erp_SubStockCode),
AfterQty = d.AfterQty,
//AfterQty = d.AfterQty,
FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0,
LossQty = entity.ResultType == TakeStockType.Loss ? d.FinalQty : 0,
Fnote = d.Remark
});
}