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

修改了平江的

Browse Source
This commit is contained in:
18923810322
2026-05-29 14:14:30 +08:00
parent 775bb2d597
commit 1d34e4f097
6 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,8 +17,8 @@
"AllowedHosts": "*", //允许所有主机
"AllowedCores": "localhost,http://localhost:8080,http://192.168.1.188:8080", //跨域
"AppOptions": {
"DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=test_wmsdb;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //测试数据库连接地址
//"DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=wms_db;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //正式数据库连接地址
// "DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=test_wmsdb;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //测试数据库连接地址
"DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=wms_db;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //正式数据库连接地址
"RedisConnectionString": "47.106.232.90:6379,password=orico.2020,DefaultDatabase=3", //测试redis连接地址test_wmsdb
//"RedisConnectionString": "47.106.232.90:6379,password=orico.2020,DefaultDatabase=2", //正式redis连接地址
"RedisIpRateLimitingConnectionString": "47.110.156.96:16379,password=123456,DefaultDatabase=2", //redis连接地址

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

@@ -4372,6 +4372,14 @@
<param name="code"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetProductInventoryStockName(System.Collections.Generic.List{WMS.Web.Core.Dto.SingleData.UcStockHeadOfficeResponse},System.String,System.String)">
<summary>
成品即时库存仓库
</summary>
<param name="list"></param>
<param name="code"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForBillType">
<summary>
查单据类型的值
@@ -6365,6 +6373,14 @@
<param name="code"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetProductInventoryStockName(System.Collections.Generic.List{WMS.Web.Core.Dto.SingleData.UcStockHeadOfficeResponse},System.String,System.String)">
<summary>
成品即时库存仓库
</summary>
<param name="list"></param>
<param name="code"></param>
<returns></returns>
</member>
<!-- Badly formed XML comment ignored for member "P:WMS.Web.Domain.Services.Public.HttpClientEx.Url" -->
<!-- Badly formed XML comment ignored for member "P:WMS.Web.Domain.Services.Public.HttpClientEx.Content" -->
<!-- Badly formed XML comment ignored for member "F:WMS.Web.Domain.Services.Public.HttpClientEx.Cookie" -->

8
src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs
View File

@@ -215,5 +215,13 @@ namespace WMS.Web.Domain.IService.Public
/// <param name="code"></param>
/// <returns></returns>
string GetProductInventoryStockName(List<UcStockHeadOfficeResponse> list, string code);
/// <summary>
/// 成品即时库存仓库
/// </summary>
/// <param name="list"></param>
/// <param name="code"></param>
/// <returns></returns>
string GetProductInventoryStockName(List<UcStockHeadOfficeResponse> list, string code, string orgNo);
}
}

16
src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
View File

@@ -512,7 +512,21 @@ namespace WMS.Web.Domain.Services.Public
{
if (list == null || list.Count == 0)
return "";
var stock = list.Where(x => x.Code == code).FirstOrDefault();
var stock = list.Where(x => x.Code == code ).FirstOrDefault();
return stock == null ? "" : stock.Name;
}
/// <summary>
/// 成品即时库存仓库
/// </summary>
/// <param name="list"></param>
/// <param name="code"></param>
/// <returns></returns>
public string GetProductInventoryStockName(List<UcStockHeadOfficeResponse> list, string code,string orgNo)
{
if (list == null || list.Count == 0)
return "";
var stock = list.Where(x => x.Code == code && x.ErpOrgCode== orgNo).FirstOrDefault();
return stock == null ? "" : stock.Name;
}
}

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

@@ -1632,7 +1632,7 @@ namespace WMS.Web.Domain.Services.Public
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//param.FilterString = "FUseOrgId=100008";
param.FilterString = "(FUseOrgId = 100008 or FUseOrgId = 19162897)";
param.FilterString = "(FUseOrgId = 100008 or FUseOrgId=13431669 or FUseOrgId=40930803 or FUseOrgId = 19162897)";
//备注：因为供应商数据不是很多，就不能和获取物料一样循环获取；组织这里就获取10000条数据就行了
var beginTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");

3
src/WMS.Web.Repositories/ProductInventoryRepositories.cs
View File

@@ -132,6 +132,7 @@ namespace WMS.Web.Repositories
if (org_result.IsSuccess)
orgs = org_result.Data.ToList();
var p_stocks = await _basicsRepositories.GetUcStockByHeadOfficeAsync("", 1);
#endregion
@@ -162,7 +163,7 @@ namespace WMS.Web.Repositories
#region dto组装
Id = s.Id,
Type = s.Type.GetRemark(),
Stock = _erpBasicDataExtendService.GetProductInventoryStockName(p_stocks, s.StockCode),
Stock = _erpBasicDataExtendService.GetProductInventoryStockName(p_stocks, s.StockCode,s.OrgCode),
Org = _erpBasicDataExtendService.GetOrgName(orgs, s.OrgCode),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialNumber),
MaterialNumber = s.MaterialNumber,