From 6e35ffb357c599f59de3b3210e244be66401a9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= Date: Fri, 4 Nov 2022 02:56:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E5=8F=96?= =?UTF-8?q?=E6=B6=88sku=E8=B4=A7=E5=93=81=E8=B4=A7=E5=8F=B7=E5=BF=85?= =?UTF-8?q?=E9=A1=BB=E5=8C=85=E5=90=AB=E3=80=90SN=E3=80=91=E7=9A=84?= =?UTF-8?q?=E9=99=90=E5=88=B6=E3=80=82=20=E3=80=90=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E3=80=91=E8=B0=83=E6=95=B4Sku=E5=88=87=E5=89=B2=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=B0=86=E5=B0=8F=E5=86=99=E9=80=97=E5=8F=B7?= =?UTF-8?q?=E3=80=90.=E3=80=91=EF=BC=8C=E6=9B=BF=E6=8D=A2=E4=B8=BA?= =?UTF-8?q?=E3=80=90&&=E3=80=91=EF=BC=9B=E5=90=8C=E6=97=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=A1=A8=E3=80=90CoreCmsGoods=E3=80=91=E5=86=85?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E8=AF=B7=E5=A4=A7=E5=AE=B6=E6=89=A7?= =?UTF-8?q?=E8=A1=8Csql=E8=84=9A=E6=9C=AC=E6=9B=B4=E6=96=B0=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E7=9A=84sku=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Good/CoreCmsGoodsRepository.cs | 26 ++++++++++--------- .../Good/CoreCmsGoodsServices.cs | 2 +- .../Good/CoreCmsProductsServices.cs | 2 +- CoreCms.Net.Utility/Helper/GoodsHelper.cs | 2 +- .../Good/CoreCmsGoodsController.cs | 10 +++---- .../wwwroot/views/good/goods/create.html | 4 +-- .../wwwroot/views/good/goods/details.html | 4 +-- .../wwwroot/views/good/goods/edit.html | 8 +++--- .../views/good/goodstypespec/create.html | 3 ++- .../views/good/goodstypespec/edit.html | 3 ++- .../views/good/goodstypespec/index.html | 4 +-- 数据库/MySql/20221104/更新脚本.txt | 1 + 数据库/MySql/数据库更新日志.txt | 3 +++ 数据库/SqlServer/20221104/更新脚本.txt | 2 ++ 数据库/SqlServer/数据库更新日志.txt | 3 +++ 15 files changed, 45 insertions(+), 32 deletions(-) create mode 100644 数据库/MySql/20221104/更新脚本.txt create mode 100644 数据库/SqlServer/20221104/更新脚本.txt diff --git a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs index ef597743..9e2fcc2f 100644 --- a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs +++ b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs @@ -74,12 +74,13 @@ namespace CoreCms.Net.Repository //检查数据 foreach (var item in entity.products) { - if (!item.sn.Contains("sn") && !item.sn.Contains("SN")) - { - jm.msg = "请键入货品货号！货号为SN英文开头"; - return jm; - } - else if (item.stock < 0) + //if (!item.sn.Contains("sn") && !item.sn.Contains("SN")) + //{ + // jm.msg = "请键入货品货号！货号为SN英文开头"; + // return jm; + //} + //else + if (item.stock < 0) { jm.msg = "库存不能为0！"; return jm; @@ -327,12 +328,13 @@ namespace CoreCms.Net.Repository //检查数据 foreach (var item in entity.products) { - if (!item.sn.Contains("sn") && !item.sn.Contains("SN")) - { - jm.msg = "请键入货品货号！货号为SN英文开头"; - return jm; - } - else if (item.stock < 0) + //if (!item.sn.Contains("sn") && !item.sn.Contains("SN")) + //{ + // jm.msg = "请键入货品货号！货号为SN英文开头"; + // return jm; + //} + //else + if (item.stock < 0) { jm.msg = "库存不能为0！"; return jm; diff --git a/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs b/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs index 6075c8c3..83e5f261 100644 --- a/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs +++ b/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs @@ -793,7 +793,7 @@ namespace CoreCms.Net.Services foreach (var item in good.spesDesc.Split("|")) { //1911&&电线型号:2.5mm² - var temp = item.Split(".")[1].Split(":"); + var temp = item.Split("&&")[1].Split(":"); var name = temp[0]; var value = temp[1]; if (!defaultSpec.ContainsKey(name)) diff --git a/CoreCms.Net.Services/Good/CoreCmsProductsServices.cs b/CoreCms.Net.Services/Good/CoreCmsProductsServices.cs index 9cd74255..9e81502b 100644 --- a/CoreCms.Net.Services/Good/CoreCmsProductsServices.cs +++ b/CoreCms.Net.Services/Good/CoreCmsProductsServices.cs @@ -127,7 +127,7 @@ namespace CoreCms.Net.Services foreach (var item in spesDescArr) { //小类拆分 - var itemArr = item.Split("."); + var itemArr = item.Split("&&"); //键值对处理 var keyValue = itemArr[1].Split(":"); var defaultSpesDesc = new DefaultSpesDesc(); diff --git a/CoreCms.Net.Utility/Helper/GoodsHelper.cs b/CoreCms.Net.Utility/Helper/GoodsHelper.cs index de7045a0..d4ab3c48 100644 --- a/CoreCms.Net.Utility/Helper/GoodsHelper.cs +++ b/CoreCms.Net.Utility/Helper/GoodsHelper.cs @@ -162,7 +162,7 @@ namespace CoreCms.Net.Utility.Helper /// public static bool FilterChar(string inputValue) { - return Regex.IsMatch(inputValue, "[`.~!@#$^&*()=|\"{}':;',\\[\\]<>?~！@#￥……&*&;|{}。*-+]+"); + return Regex.IsMatch(inputValue, "[`~!@#$^&*()=|\"{}':;',\\[\\]<>?~！@#￥……&*&;|{}。*-+]+"); } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs index c2ed4c35..1758b2f2 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs @@ -872,7 +872,7 @@ namespace CoreCms.Net.Web.Admin.Controllers return jm; } - var newSpecs = list.Where(p => p.name.Contains("newSpec.")).ToList(); + var newSpecs = list.Where(p => p.name.Contains("newSpec&&")).ToList(); foreach (var t in newSpecs) { t.value = t.value.Trim(); @@ -897,7 +897,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { newSpec.ForEach(p => { - p.name = p.name.Replace("newSpec.", ""); + p.name = p.name.Replace("newSpec&&", ""); newSpecStr += p.name + ":" + p.value + "|"; }); newSpecStr = newSpecStr.Remove(newSpecStr.Length - 1, 1); @@ -910,7 +910,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { selectSpec.ForEach(p => { - p.name = p.name.Replace("selectSpec.", ""); + p.name = p.name.Replace("selectSpec&&", ""); selectSpecStr += p.name + ":" + p.value + "|"; }); selectSpecStr = selectSpecStr.Remove(selectSpecStr.Length - 1, 1); @@ -921,8 +921,8 @@ namespace CoreCms.Net.Web.Admin.Controllers var newSelectSpec = selectSpec; newSelectSpec.ForEach(p => { - var id = p.name.Split(".")[0]; - var name = p.name.Split(".")[1]; + var id = p.name.Split("&&")[0]; + var name = p.name.Split("&&")[1]; p.name = name; var newValue = newSpec.Find(p => p.name == id); diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html index 2b993ce3..bcb1e8d1 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html @@ -444,10 +444,10 @@ {{# layui.each(item.specValues, function(indexValue, itemValue){ }}
- +
- +
{{# }); }} diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html index 95a1f353..5d29e763 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html @@ -314,7 +314,7 @@ {{# layui.each(item.specValues, function(indexValue, itemValue){ }}
- +
{{getSelectedTypeSpecValue(d.model.newSpec, itemValue.id, itemValue.value)}}
@@ -715,7 +715,7 @@ if (parameters) { var arr = parameters.split('|'); for (var i = 0; i < arr.length; i++) { - var str = id + '.' + value; + var str = id + '&&' + value; var child = arr[i].split(':'); if (child[0] === str) { return true; diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html index 2f2ce5be..7de5e846 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html @@ -441,10 +441,10 @@ {{# layui.each(item.specValues, function(indexValue, itemValue){ }}
- -
+ +
- +
{{# }); }} @@ -1680,7 +1680,7 @@ if (parameters) { var arr = parameters.split('|'); for (var i = 0; i < arr.length; i++) { - var str = id + '.' + value; + var str = id + '&&' + value; var child = arr[i].split(':'); if (child[0] === str) { return true; diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goodstypespec/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goodstypespec/create.html index 75a2619c..eee51a85 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goodstypespec/create.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goodstypespec/create.html @@ -1,7 +1,8 @@