From 778f3e04f6171ca5da9fd607d9fdfc1e20022bbc Mon Sep 17 00:00:00 2001 From: zhougf Date: Mon, 4 Mar 2024 16:16:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=20sqlserver=20mysql=20?= =?UTF-8?q?=E7=9A=84=E6=89=B9=E9=87=8F=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HHWMS.Web/Areas/Api/IWCSController.cs | 11 +++ .../ReceiptHeaderVMs/ReceiptHeaderVM.cs | 1 - HHWMS.Web/HHWMS.Web.csproj | 3 +- HHWMS.Web/Models/Inventory/Inventory.cs | 2 - HHWMS.Web/Resposity/IUnitWork.cs | 7 +- HHWMS.Web/Resposity/UnitWork.cs | 72 +++++++++++++------ HHWMS.Web/appsettings.json | 18 ++--- 7 files changed, 75 insertions(+), 39 deletions(-) diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs index 2bd9acd..c125329 100644 --- a/HHWMS.Web/Areas/Api/IWCSController.cs +++ b/HHWMS.Web/Areas/Api/IWCSController.cs @@ -1,4 +1,6 @@ +using System.Collections.Generic; using AutoMapper; +using HHWMS.Web.Models; using Microsoft.AspNetCore.Mvc; using WalkingTec.Mvvm.Core; @@ -30,6 +32,15 @@ namespace HHWMS.Web [HttpPost] public IActionResult RequestIn(WcsRequest request) { + var inv = new List(); + for (int i = 0; i < 10; i++) + inv.Add(new Inventory + { + ContainerCode = "test" + i + }); + //_unitwork.BatchAdd(inv); + _unitwork.DeleteById(1441); + //_unitwork.BatchUpdate(x => x.ID > 1030, x=>new Inventory { Batch = "test"}); return ApiResult(); } diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs index b265b2f..7abbea1 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using HHWMS.Web.Models; using WalkingTec.Mvvm.Core; -using Z.EntityFramework.Plus; namespace HHWMS.Web { diff --git a/HHWMS.Web/HHWMS.Web.csproj b/HHWMS.Web/HHWMS.Web.csproj index bf84376..0fe4a40 100644 --- a/HHWMS.Web/HHWMS.Web.csproj +++ b/HHWMS.Web/HHWMS.Web.csproj @@ -37,6 +37,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + @@ -45,7 +46,7 @@ - + diff --git a/HHWMS.Web/Models/Inventory/Inventory.cs b/HHWMS.Web/Models/Inventory/Inventory.cs index 4bd3458..f6db50b 100644 --- a/HHWMS.Web/Models/Inventory/Inventory.cs +++ b/HHWMS.Web/Models/Inventory/Inventory.cs @@ -71,12 +71,10 @@ namespace HHWMS.Web.Models public string SupplierCode { get; set; } [Display(Name = "Inventory.TaskQty", Description = "任务数量")] - [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] [Column(TypeName = "decimal(12,4)")] public decimal? TaskQty { get; set; } [Display(Name = "Inventory.Qty", Description = "数量")] - [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] [Column(TypeName = "decimal(12,4)")] public decimal? Qty { get; set; } diff --git a/HHWMS.Web/Resposity/IUnitWork.cs b/HHWMS.Web/Resposity/IUnitWork.cs index 4ddface..966f6be 100644 --- a/HHWMS.Web/Resposity/IUnitWork.cs +++ b/HHWMS.Web/Resposity/IUnitWork.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; @@ -20,7 +21,7 @@ namespace HHWMS.Web int Add(T entity) where T : class; - int BatchAdd(T[] entities) where T : class; + int BatchAdd(IEnumerable entities) where T : class; /// /// 添加到历史表,并将原数据删除 @@ -33,7 +34,7 @@ namespace HHWMS.Web int Update(T entity) where T : class; - int BatchUpdate(T[] entities) where T : class; + int BatchUpdate(IEnumerable entities) where T : class; /// /// 根据条件更新 /// @@ -57,7 +58,7 @@ namespace HHWMS.Web int DeleteById(int id) where T : class; - int BatchDelete(T[] entities) where T : class; + int BatchDelete(IEnumerable entities) where T : class; string GetSerialNumber(string prefix, int length = 4); } diff --git a/HHWMS.Web/Resposity/UnitWork.cs b/HHWMS.Web/Resposity/UnitWork.cs index 166e913..e617266 100644 --- a/HHWMS.Web/Resposity/UnitWork.cs +++ b/HHWMS.Web/Resposity/UnitWork.cs @@ -1,8 +1,10 @@ using System; +using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using HHWMS.Web.Models; using Microsoft.EntityFrameworkCore; +using NPOI.POIFS.FileSystem; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Core.Extensions; using Z.EntityFramework.Plus; @@ -20,6 +22,8 @@ namespace HHWMS.Web _info = context.LoginUserInfo; } + #region find + public T FindSingle(Expression> where) where T : class { return _data.Set().AsNoTracking().FirstOrDefault(where); @@ -47,9 +51,13 @@ namespace HHWMS.Web public int GetCount(Expression> where) where T : class { - return _data.Set().Where(where).Count(); + return _data.Set().Count(where); } + #endregion find + + #region insert + public new int Add(T entity) where T : class { if (typeof(T).IsSubclassOf(typeof(BasePoco))) @@ -67,7 +75,7 @@ namespace HHWMS.Web return _data.SaveChanges(); } - public int BatchAdd(T[] entities) where T : class + public int BatchAdd(IEnumerable entities) where T : class { foreach (T entity in entities) { @@ -90,16 +98,13 @@ namespace HHWMS.Web public int AddToHistory(string name, Expression> where, Expression> entity) where T : class { - var query = _data.Set().Where(where); - var count = query.InsertFromQuery(typeof(T).Name + "History", entity); - var count1 = _data.Set().DeleteRangeByKey(query.ToArray()); - if(count == count1) - { - return count; - } - return 0; + return _data.Set().Where(where).InsertFromQuery(name,entity); } + #endregion insert + + #region update + public new int Update(T entity) where T : class { if (typeof(T).IsSubclassOf(typeof(BasePoco))) @@ -111,7 +116,7 @@ namespace HHWMS.Web return _data.SaveChanges(); } - public int BatchUpdate(T[] entities) where T : class + public int BatchUpdate(IEnumerable entities) where T : class { foreach (T entity in entities) { @@ -134,40 +139,61 @@ namespace HHWMS.Web public int BatchUpdate(Expression> where, Expression> entity) where T : class { - /*if (typeof(T).IsSubclassOf(typeof(BasePoco))) - { - (entity as BasePoco).UpdateTime = DateTime.Now; - (entity as BasePoco).UpdateBy = _info?.ITCode; - }*/ return _data.Set().Where(where).Update(entity); } + #endregion update + + #region delete + public int Delete(T entity) where T : class { _data.Set().Remove(entity); return _data.SaveChanges(); } + public int BatchDelete(IEnumerable entities) where T : class + { + if (_data.DBType.Equals(DBTypeEnum.SqlServer)) + { + return _data.Set().DeleteRangeByKey(entities); + } + else + { + _data.Set().RemoveRange(entities); + return _data.SaveChanges(); + } + + } + public int BatchDelete(Expression> where) where T : class { - var query = _data.Set().Where(where); - return _data.Set().DeleteRangeByKey(query.ToArray()); + return _data.Set().Where(where).Delete(); } + /// + /// 测试 不支持mysql + /// + /// + /// + /// public int DeleteById(T entity) where T : class { - return _data.Set().DeleteByKey(entity); + return _data.Set().DeleteByKey((entity as BasePoco).ID); } + /// + /// 测试 不支持mysql + /// + /// + /// + /// public int DeleteById(int id) where T : class { return _data.Set().DeleteByKey(id); } - public int BatchDelete(T[] entities) where T : class - { - return _data.Set().DeleteRangeByKey(entities); - } + #endregion delete public string GetSerialNumber(string prefix, int length = 4) { diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json index 170fe01..c41526f 100644 --- a/HHWMS.Web/appsettings.json +++ b/HHWMS.Web/appsettings.json @@ -22,17 +22,17 @@ }, "Connections": [ - //{ - // "Key": "default", - // "Value": "Server=127.0.0.1;Port=3306;Database=8357wms;Uid=root;Password=abc123*;Character Set=utf8mb4;", - // "DBType": "mysql" - //} { "Key": "default", - "Value": "Data Source=.;Initial Catalog=8357wms;User=sa;Password=abc123*;Persist Security Info=True", - "DbContext": "DataContext", - "DBType": "sqlserver" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle - } + "Value": "Server=127.0.0.1;Port=3306;Database=8357wms;Uid=root;Password=abc123*;Character Set=utf8mb4;", + "DBType": "mysql" + }, + //{ + // "Key": "default", + // "Value": "Data Source=.;Initial Catalog=8357wms;User=sa;Password=abc123*;Persist Security Info=True", + // "DbContext": "DataContext", + // "DBType": "sqlserver" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle + //} //{ // "Key": "default", // "Value": "Data Source=10.18.106.4;Initial Catalog=8357wms;User=wms;Password=abc123*;Persist Security Info=True",