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

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

Browse Source
This commit is contained in:
tongfei
2024-03-20 15:26:43 +08:00
parent c61a1ecba7 1d5e922b02
commit 7b91610a18
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,13 +38,13 @@ namespace WMS.Web.Api.Controllers
/// <summary> /// <summary>
/// 前端记录日志(数组) /// 前端记录日志(数组)
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="logs"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Route("Logs")] [Route("Logs")]
public Task<Result> Logs(List<LogRequest> dto) public Task<Result> Logs(List<string> logs)
{ {
_Logger.LogInformation($"前端日志(数组) 时间:{DateTime.Now} 内容:{JsonConvert.SerializeObject(dto)}"); _Logger.LogInformation($"前端日志(数组) 时间:{DateTime.Now} 内容:{JsonConvert.SerializeObject(logs)}");
return Task.FromResult(Result.ReSuccess()); return Task.FromResult(Result.ReSuccess());
} }
} }

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

@@ -101,11 +101,11 @@
<param name="log"></param> <param name="log"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Api.Controllers.ClientLogController.Logs(System.Collections.Generic.List{WMS.Web.Api.Controllers.LogRequest})"> <member name="M:WMS.Web.Api.Controllers.ClientLogController.Logs(System.Collections.Generic.List{System.String})">
<summary> <summary>
前端记录日志(数组) 前端记录日志(数组)
</summary> </summary>
<param name="dto"></param> <param name="logs"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:WMS.Web.Api.Controllers.LogRequest"> <member name="T:WMS.Web.Api.Controllers.LogRequest">

6
src/WMS.Web.Domain/Services/SerialNumberService.cs
View File

@@ -145,7 +145,7 @@ namespace WMS.Web.Domain.Services
}; };
if (moveBoxRecord.Type == MoveBoxType.Up) if (moveBoxRecord.Type == MoveBoxType.Up)
{ {
var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockCode); var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockCode+ moveBoxRecord.StockCode+ moveBoxRecord.OrgCode);
op.Remark += "\r\n" + "仓位:" + srcSubStock; op.Remark += "\r\n" + "仓位:" + srcSubStock;
} }
sList.Add(op); sList.Add(op);
@@ -322,7 +322,7 @@ namespace WMS.Web.Domain.Services
var boxId = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0; var boxId = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0;
var box = boxList.FirstOrDefault(f => f.Id == boxId); var box = boxList.FirstOrDefault(f => f.Id == boxId);
var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber); var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber);
var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, inStock.SubStockCode); var subStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, inStock.SubStockCode+ inStock.StockCode+ inStock.OrgCode);
//修改序列号和箱绑定关系 //修改序列号和箱绑定关系
entity.InStock(instockDetail.SourceBillNo, inStock.Type); entity.InStock(instockDetail.SourceBillNo, inStock.Type);
entity.Bind(boxId, box?.CompleteCartonTime ?? DateTime.Now); entity.Bind(boxId, box?.CompleteCartonTime ?? DateTime.Now);
@@ -411,7 +411,7 @@ namespace WMS.Web.Domain.Services
if (backRecord.Type == BackRecordType.OutstockOn) if (backRecord.Type == BackRecordType.OutstockOn)
{ {
var subStockId = backRecord?.SubStockCode ?? ""; var subStockId = backRecord?.SubStockCode ?? "";
var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, subStockId); var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, backRecord?.SubStockCode ?? ""+ backRecord?.StockCode ?? ""+ backRecord?.OrgCode ?? "");
op.Remark += "\r\n" + "仓位:" + srcSubStock; op.Remark += "\r\n" + "仓位:" + srcSubStock;
} }
sList.Add(op); sList.Add(op);

8
src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
View File

