diff --git a/Code/src/MineTec.ProManager.Application/GalleryFiles/GalleryFilesAppService.cs b/Code/src/MineTec.ProManager.Application/GalleryFiles/GalleryFilesAppService.cs index 4dbe8e6..e456a37 100644 --- a/Code/src/MineTec.ProManager.Application/GalleryFiles/GalleryFilesAppService.cs +++ b/Code/src/MineTec.ProManager.Application/GalleryFiles/GalleryFilesAppService.cs @@ -196,7 +196,7 @@ namespace MineTec.ProManager.GalleryFiles var result = new OutputBase(); try { - var entity = _GalleryFilesRepository.GetAll().Where(a => a.FileNum.StartsWith(input.PatternType) && a.IsDelete == 0); + var entity = _GalleryFilesRepository.GetAll().Where(a => a.FileNum.StartsWith(input.FileNum) && a.IsDelete == 0); result.count = entity.Count(); } catch (Exception e) diff --git a/Pages/page/Graphic/PatternManager/addPattern.html b/Pages/page/Graphic/PatternManager/addPattern.html index 66d74ce..2891220 100644 --- a/Pages/page/Graphic/PatternManager/addPattern.html +++ b/Pages/page/Graphic/PatternManager/addPattern.html @@ -188,7 +188,47 @@ }); form.on('select(bywordTypeSon)', function (data) { - getFileNumber(); + //特征号重新获取序列号 + var productType = $('#productType').val(); + var fileNum = productType + ProjectCode + '-' + data.value; + $.ajax({ + url: apiUrl + '/api/services/app/GalleryFiles/GetGalleryFilesTypeCount', //请求的url地址 + dataType: "json", //返回格式为json + async: false,//请求是否异步,默认为异步,这也是ajax重要特性 + data: { fileNum: fileNum }, //参数值 + type: "GET", //请求方式 + success: function (req) { + //请求成功时处理 + if (!isNaN(parseInt(req.result.count))) { + var count = parseInt(req.result.count) + 1; + var order = ''; + count = count + ''; + if (count.length == 1) { + order = '00' + count; + } + else if (count.length == 2) { + order = '0' + count; + } + else { + order = count + ''; + } + form.val("addGalleryFiles", { //formTest 即 class="layui-form" 所在元素属性 lay-filter="" 对应的值 + "orderNum": order,// "name": "value" + }); + getFileNumber(); + } + else { + layer.msg("获取所选图库类型的已有数量无效,请检查!"); + return false; + } + }, + error: function () { + /*错误信息处理*/ + layer.msg("获取所选图库类型的数量失败,请重试!"); + return false; + }, + }); + }); //下拉框监听 图库类型 @@ -215,7 +255,7 @@ url = "/api/services/app/MarketableNumber/GetAllMarketableNumber"; } else if (data.value == 8) { - url = "/api/services/app/PartNumber/GetAllPartNumber"; + url = "/api/services/app/PartNumber/GetAllPartNumber?Type=8"; } //给下拉框赋值 特征号 @@ -255,44 +295,45 @@ } var fileNum = data.value + ProjectCode; - - $.ajax({ - url: apiUrl + '/api/services/app/GalleryFiles/GetGalleryFilesTypeCount', //请求的url地址 - dataType: "json", //返回格式为json - async: false,//请求是否异步,默认为异步,这也是ajax重要特性 - data: { Type: fileNum }, //参数值 - type: "GET", //请求方式 - success: function (req) { - //请求成功时处理 - if (!isNaN(parseInt(req.result.count))) { - var count = parseInt(req.result.count) + 1; - var order = ''; - count = count + ''; - if (count.length == 1) { - order = '00' + count; - } - else if (count.length == 2) { - order = '0' + count; + if (data.value == 0 || data.value == 2) { + $.ajax({ + url: apiUrl + '/api/services/app/GalleryFiles/GetGalleryFilesTypeCount', //请求的url地址 + dataType: "json", //返回格式为json + async: false,//请求是否异步,默认为异步,这也是ajax重要特性 + data: { fileNum: fileNum }, //参数值 + type: "GET", //请求方式 + success: function (req) { + //请求成功时处理 + if (!isNaN(parseInt(req.result.count))) { + var count = parseInt(req.result.count) + 1; + var order = ''; + count = count + ''; + if (count.length == 1) { + order = '00' + count; + } + else if (count.length == 2) { + order = '0' + count; + } + else { + order = count + ''; + } + form.val("addGalleryFiles", { //formTest 即 class="layui-form" 所在元素属性 lay-filter="" 对应的值 + "orderNum": order,// "name": "value" + }); + getFileNumber(); } else { - order = count + ''; + layer.msg("获取所选图库类型的已有数量无效,请检查!"); + return false; } - form.val("addGalleryFiles", { //formTest 即 class="layui-form" 所在元素属性 lay-filter="" 对应的值 - "orderNum": order,// "name": "value" - }); - getFileNumber(); - } - else { - layer.msg("获取所选图库类型的已有数量无效,请检查!"); + }, + error: function () { + /*错误信息处理*/ + layer.msg("获取所选图库类型的数量失败,请重试!"); return false; - } - }, - error: function () { - /*错误信息处理*/ - layer.msg("获取所选图库类型的数量失败,请重试!"); - return false; - }, - }); + }, + }); + } } else { $('#bywordType_div').hide(); @@ -490,7 +531,7 @@ filename = $("#bywordTypeSon option:selected").text().split('-')[1]; } else { - fileNum = productType + ProjectCode + orderNum; + fileNum = productType + ProjectCode + '-' + orderNum; } if (supNum != '' && supNum != undefined && supNum != null && supNum != '1') { fileNum += '-' + '1~' + supNum;