diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 735fce1e..699ca056 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index 9504d913..7d1c3f6a 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -62,8 +62,8 @@ namespace WMS.Web.Api.Controllers [Route("hj")] public async Task 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() {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() { "ZZCX003061" }, DateTime.Now.AddDays(-10)); //var bc2 = await _erpService.BillQueryForDeliveryNoticeOutStock(new List() { "FHTZD8022232" }, DateTime.Now.AddDays(-10)); //var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10)); diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index b6ee49fa..6ed47d58 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -1291,9 +1291,14 @@ 仓位ID - + - 盘点实际数量（实际仓库数量） + 盘盈数量 + + + + + 盘亏数量 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 99b9dba1..462c321e 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -3095,6 +3095,12 @@ + + + 及时库存 + + + 登录服务接口 diff --git a/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs b/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs index 9bfef6fd..0eff4f5d 100644 --- a/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs +++ b/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs @@ -114,21 +114,21 @@ namespace WMS.Web.Core.Dto.Erp.TakeStock ///// //[JsonProperty("FAcctQty")] //public decimal BeforeQty { get; set; } + ///// + ///// 盘点实际数量（实际仓库数量） + ///// + //[JsonProperty("FCountQty")] + //public decimal AfterQty { get; set; } /// - /// 盘点实际数量（实际仓库数量） + /// 盘盈数量 /// - [JsonProperty("FCountQty")] - public decimal AfterQty { get; set; } - ///// - ///// 盘盈数量 - ///// - //[JsonProperty("FGainQty")] - //public decimal FinalQty { get; set; } - ///// - ///// 盘亏数量 - ///// - //[JsonProperty("FLossQty")] - //public decimal LossQty { get; set; } + [JsonProperty("FGainQty")] + public decimal FinalQty { get; set; } + /// + /// 盘亏数量 + /// + [JsonProperty("FLossQty")] + public decimal LossQty { get; set; } /// /// 备注 /// diff --git a/src/WMS.Web.Domain/IService/Public/IErpService.cs b/src/WMS.Web.Domain/IService/Public/IErpService.cs index 5b2bc28c..3ef269db 100644 --- a/src/WMS.Web.Domain/IService/Public/IErpService.cs +++ b/src/WMS.Web.Domain/IService/Public/IErpService.cs @@ -143,6 +143,11 @@ namespace WMS.Web.Domain.IService.Public /// /// Task> BillQueryForSubStock(); + /// + /// 及时库存 + /// + /// + Task> BillQueryForInventory(string materialId, string orgCode, string stockId); //同步数据(保存提交审核) Task> Save(T dto, string formId); //提交 diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 3c4f1a90..64d7bf85 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -2133,6 +2133,41 @@ namespace WMS.Web.Domain.Services.Public } } + public async Task> BillQueryForInventory(string materialId,string orgCode,string stockId) + { + try + { + //1.先登录金蝶-拿到token + var token_result = await this.Init(); + if (!token_result.IsSuccess) + return Result.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>>(result_json); + + + return Result.ReSuccess(0); + } + catch (Exception ex) + { + return Result.ReFailure(ResultCodes.Erp_BillQuery_Error); + } + } + #endregion } } diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index 0c6b4929..c4df27c0 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -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 }); }