@@ -149,9 +149,9 @@ namespace WMS.Web.Repositories
query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%")); query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%"));
if (!string.IsNullOrEmpty(dto.DestBox)) if (!string.IsNullOrEmpty(dto.DestBox))
query = query.Where(w => EF.Functions.Like(w.destBox.BoxBillNo, "%" + dto.DestBox + "%")); query = query.Where(w => EF.Functions.Like(w.destBox.BoxBillNo, "%" + dto.DestBox + "%"));
if (dto.SrcSubStockCode != null) if (!string.IsNullOrEmpty(dto.SrcSubStockCode))
query = query.Where(w => w.changeBox.SrcSubStockCode == dto.SrcSubStockCode); query = query.Where(w => w.changeBox.SrcSubStockCode == dto.SrcSubStockCode);
if (dto.DestSubStockCode != null) if (!string.IsNullOrEmpty(dto.DestSubStockCode))
query = query.Where(w => w.changeBox.DestSubStockCode == dto.DestSubStockCode); query = query.Where(w => w.changeBox.DestSubStockCode == dto.DestSubStockCode);
if (dto.CreateBeginDate != null) if (dto.CreateBeginDate != null)
query = query.Where(w => w.changeBox.CreateTime >= dto.CreateBeginDate); query = query.Where(w => w.changeBox.CreateTime >= dto.CreateBeginDate);
@@ -170,8 +170,8 @@ namespace WMS.Web.Repositories
SerialNumbers = string.Join(",", s.changeBox.SerialNumbers), SerialNumbers = string.Join(",", s.changeBox.SerialNumbers),
SrcBox = s.srcBox.BoxBillNo, SrcBox = s.srcBox.BoxBillNo,
DestBox = s.destBox.BoxBillNo, DestBox = s.destBox.BoxBillNo,
Qty=s.changeBox.Qty, Qty = s.changeBox.Qty,
DestBoxOrg= _singleDataService.GetSingleData(SingleAction.Orgs, companyId, s.changeBox.DestBoxOrgCode), DestBoxOrg = _singleDataService.GetSingleData(SingleAction.Orgs, companyId, s.changeBox.DestBoxOrgCode),
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.changeBox.SrcSubStockCode + s.changeBox.SrcStockCode + s.changeBox.SrcBoxOrgCode), SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.changeBox.SrcSubStockCode + s.changeBox.SrcStockCode + s.changeBox.SrcBoxOrgCode),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.changeBox.DestSubStockCode + s.changeBox.DestStockCode + s.changeBox.DestBoxOrgCode), DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.changeBox.DestSubStockCode + s.changeBox.DestStockCode + s.changeBox.DestBoxOrgCode),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.changeBox.CreatorId), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.changeBox.CreatorId),

6
src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
View File

@@ -101,7 +101,7 @@ namespace WMS.Web.Repositories
_transaction.Commit(); _transaction.Commit();
return true; return true;
} }
catch(Exception ex) catch (Exception ex)
{ {
if (_transaction != null) if (_transaction != null)
_transaction.Rollback(); _transaction.Rollback();
@@ -160,9 +160,9 @@ namespace WMS.Web.Repositories
.OrderByDescending(o => o.moveBox.Id) .OrderByDescending(o => o.moveBox.Id)
.Where(adv => 1 == 1); .Where(adv => 1 == 1);
if (dto.SrcSubStockCode != null) if (!string.IsNullOrEmpty(dto.SrcSubStockCode))
query = query.Where(w => w.moveBox.SrcSubStockCode == dto.SrcSubStockCode); query = query.Where(w => w.moveBox.SrcSubStockCode == dto.SrcSubStockCode);
if (dto.DestSubStockCode != null) if (!string.IsNullOrEmpty(dto.DestSubStockCode))
query = query.Where(w => w.moveBox.DestSubStockCode == dto.DestSubStockCode); query = query.Where(w => w.moveBox.DestSubStockCode == dto.DestSubStockCode);
if (!string.IsNullOrEmpty(dto.Creator)) if (!string.IsNullOrEmpty(dto.Creator))
query = query.Where(w => ids.Contains(w.moveBox.CreatorId)); query = query.Where(w => ids.Contains(w.moveBox.CreatorId));