From c47a8ae9f560c22cb694deffcd998e5bfac2f28b Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 05 9月 2024 11:55:41 +0800
Subject: [PATCH] 增加注释
---
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceOutbound/WorkPieceOutboundService.cs | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceOutbound/WorkPieceOutboundService.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceOutbound/WorkPieceOutboundService.cs
index a3c2b34..a8ce3f3 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceOutbound/WorkPieceOutboundService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceOutbound/WorkPieceOutboundService.cs
@@ -21,13 +21,15 @@
[DisableOpLog]
public class WorkPieceOutboundService : IWorkPieceOutboundService, IDynamicApiController, ITransient
{
- private readonly IRepository<WorkPieceOutbound,MasterDbContextLocator> _workPieceOutboundRep;
-
+ private readonly IRepository<WorkPieceOutbound, MasterDbContextLocator> _workPieceOutboundRep;
+ private readonly IRepository<WorkPieceInfo, MasterDbContextLocator> _workPieceInfoRep;
public WorkPieceOutboundService(
- IRepository<WorkPieceOutbound,MasterDbContextLocator> workPieceOutboundRep
+ IRepository<WorkPieceInfo, MasterDbContextLocator> workPieceInfoRep,
+ IRepository<WorkPieceOutbound, MasterDbContextLocator> workPieceOutboundRep
)
{
+ _workPieceInfoRep = workPieceInfoRep;
_workPieceOutboundRep = workPieceOutboundRep;
}
@@ -42,6 +44,7 @@
var workPieceOutbounds = await _workPieceOutboundRep.DetachedEntities
.Where(!string.IsNullOrEmpty(input.WorkPieceID), u => u.WorkPieceID.Contains(input.WorkPieceID))
.Where(!string.IsNullOrEmpty(input.OP80NewCode), u => u.OP80NewCode.Contains(input.OP80NewCode))
+ .Where(!string.IsNullOrEmpty(input.WorkPieceOutboundUserName), u => u.WorkPieceOutboundUserName.Contains(input.WorkPieceOutboundUserName))
.Where(!string.IsNullOrEmpty(input.StartTimeBeginTime.ToString()), u => u.WorkPieceOutboundTime >= input.StartTimeBeginTime)
.Where(!string.IsNullOrEmpty(input.StartTimeEndTime.ToString()), u => u.WorkPieceOutboundTime <= input.StartTimeEndTime)
.OrderBy(PageInputOrder.OrderBuilder<WorkPieceOutboundSearch>(input))
@@ -86,7 +89,7 @@
if (!isExist) throw Oops.Oh(ErrorCode.D3000);
var workPieceOutbound = input.Adapt<WorkPieceOutbound>();
- await _workPieceOutboundRep.UpdateAsync(workPieceOutbound,ignoreNullValues:true);
+ await _workPieceOutboundRep.UpdateAsync(workPieceOutbound, ignoreNullValues: true);
}
/// <summary>
@@ -117,19 +120,32 @@
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("revoke")]
+ [UnitOfWork]
public async Task Revoke(List<DeleteWorkPieceOutboundInput> input)
{
- foreach (var item in input) {
+ foreach (var item in input)
+ {
var workPieceOutbound = await _workPieceOutboundRep.FirstOrDefaultAsync(u => u.Id == item.Id);
if (workPieceOutbound == null)
{
throw Oops.Oh("宸ヤ欢鍑哄簱淇℃伅涓嶅瓨鍦�");
}
workPieceOutbound.IsDeleted = true;
- workPieceOutbound.Remark = workPieceOutbound.Remark??""+"鎾ら攢鍙戣揣";
+ workPieceOutbound.Remark = workPieceOutbound.Remark ?? "" + "鎾ら攢鍙戣揣";
await _workPieceOutboundRep.UpdateAsync(workPieceOutbound);
+
+ var workPiece = await _workPieceInfoRep.FirstOrDefaultAsync(u => u.WorkPieceID == workPieceOutbound.WorkPieceID);
+ if (workPiece != null)
+ {
+ workPiece.OutPerson = CurrentUserInfo.Name;
+ workPiece.OutRemark = "鎾ら攢宸ヤ欢鍑哄簱";
+ workPiece.OutTime = DateTime.Now;
+ workPiece.IsOut = false;
+
+ await _workPieceInfoRep.UpdateAsync(workPiece);
+ }
}
-
+
}
}
--
Gitblit v1.9.3