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

OpenAuth.App/WmsInbound/WmsInboundOrderDtblApp.cs

@@ -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>
@@ -29,19 +26,19 @@ namespace OpenAuth.App
             {
                 throw new CommonException("登录已过期", Define.INVALID_TOKEN);
             }
-            
+
             var properties = loginContext.GetTableColumns("WmsInboundOrderDtbl");
             if (properties == null || properties.Count == 0)
             {
                 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);
             }
-            
+
             if (!string.IsNullOrEmpty(request.key))
             {
                 objs = objs.Where(u => u.GoodsId.Contains(request.key));
@@ -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,9 +56,9 @@ namespace OpenAuth.App
         public void Add(AddOrUpdateWmsInboundOrderDtblReq req)
         {
             AddNoSave(req);
-            UnitWork.Save();
+            SugarClient.Ado.CommitTran();
         }
-        
+
         public void AddNoSave(AddOrUpdateWmsInboundOrderDtblReq req)
         {
             var obj = req.MapTo<WmsInboundOrderDtbl>();
@@ -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)
+        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

@@ -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;
@@ -29,26 +30,32 @@ namespace OpenAuth.App
                 throw new CommonException("登录已过期", Define.INVALID_TOKEN);
             }
 
-            
+
             var columns = loginContext.GetTableColumns("WmsInboundOrderTbl");
             if (columns == null || columns.Count == 0)
             {
                 throw new Exception("请在代码生成界面配置WmsInboundOrderTbl表的字段属性");
             }
-            
+
             var result = new TableData();
-            
+
             result.columnFields = columns;
-            
+
             var objs = GetDataPrivilege("u");
             if (!string.IsNullOrEmpty(request.key))
             {
                 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,70 +79,70 @@ 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())
             {
-                if (obj.WmsInboundOrderDtblReqs != null && obj.WmsInboundOrderDtblReqs.Any())
+                //id为空的添加
+                foreach (var detail in obj.WmsInboundOrderDtblReqs.Where(u => string.IsNullOrEmpty(u.Id)))
                 {
-                    //id为空的添加
-                    foreach (var detail in obj.WmsInboundOrderDtblReqs.Where(u => string.IsNullOrEmpty(u.Id)))
-                    {
-                        detail.OrderId = obj.Id;
-                        _wmsInboundOrderDtblApp.AddNoSave(detail);
-                    }
-
-                    //id比数据库少的，删除
-                    var containids = obj.WmsInboundOrderDtblReqs.Select(u => u.Id)
-                        .Where(u => !string.IsNullOrEmpty(u)).ToList();
-                    if (containids.Any())
-                    {
-                        UnitWork.Delete<WmsInboundOrderDtbl>(u => (!containids.Contains(u.Id)) && u.OrderId == obj.Id);
-                    }
-
-                    //更新id相同的
-                    foreach (var detail in obj.WmsInboundOrderDtblReqs.Where(u => !string.IsNullOrEmpty(u.Id)))
-                    {
-                        _wmsInboundOrderDtblApp.Update(detail);
-                    }
+                    detail.OrderId = obj.Id;
+                    _wmsInboundOrderDtblApp.AddNoSave(detail);
                 }
 
-                UnitWork.Update<WmsInboundOrderTbl>(u => u.Id == obj.Id, u => new WmsInboundOrderTbl
+                //id比数据库少的，删除
+                var containids = obj.WmsInboundOrderDtblReqs.Select(u => u.Id)
+                    .Where(u => !string.IsNullOrEmpty(u)).ToList();
+                if (containids.Any())
                 {
-                    ExternalNo = obj.ExternalNo,
-                    ExternalType = obj.ExternalType,
-                    Status = obj.Status,
-                    OrderType = obj.OrderType,
-                    GoodsType = obj.GoodsType,
-                    PurchaseNo = obj.PurchaseNo,
-                    StockId = obj.StockId,
-                    OwnerId = obj.OwnerId,
-                    ShipperId = obj.ShipperId,
-                    SupplierId = obj.SupplierId,
-                    ScheduledInboundTime = obj.ScheduledInboundTime,
-                    Remark = obj.Remark,
-                    Enable = obj.Enable,
-                    TransferType = obj.TransferType,
-                    InBondedArea = obj.InBondedArea,
-                    ReturnBoxNum = obj.ReturnBoxNum,
-                    UpdateTime = DateTime.Now,
-                    UpdateUserId = user.Id,
-                    UpdateUserName = user.Name
-                    //todo:补充或调整自己需要的字段
-                });
+                    SugarClient.Deleteable<WmsInboundOrderDtbl>(u => (!containids.Contains(u.Id)) && u.OrderId == obj.Id);
+                }
+
+                //更新id相同的
+                foreach (var detail in obj.WmsInboundOrderDtblReqs.Where(u => !string.IsNullOrEmpty(u.Id)))
+                {
+                    _wmsInboundOrderDtblApp.Update(detail);
+                }
+            }
+
+            Repository.Update(u => new WmsInboundOrderTbl
+            {
+                ExternalNo = obj.ExternalNo,
+                ExternalType = obj.ExternalType,
+                Status = obj.Status,
+                OrderType = obj.OrderType,
+                GoodsType = obj.GoodsType,
+                PurchaseNo = obj.PurchaseNo,
+                StockId = obj.StockId,
+                OwnerId = obj.OwnerId,
+                ShipperId = obj.ShipperId,
+                SupplierId = obj.SupplierId,
+                ScheduledInboundTime = obj.ScheduledInboundTime,
+                Remark = obj.Remark,
+                Enable = obj.Enable,
+                TransferType = obj.TransferType,
+                InBondedArea = obj.InBondedArea,
+                ReturnBoxNum = obj.ReturnBoxNum,
+                UpdateTime = DateTime.Now,
+                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;