From a3236b51b5691b8c47f4ebaf1d885314a4bab3bd Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 13 八月 2024 11:17:18 +0800
Subject: [PATCH] 拼箱功能开发
---
Wms/WMS.BLL/LogServer/OperationCrServer.cs | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/Wms/WMS.BLL/LogServer/OperationCrServer.cs b/Wms/WMS.BLL/LogServer/OperationCrServer.cs
index 8423c4d..45580a1 100644
--- a/Wms/WMS.BLL/LogServer/OperationCrServer.cs
+++ b/Wms/WMS.BLL/LogServer/OperationCrServer.cs
@@ -2,8 +2,12 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Identity;
using Model.ModelDto.LogDto;
+using Model.ModelVm.LogVm;
using SqlSugar;
+using Utility;
using WMS.DAL;
using WMS.Entity.Context;
using WMS.Entity.LogEntity;
@@ -15,10 +19,15 @@
public class OperationCrServer: DbHelper<LogOperationCR>,IOperationCRServer
{
private static readonly SqlSugarScope Db = DataContext.Db;
+ private readonly UserManager _userManager;
public OperationCrServer() : base(Db)
{
}
- public List<OperationDto> GetLogOperationCrList(string menuName, string type, string msg, string startTime, string endTime, int page, int limit, out int count)
+ public OperationCrServer(UserManager userManager) : base(Db)
+ {
+ _userManager = userManager;
+ }
+ public async Task<List<OperationDto>> GetLogOperationCrList(string menuName, string type, string msg, string startTime, string endTime, int page, int limit, RefAsync<int> count)
{
try
{
@@ -29,8 +38,7 @@
.AndIF(!string.IsNullOrWhiteSpace(startTime), it => it.CreateTime >= Convert.ToDateTime(startTime))
.AndIF(!string.IsNullOrWhiteSpace(endTime), it => it.CreateTime <= Convert.ToDateTime(endTime).AddDays(1))
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
- var total = 0;
- var list = GetAllWhereAsync(item)
+ var list = await GetAllWhereAsync(item)
.LeftJoin<SysDictionary>((it, dic) => it.Type == dic.Id.ToString())
.LeftJoin<SysUserInfor>((it, dic, users) => it.CreateUser == users.Id)
.Select((it, dic, users) => new OperationDto()
@@ -46,10 +54,8 @@
CreateUserName = users.RealName,
})
.OrderByDescending(it => it.CreateTime)
- .ToOffsetPage(page, limit, ref total);
-
- count = total;
- return list.OrderByDescending(m => m.CreateTime).ToList();
+ .ToPageListAsync(page, limit, count);
+ return list;
}
catch (Exception e)
{
@@ -61,9 +67,8 @@
{
try
{
- var contextDb = DataContext.Db;
- var menu = contextDb.Queryable<SysFunctionMenu>().Where(m => m.IsDel == "0").ToList();
- var dic = contextDb.Queryable<SysDictionary>().Where(m => m.ParentNo == "LogType" && m.IsDel == "0").ToList();
+ var menu = Db.Queryable<SysFunctionMenu>().Where(m => m.IsDel == "0").ToList();
+ var dic = Db.Queryable<SysDictionary>().Where(m => m.ParentNo == "LogType" && m.IsDel == "0").ToList();
var typeId = dic.FirstOrDefault(m => m.DictName == type);
var n = Add(new LogOperationCR()
@@ -85,5 +90,18 @@
throw new Exception(e.Message);
}
}
+ /// <summary>
+ /// 鏂板绯荤粺鎿嶄綔鏃ュ織
+ /// </summary>
+ /// <returns></returns>
+ public async Task<int> AddLogOperationCr(OperationInputVm input)
+ {
+ input.ParentNo = (await Db.Queryable<SysFunctionMenu>().FirstAsync(s => s.MenuName == input.ParentName && s.IsDel == "0"))?.MenuNo;
+ input.MenuNo = (await Db.Queryable<SysFunctionMenu>().FirstAsync(s => s.MenuName == input.MenuName && s.IsDel == "0"))?.MenuNo;
+ input.Type = (await Db.Queryable<SysDictionary>().FirstAsync(s => s.DictName == input.TypeName && s.IsDel == "0"))?.Id.ToString();
+ input.CreateUser = _userManager.UserId;
+ input.CreateTime = DateTime.Now;
+ return await Db.Insertable<LogOperationCR>(input).ExecuteCommandAsync();
+ }
}
}
--
Gitblit v1.8.0