lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2026-09-27 23:07:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: 入库订单调整为sqlsugar，并支持自定义查询

Browse Source
This commit is contained in:
yubaolee
2025-05-07 16:15:42 +08:00
parent a978fa7e22
commit e8b85fc05a
2 changed files with 78 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenAuth.App/WmsInbound/WmsInboundOrderDtblApp.cs
+9 -15
View File
@@ -9,15 +9,12 @@ using OpenAuth.App.Response;
using OpenAuth.Repository;
using OpenAuth.Repository.Domain;
using OpenAuth.Repository.Interface;
using SqlSugar;
namespace OpenAuth.App
{
public class WmsInboundOrderDtblApp : BaseStringApp<WmsInboundOrderDtbl,OpenAuthDBContext>
public class WmsInboundOrderDtblApp : SqlSugarBaseApp<WmsInboundOrderDtbl>
{
private RevelanceManagerApp _revelanceApp;
private DbExtension _dbExtension;
/// <summary>
/// 加载列表
/// </summary>
@@ -36,7 +33,7 @@ namespace OpenAuth.App
throw new Exception("请在代码生成界面配置WmsInboundOrderDtbl表的字段属性");
}
var result = new TableData();
var objs = UnitWork.Find<WmsInboundOrderDtbl>(null);
var objs = SugarClient.Queryable<WmsInboundOrderDtbl>();
if (!string.IsNullOrEmpty(request.InboundOrderId))
{
objs = objs.Where(u => u.OrderId == request.InboundOrderId);
@@ -51,7 +48,7 @@ namespace OpenAuth.App
result.columnFields = properties;
result.data = objs.OrderBy(u => u.Id)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).Select($"new ({propertyStr})");
.Take(request.limit).Select($"{propertyStr}").ToList();
result.count = await objs.CountAsync();
return result;
}
@@ -59,7 +56,7 @@ namespace OpenAuth.App
public void Add(AddOrUpdateWmsInboundOrderDtblReq req)
{
AddNoSave(req);
UnitWork.Save();
SugarClient.Ado.CommitTran();
}
public void AddNoSave(AddOrUpdateWmsInboundOrderDtblReq req)
@@ -70,13 +67,13 @@ namespace OpenAuth.App
var user = _auth.GetCurrentUser().User;
obj.CreateUserId = user.Id;
obj.CreateUserName = user.Name;
UnitWork.Add(obj);
SugarClient.Insertable(obj);
}
public void Update(AddOrUpdateWmsInboundOrderDtblReq obj)
{
var user = _auth.GetCurrentUser().User;
UnitWork.Update<WmsInboundOrderDtbl>(u => u.Id == obj.Id, u => new WmsInboundOrderDtbl
Repository.Update(u => new WmsInboundOrderDtbl
{
Price = obj.Price,
PriceNoTax = obj.PriceNoTax,
@@ -98,15 +95,12 @@ namespace OpenAuth.App
UpdateUserId = user.Id,
UpdateUserName = user.Name
//todo:补充或调整自己需要的字段
});
}, u => u.Id == obj.Id);
}
public WmsInboundOrderDtblApp(IUnitWork<OpenAuthDBContext> unitWork, IRepository<WmsInboundOrderDtbl,OpenAuthDBContext> repository,
RevelanceManagerApp app, IAuth auth, DbExtension dbExtension) : base(unitWork, repository,auth)
public WmsInboundOrderDtblApp(ISqlSugarClient client, IAuth auth) : base(client, auth)
{
_dbExtension = dbExtension;
_revelanceApp = app;
}
}
}
OpenAuth.App/WmsInbound/WmsInboundOrderTblApp.cs
+22 -14
View File
@@ -9,11 +9,12 @@ using OpenAuth.App.Response;
using OpenAuth.Repository;
using OpenAuth.Repository.Domain;
using OpenAuth.Repository.Interface;
using SqlSugar;
namespace OpenAuth.App
{
public class WmsInboundOrderTblApp : BaseStringApp<WmsInboundOrderTbl,OpenAuthDBContext>
public class WmsInboundOrderTblApp : SqlSugarBaseApp<WmsInboundOrderTbl>
{
private RevelanceManagerApp _revelanceApp;
private WmsInboundOrderDtblApp _wmsInboundOrderDtblApp;
@@ -45,10 +46,16 @@ namespace OpenAuth.App
{
objs = objs.Where(u => u.Id.Contains(request.key));
}
if (!string.IsNullOrEmpty(request.sqlWhere))
{
objs = objs.Where(request.sqlWhere);
}
var propertyStr = string.Join(',', columns.Select(u => u.ColumnName));
result.data = objs.OrderBy(u => u.Id)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).Select($"new ({propertyStr})");
.Take(request.limit).Select($"{propertyStr}").ToList();
result.count = await objs.CountAsync();
return result;
}
@@ -61,7 +68,8 @@ namespace OpenAuth.App
var user = _auth.GetCurrentUser().User;
obj.CreateUserId = user.Id;
obj.CreateUserName = user.Name;
UnitWork.Add(obj);
SugarClient.Ado.BeginTran();
SugarClient.Insertable(obj);
if (req.WmsInboundOrderDtblReqs != null && req.WmsInboundOrderDtblReqs.Any())
{
foreach (var detail in req.WmsInboundOrderDtblReqs)
@@ -71,15 +79,16 @@ namespace OpenAuth.App
}
}
UnitWork.Save();
SugarClient.Ado.CommitTran();
}
public void Update(AddOrUpdateWmsInboundOrderTblReq obj)
{
var user = _auth.GetCurrentUser().User;
UnitWork.ExecuteWithTransaction(() =>
{
SugarClient.Ado.BeginTran();
if (obj.WmsInboundOrderDtblReqs != null && obj.WmsInboundOrderDtblReqs.Any())
{
//id为空的添加
@@ -94,7 +103,7 @@ namespace OpenAuth.App
.Where(u => !string.IsNullOrEmpty(u)).ToList();
if (containids.Any())
{
UnitWork.Delete<WmsInboundOrderDtbl>(u => (!containids.Contains(u.Id)) && u.OrderId == obj.Id);
SugarClient.Deleteable<WmsInboundOrderDtbl>(u => (!containids.Contains(u.Id)) && u.OrderId == obj.Id);
}
//更新id相同的
@@ -104,7 +113,7 @@ namespace OpenAuth.App
}
}
UnitWork.Update<WmsInboundOrderTbl>(u => u.Id == obj.Id, u => new WmsInboundOrderTbl
Repository.Update(u => new WmsInboundOrderTbl
{
ExternalNo = obj.ExternalNo,
ExternalType = obj.ExternalType,
@@ -126,15 +135,14 @@ namespace OpenAuth.App
UpdateUserId = user.Id,
UpdateUserName = user.Name
//todo:补充或调整自己需要的字段
});
}, u => u.Id == obj.Id);
SugarClient.Ado.CommitTran();
UnitWork.Save();
});
}
public WmsInboundOrderTblApp(IUnitWork<OpenAuthDBContext> unitWork, IRepository<WmsInboundOrderTbl,OpenAuthDBContext> repository,
RevelanceManagerApp app, IAuth auth, WmsInboundOrderDtblApp wmsInboundOrderDtblApp) : base(unitWork,
repository, auth)
public WmsInboundOrderTblApp(ISqlSugarClient client, IAuth auth,
RevelanceManagerApp app, WmsInboundOrderDtblApp wmsInboundOrderDtblApp) : base(client, auth)
{
_revelanceApp = app;
_wmsInboundOrderDtblApp = wmsInboundOrderDtblApp;