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

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-12-21 09:15:05 +08:00
parent 3b130fa44c 4df9e97289
commit d03b2cc1e6
13 changed files with 166 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,7 +227,7 @@ namespace WMS.Web.Api.Controllers
return Result<List<UcStockResponse>>.ReSuccess(list);
var subs = await _erpService.BillQueryForSubStock();
var res = subs.Data.Where(w => w.OrgCode.Equals(orgCode));
var res = subs.Data.Where(w => w.OrgCode.Equals(orgCode)&&w.StockCode.Equals(number));
if (!string.IsNullOrEmpty(name))
res = res.Where(w => w.Name.Contains(name));
list = res.Select(s => new UcStockResponse()

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

@@ -8,6 +8,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.ServiceModel;
using System.Threading;
using System.Threading.Tasks;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.Erp.Customer;
@@ -56,10 +57,10 @@ namespace WMS.Web.Api.Controllers
[Route("hj")]
public async Task<string> TestHJ()
{
// OperateRequest dto = new OperateRequest();
// dto.Ids.Add(71);
// var result = await this._erpService.BillQueryForSubStock();
//var ss= result.Data.Where(w => w.Name.Equals("Fares")).ToList();
// OperateRequest dto = new OperateRequest();
// dto.Ids.Add(71);
// var result = await this._erpService.BillQueryForSubStock();
//var ss= result.Data.Where(w => w.Name.Equals("Fares")).ToList();
//await _outStockService.Sync(dto, null);
//var b = await _takeStockService.Sync(dto);
// List<ErpCustomerDto> list = null;

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

@@ -1151,6 +1151,41 @@
业务组织(使用组织)编码
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.Erp_SubStockDto">
<summary>
子仓库信息
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Erp_SubStockDto.Id">
<summary>
id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Erp_SubStockDto.Code">
<summary>
编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Erp_SubStockDto.Name">
<summary>
名字
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Erp_SubStockDto.OrgId">
<summary>
业务组织(使用组织)
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Erp_SubStockDto.OrgCode">
<summary>
业务组织(使用组织)编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Erp_SubStockDto.StockCode">
<summary>
仓库编码
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.Supplier.ErpSupplierDto">
<summary>
erp供应商基础数据
@@ -4817,6 +4852,11 @@
单据编号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryRequest.SuccessSync">
<summary>
同步成功或者失败 null 就是未同步
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryRequest.DateBeginDate">
<summary>
盘点日期-开始

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

@@ -2886,6 +2886,14 @@
<param name="stockId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetSubStockName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Erp_SubStockDto},System.String)">
<summary>
获取子仓库名称
</summary>
<param name="erpStocks"></param>
<param name="code"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForBillType">
<summary>
查单据类型的值
@@ -4303,6 +4311,14 @@
<param name="stockId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetSubStockName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Erp_SubStockDto},System.String)">
<summary>
子仓库
</summary>
<param name="erpStocks"></param>
<param name="code"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Services.Public.ErpService">
<summary>
erp数据交互服务