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-04 14:05:47 +08:00
parent da67a60791 201a01912e
commit 454419d4b0
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/WMS.Web.Api/Controllers/OutStockTaskController.cs
View File

@@ -131,9 +131,9 @@ namespace WMS.Web.Api.Controllers
if (loginInfo == null || loginInfo.UserInfo == null) if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.Token_Invalid_Error); return ResultList<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
List<string> str = new List<string>(); //List<string> str = new List<string>();
str.Add(billNo); //str.Add(billNo);
var res2 = await _repositories.GetListBySourceBillNo(str); //var res2 = await _repositories.GetListBySourceBillNo(str);
var res = await _repositories.GetOutStockTaskListByNo(billNo); var res = await _repositories.GetOutStockTaskListByNo(billNo);
if (res == null || res.Count() == 0) return ResultList<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.OutStockTaskNoData); if (res == null || res.Count() == 0) return ResultList<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.OutStockTaskNoData);

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

@@ -52,7 +52,7 @@
"AccessKey": "dOsTum4a5qvhPTBbZRPX0pIOU7PZWRX7htKjztms", "AccessKey": "dOsTum4a5qvhPTBbZRPX0pIOU7PZWRX7htKjztms",
"SecretKey": "KFxsGbnErkALFfeGdMa8QWTdodJbamMX0iznLe-q", "SecretKey": "KFxsGbnErkALFfeGdMa8QWTdodJbamMX0iznLe-q",
"Bucket": "orico-wms-test", //<2F><>ʽ orico-wms "Bucket": "orico-wms-test", //<2F><>ʽ orico-wms
"Url": "http://wmstestfile.f2b211.com/" //<2F><><EFBFBD><EFBFBD> http://wmstestfile.f2b211.com/ <20><>ʽ http://wmsfile.f2b211.com/ "Url": "https://wmstestfile.f2b211.com/" //<2F><><EFBFBD><EFBFBD> https://wmstestfile.f2b211.com/ <20><>ʽ https://wmsfile.f2b211.com/
}, },
"HttpOptions": { "HttpOptions": {
"Url": "dev.uc.f2b211.com", "Url": "dev.uc.f2b211.com",

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

@@ -5088,11 +5088,6 @@
出库状态 出库状态
</summary> </summary>
</member> </member>
<member name="F:WMS.Web.Domain.Values.OutStockStatus.Already">
<summary>
已出库
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.OutStockStatus.Wait"> <member name="F:WMS.Web.Domain.Values.OutStockStatus.Wait">
<summary> <summary>
待出库 待出库
@@ -5103,6 +5098,11 @@
部分出库 部分出库
</summary> </summary>
</member> </member>
<member name="F:WMS.Web.Domain.Values.OutStockStatus.Already">
<summary>
已出库
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.OutStockStatus.Repeal"> <member name="F:WMS.Web.Domain.Values.OutStockStatus.Repeal">
<summary> <summary>
已作废 已作废

10
src/WMS.Web.Domain/Values/OutStockStatus.cs
View File

@@ -10,11 +10,6 @@ namespace WMS.Web.Domain.Values
/// </summary> /// </summary>
public enum OutStockStatus public enum OutStockStatus
{ {
/// <summary>
/// 已出库
/// </summary>
[EnumRemark("已出库")]
Already = 1,
/// <summary> /// <summary>
/// 待出库 /// 待出库
/// </summary> /// </summary>
@@ -26,6 +21,11 @@ namespace WMS.Web.Domain.Values
[EnumRemark("部分出库")] [EnumRemark("部分出库")]
Part = 3, Part = 3,
/// <summary> /// <summary>
/// 已出库
/// </summary>
[EnumRemark("已出库")]
Already = 1,
/// <summary>
/// 已作废 /// 已作废
/// </summary> /// </summary>
[EnumRemark("已作废")] [EnumRemark("已作废")]

4
src/WMS.Web.Repositories/OutStockTaskRepositories.cs
View File

@@ -341,7 +341,7 @@ namespace WMS.Web.Repositories
{ {
var entity = list.FirstOrDefault(f => f.Id == r.Id); var entity = list.FirstOrDefault(f => f.Id == r.Id);
r.StockCode = entity.StockCode; r.StockCode = entity.StockCode;
r.StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, r.StockCode); r.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode+ entity.OrgCode);
} }
//获取物料信息 显示物料三件套 //获取物料信息 显示物料三件套
foreach (var r in response.SelectMany(s => s.details)) foreach (var r in response.SelectMany(s => s.details))
@@ -373,7 +373,7 @@ namespace WMS.Web.Repositories
var response = _mapper.Map<GetOutStockTaskByNoResponse>(entity); var response = _mapper.Map<GetOutStockTaskByNoResponse>(entity);
response.StockCode = entity.StockCode; response.StockCode = entity.StockCode;
response.StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, response.StockCode); response.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode + entity.OrgCode);
//获取物料信息 显示物料三件套 //获取物料信息 显示物料三件套
foreach (var r in response.details) foreach (var r in response.details)
{ {

2
src/WMS.Web.Repositories/SerialNumbersRepositories.cs
View File

@@ -153,7 +153,7 @@ namespace WMS.Web.Repositories
.GroupJoin(_context.BoxInventory, serial => serial.BoxId, box => box.BoxId, (serial, box) => new { serial, box }) .GroupJoin(_context.BoxInventory, serial => serial.BoxId, box => box.BoxId, (serial, box) => new { serial, box })
.SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.serial, box }) .SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.serial, box })
.FirstOrDefaultAsync(w => serialNumber.Equals(w.serial.SerialNumber)); .FirstOrDefaultAsync(w => serialNumber.Equals(w.serial.SerialNumber));
if (entity.serial == null) return null; if (entity == null || entity.serial == null) return null;
response.BoxId = entity.serial.BoxId; response.BoxId = entity.serial.BoxId;
response.SubStockId = entity.box?.SubStockId ?? 0; response.SubStockId = entity.box?.SubStockId ?? 0;
response.SerialNumber = entity.serial.SerialNumber; response.SerialNumber = entity.serial.SerialNumber;