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

金蝶物料数据-可以使用了

Browse Source
This commit is contained in:
tongfei
2023-11-08 10:46:00 +08:00
parent 2ec6103f11 ec755cb92e
commit 1354160705
19 changed files with 325 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@ using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Values;
using WMS.Web.Domain.Values.Single;
namespace WMS.Web.Api.Controllers
{
@@ -25,12 +26,16 @@ namespace WMS.Web.Api.Controllers
private readonly ILoginService _loginService;
private readonly IBasicsRepositories _basicsRepositories;
private readonly IBoxRepositories _boxRepositories;
private readonly IErpService _erpService;
private readonly ISingleDataService _singleDataService;
public SysConfigController(ILoginService loginService, IBasicsRepositories basicsRepositories,
IBoxRepositories boxRepositories)
IBoxRepositories boxRepositories, IErpService erpService, ISingleDataService singleDataService)
{
_loginService = loginService;
_basicsRepositories = basicsRepositories;
_boxRepositories = boxRepositories;
_erpService = erpService;
_singleDataService = singleDataService;
}
/// <summary>
@@ -111,6 +116,37 @@ namespace WMS.Web.Api.Controllers
var r = await _basicsRepositories.GetSubUcStockAsync(id);
return Result<List<UcStockResponse>>.ReSuccess(r);
}
/// <summary>
/// 根据仓库获取金蝶子仓库
/// </summary>
/// <param name="id">仓库id</param>
/// <returns></returns>
[HttpGet]
[Route("GetErp_SubUcStock/{id}")]
public async Task<Result<List<UcStockResponse>>> GetErp_SubUcStock([FromRoute] int id)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result<List<UcStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
List<UcStockResponse> list = new List<UcStockResponse>();
var code = _singleDataService.GetSingleDataCode(SingleAction.Stocks, loginInfo.UserInfo.CompanyId, id);
if (code.Substring(0, 2).Equals("HD") || code.Substring(0, 2).Equals("GD"))
{
var subs = await _erpService.BillQueryForSubStock(code);
foreach (var s in subs.Data)
{
list.Add(new UcStockResponse()
{
Id = s.Id,
Code = s.Code,
Name = s.Name,
Disable = false
});
}
}
return Result<List<UcStockResponse>>.ReSuccess(list);
}
/// <summary>
/// 获取仓位：模糊名称

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

@@ -9,6 +9,7 @@ using System.Collections.Generic;
using System.Linq;
using System.ServiceModel;
using System.Threading.Tasks;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService;
@@ -23,19 +24,28 @@ namespace WMS.Web.Api.Controllers
private readonly IErpService _erpService;
private IInStockTaskService _inStockTaskService;
private IBasicsRepositories _transactionRepositories;
private readonly IOpsService _opsService;
public TestController(IErpService erpService, IInStockTaskService inStockTaskService, IBasicsRepositories transactionRepositories)
public TestController(IErpService erpService, IInStockTaskService inStockTaskService,
IBasicsRepositories transactionRepositories, IOpsService opsService)
{
this._erpService = erpService;
this._inStockTaskService = inStockTaskService;
this._transactionRepositories = transactionRepositories;
_opsService = opsService;
}
[HttpGet]
[Route("hj")]
public async Task<string> TestHJ()
{
var res = await this._erpService.BillQueryForTransferDirectOutStock();
OpsBoxRequest request = new OpsBoxRequest()
{
StrartTime = DateTime.Now.AddYears(-1),
EndTime=DateTime.Now
};
await _opsService.GetBox(request);
//var res = await this._erpService.BillQueryForSubStock();
//var result= await this._erpService.BillQueryForPurchaseInStock();
//var result = await this._erpService.BillQueryForOrg();
var result = await this._erpService.BillQueryForMaterial();

5
src/WMS.Web.Api/appsettings.json
View File

@@ -43,6 +43,11 @@
"ErpId": "ce20210909",
"PurchaseInstockFieldKeys": "FBillNo,FUOM,FSupplierId.FName,FPurchaseOrgId.FName,FMaterialName,FMaterialId.FNumber"
},
"OpsOptions": {
"Url": "http://39.108.150.2:8050/",
"UserName": "admin",
"PassWord": "888888"
},
"Qiniu": {
"AccessKey": "dOsTum4a5qvhPTBbZRPX0pIOU7PZWRX7htKjztms",
"SecretKey": "KFxsGbnErkALFfeGdMa8QWTdodJbamMX0iznLe-q",

7
src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
View File

@@ -283,6 +283,13 @@
<param name="id">仓库id</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetErp_SubUcStock(System.Int32)">
<summary>
根据仓库获取金蝶子仓库
</summary>
<param name="id">仓库id</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStockByName(System.String)">
<summary>
获取仓位：模糊名称

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

@@ -2280,6 +2280,16 @@
操作 Id集合
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.OpsBoxRequest">
<summary>
老ops箱信息请求
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.OpsBoxResponse">
<summary>
老ops箱信息
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.OutStockTask.GetOutStockTaskByNoResponse">
<summary>
根据单号搜索出库单任务信息

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

@@ -993,6 +993,11 @@
仓位ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.Erp_SubStockId">
<summary>
子仓库(跟金蝶交互字段)
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.BeforeQty">
<summary>
盘点前数量（wms系统数量）
@@ -1598,6 +1603,12 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForSubStock(System.String)">
<summary>
获取仓位信息信息 根据仓库编码
</summary>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.IService.Public.ILoginService">
<summary>
登录服务接口
@@ -1924,6 +1935,11 @@
采购入库：字段
</summary>
</member>
<member name="T:WMS.Web.Domain.Options.OpsOptions">
<summary>
老ops对接
</summary>
</member>
<member name="T:WMS.Web.Domain.Options.QuartzJobOptions">
<summary>
Quartz定时任务-配置项
@@ -2373,6 +2389,13 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForSubStock(System.String)">
<summary>
根据仓库编码获取仓位
</summary>
<param name="code"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.Sync``1(``0,System.String)">
<summary>
同步数据(保存提交审核)
@@ -2597,6 +2620,11 @@
<param name="sessionId"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Services.Public.OpsService">
<summary>
ops服务
</summary>
</member>
<member name="M:WMS.Web.Domain.Services.Public.RedisClientService.SetStringKey(System.String,System.String,System.Nullable{System.TimeSpan})">
<summary>
保存单个key value