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 @@