zs
2025-05-07 086e8d457fb6480f126aedbd2677c7e97bdac193
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs
@@ -99,11 +99,11 @@
    { 
        await CheckCreateOrUpdateDtoAsync(input); 
 
        var exist = await wmsInOutStockRecordRepository.NameExistAsync(input.Id);
        if (exist)
        {
            throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.Id]);
        }
        //var exist = await wmsInOutStockRecordRepository.NameExistAsync(input.MaterialId);
        //if (exist)
        //{
        //    throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialId]);
        //}
 
        var maxSort = await wmsInOutStockRecordRepository.GetMaxSortAsync(); 
        var sort = input.Sort ?? maxSort; 
@@ -134,11 +134,11 @@
        await CheckCreateOrUpdateDtoAsync(input); 
 
        var updateObj = await wmsInOutStockRecordRepository.GetAsync(id); 
        var exist = await wmsInOutStockRecordRepository.NameExistAsync(input.Id, updateObj.Id);
        if (exist)
        {
            throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.Id]);
        }
        //var exist = await wmsInOutStockRecordRepository.NameExistAsync(input.Id, updateObj.Id);
        //if (exist)
        //{
        //    throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.Id]);
        //}
 
        updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); 
        input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None); 
@@ -283,7 +283,7 @@
            #region 导入校验 
 
            // 判断名称是否重复,并输出第几行重复 
            var duplicateWmsInOutStockRecords = importItems.GroupBy(x => x.Id).Where(x => x.Count() > 1).ToList();
            var duplicateWmsInOutStockRecords = importItems.GroupBy(x => x.MaterialNo).Where(x => x.Count() > 1).ToList();
            if (duplicateWmsInOutStockRecords?.Any() == true) 
            { 
                var duplicateWmsInOutStockRecordMsgs = duplicateWmsInOutStockRecords.Select(x => $"第 {string.Join(",", x.Select(x => x.RowIndex))} 行:{x.Key}  名称重复"); 
@@ -295,18 +295,18 @@
 
            foreach (var impItem in importItems) 
            { 
                if (impItem.Id.IsNullOrWhiteSpace())
                if (impItem.MaterialNo.IsNullOrWhiteSpace())
                { 
                    continue; 
                } 
 
                if (impItem.Id.IsNullOrWhiteSpace())
                if (impItem.MaterialNo.IsNullOrWhiteSpace())
                { 
                    var errorMsg = $"导入失败!配置,第{impItem.RowIndex}行:WmsInOutStockRecord名称不能为空"; 
                    throw new UserFriendlyException(errorMsg); 
                } 
 
                var oldWmsInOutStockRecord = await wmsInOutStockRecordRepository.FindByNameAsync(impItem.Id);
                var oldWmsInOutStockRecord = await wmsInOutStockRecordRepository.FindByNameAsync(impItem.MaterialNo);
                if (oldWmsInOutStockRecord != null) 
                { 
                    var wmsInOutStockRecordUpdateDto = new WmsInOutStockRecordUpdateDto 
@@ -413,7 +413,7 @@
            ["配置"] = ExportHelper.ConvertListToExportData(result), 
        }; 
 
        var fileName = result.Count > 1 ? "出入库记录列表" : result.Count == 1 ? result[0]?.Id : "WmsInOutStockRecord模版";
        var fileName = result.Count > 1 ? "出入库记录列表" : result.Count == 1 ? result[0]?.MaterialNo : "WmsInOutStockRecord模版";
        return (sheets, fileName); 
    }