增加即时库存

src/WMS.Web.Domain/IService/Public/IErpService.cs

@@ -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);
         //提交

src/WMS.Web.Domain/Services/Public/ErpService.cs

@@ -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
     }
 }

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
                     });
                 }