From f5d543382c2e2bf2a1892f81de395fc107654c6c Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周三, 04 9月 2024 09:38:39 +0800 Subject: [PATCH] 出库统计 --- iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceOutbound/WorkPieceOutboundService.cs | 1 iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs | 44 ++++++++++++++ iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/Dto/OutBoundWorkPieceInfoCountOutput.cs | 34 +++++++++++ iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml | 22 +++++++ iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/Dto/OutBoundWorkPieceInfoCountInput.cs | 25 ++++++++ 5 files changed, 126 insertions(+), 0 deletions(-) diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/Dto/OutBoundWorkPieceInfoCountInput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/Dto/OutBoundWorkPieceInfoCountInput.cs new file mode 100644 index 0000000..1d40bb8 --- /dev/null +++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/Dto/OutBoundWorkPieceInfoCountInput.cs @@ -0,0 +1,25 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using iWare.Wms.Core; +using iWare.Wms.Core.Enum; + +namespace iWare.Wms.Application +{ + + + + public class OutBoundWorkPieceInfoCountInput + { + /// <summary> + /// 鏃ユ湡 + /// </summary> + public DateTimeOffset Date { get; set; } + + + } + + +} diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/Dto/OutBoundWorkPieceInfoCountOutput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/Dto/OutBoundWorkPieceInfoCountOutput.cs new file mode 100644 index 0000000..50cde26 --- /dev/null +++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/Dto/OutBoundWorkPieceInfoCountOutput.cs @@ -0,0 +1,34 @@ +锘縰sing System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using iWare.Wms.Core; +using iWare.Wms.Core.Enum; +using Microsoft.EntityFrameworkCore; + +namespace iWare.Wms.Application +{ + + + + public class OutBoundWorkPieceInfoCountOutput + { + /// <summary> + /// 鍑哄簱浜哄悕绉� + /// </summary> + [Comment("鍑哄簱浜哄悕绉�")] + [MaxLength(32)] + public string WorkPieceOutboundUserName { get; set; } + + /// <summary> + /// 鏁伴噺 + /// </summary> + public int Count { get; set; } + + + } + + +} diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs index 6a6c9fb..3c9294f 100644 --- a/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs +++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs @@ -873,6 +873,50 @@ } + + /// <summary> + /// 鍑哄簱缁熻 + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + [HttpPost("getOutBoundWorkPieceInfoCountList")] + [DisableOpLog] + public async Task<List<OutBoundWorkPieceInfoCountOutput>> GetOutBoundWorkPieceInfoCountList([FromBody] OutBoundWorkPieceInfoCountInput input) + { + /* + //娴嬭瘯 + List<OutBoundWorkPieceInfoCountOutput> outBoundWorkPieceInfoCountOutputs = new List<OutBoundWorkPieceInfoCountOutput>(); + outBoundWorkPieceInfoCountOutputs.Add(new OutBoundWorkPieceInfoCountOutput() + { + Count = 10, + WorkPieceOutboundUserName = "AAA" + }); + outBoundWorkPieceInfoCountOutputs.Add(new OutBoundWorkPieceInfoCountOutput() + { + Count = 99, + WorkPieceOutboundUserName = "BBb" + }); + return outBoundWorkPieceInfoCountOutputs; + //*/ + + + //DateTimeOffset now = DateTimeOffset.Now; // 鑾峰彇褰撳墠鏃堕棿锛屽寘鎷椂鍖哄亸绉婚噺 + DateTimeOffset now = input.Date; // 鑾峰彇褰撳墠鏃堕棿锛屽寘鎷椂鍖哄亸绉婚噺 + DateTimeOffset startOfDay = new DateTimeOffset(now.Year, now.Month, now.Day, 0, 0, 0, now.Offset); // 褰撳ぉ寮�濮嬫椂闂� + DateTimeOffset endOfDay = new DateTimeOffset(now.Year, now.Month, now.Day, 23, 59, 59, now.Offset); // 褰撳ぉ缁撴潫鏃堕棿 + List<WorkPieceOutbound> db_itemModelList = await _workPieceOutboundRep.Where(w => w.CreatedTime >= startOfDay + && w.CreatedTime <= endOfDay && w.IsDeleted == false).ToListAsync(); + //姹囨�诲垎缁� + var groupList = db_itemModelList.GroupBy(g => g.WorkPieceOutboundUserName).Select(s => new OutBoundWorkPieceInfoCountOutput() + { + WorkPieceOutboundUserName = s.Key, + Count = s.ToList().Count + }).ToList(); + return groupList; + //*/ + } + + #endregion } 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 141c83c..a8ce3f3 100644 --- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceOutbound/WorkPieceOutboundService.cs +++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceOutbound/WorkPieceOutboundService.cs @@ -44,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)) diff --git a/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml b/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml index 3d1ba72..d8c26c8 100644 --- a/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml +++ b/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml @@ -390,6 +390,13 @@ <param name="input"></param> <returns></returns> </member> + <member name="M:iWare.Wms.Application.Service.Pda.PdaService.GetOutBoundWorkPieceInfoCountList(iWare.Wms.Application.OutBoundWorkPieceInfoCountInput)"> + <summary> + 鍑哄簱缁熻 + </summary> + <param name="input"></param> + <returns></returns> + </member> <member name="P:iWare.Wms.Application.Service.System.LowCode.Dto.ContrastLowCode_Database.TableName"> <summary> 琛ㄥ悕 @@ -5104,6 +5111,21 @@ <param name="input"></param> <returns></returns> </member> + <member name="P:iWare.Wms.Application.OutBoundWorkPieceInfoCountInput.Date"> + <summary> + 鏃ユ湡 + </summary> + </member> + <member name="P:iWare.Wms.Application.OutBoundWorkPieceInfoCountOutput.WorkPieceOutboundUserName"> + <summary> + 鍑哄簱浜哄悕绉� + </summary> + </member> + <member name="P:iWare.Wms.Application.OutBoundWorkPieceInfoCountOutput.Count"> + <summary> + 鏁伴噺 + </summary> + </member> <member name="T:iWare.Wms.Application.OutStoreInput"> <summary> 鍑哄簱鎵ц杈撳叆鍙傛暟 -- Gitblit v1.9.3