Merge branch 'master' of http://114.115.170.99:8090/Win.Sfs.SmartSettlementSystem.PG

src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj

@@ -54,6 +54,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="Migrations\" />
     <Folder Include="wwwroot\files\host\my-file-container\" />
   </ItemGroup>
 

src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Development.json

@@ -3,8 +3,8 @@
     "CorsOrigins": "https://*.abc.com,http://localhost:9528,http://149.223.116.5:8088"
   },
   "ConnectionStrings": {
-    "Default": "Server=192.168.0.213;Database=ABP;user id=sa;Password=Microsoft@2021;",
+    "Default": "Server=127.0.0.1;Database=ABP;user id=sa;Password=1",
-    "SettleAccountService": "Server=192.168.0.213;Database=SettleAccountService;user id=sa;Password=Microsoft@2021;"
+    "SettleAccountService": "Server=127.0.0.1;Database=SettleAccountService;user id=sa;Password=1;"
   },
   "Logging": {
     "LogLevel": {
@@ -13,6 +13,8 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
+
+
   "Serilog": {
     "Using": [],
     "MinumumLevel": {

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Prices/PriceListDtoBase.cs

@@ -44,6 +44,8 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
         public int Type { get; set; }
 
         public Guid ParentId { set; get; }
+        [Display(Name = "客户")]
+        public string CustomerCode { get; set; }
 
     }
 
@@ -57,31 +59,30 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
         [Display(Name = "版本")]
         [ExporterHeader(DisplayName = "版本")]
         public string Version { set; get; }
-        /// <summary>
+        [ImporterHeader(Name = "有效从")]
-        ///开始时间
-        /// </summary>
-        [ExporterHeader(DisplayName = "开始时间")]
         public DateTime BeginDate { get; set; }
         /// <summary>
         ///结算时间
         /// </summary>
-        [ExporterHeader(DisplayName = "结算时间")]
+        [ImporterHeader(Name = "有效到")]
         public DateTime EndDate { get; set; }
         /// <summary>
         ///价格
         /// </summary>
-        [ExporterHeader(DisplayName = "价格")]
+        [ImporterHeader(Name = "*金额")]
         public decimal Price { get; set; }
         /// <summary>
         ///物料编号
         /// </summary>
-        [ExporterHeader(DisplayName = "物料编号")]
+        [ImporterHeader(Name = "*物料编码")]
         public string MaterialCode { get; set; }
         /// <summary>
         ///价格类型
         /// </summary>
-        [ExporterHeader(DisplayName = "价格类型")]
+        [ImporterHeader(Name = "*分销渠道")]
         public int Type { get; set; }
+        [ImporterHeader(Name = "*客户")]
+        public string CustomerCode { get; set; }
 
     }
 
@@ -89,36 +90,38 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
     [ImportProject(Name = SettleAccountModuleName.PriceList)]
     public class PriceListImportDto
     {
-        /// <summary>
+        ///// <summary>
-        /// 版本
+        ///// 版本
-        /// </summary>
+        ///// </summary>
-        [Display(Name = "版本")]
+        //[Display(Name = "版本")]
-        public string Version { set; get; }
+        //public string Version { set; get; }
         /// <summary>
         ///开始时间
         /// </summary>
-        [ImporterHeader(Name = "开始时间")]
+        [ImporterHeader(Name = "有效从")]
         public DateTime BeginDate { get; set; }
         /// <summary>
         ///结算时间
         /// </summary>
-        [ImporterHeader(Name = "结算时间")]
+        [ImporterHeader(Name = "有效到")]
         public DateTime EndDate { get; set; }
         /// <summary>
         ///价格
         /// </summary>
-        [ImporterHeader(Name = "价格")]
+        [ImporterHeader(Name = "*金额")]
         public decimal Price { get; set; }
         /// <summary>
         ///物料编号
         /// </summary>
-        [ImporterHeader(Name = "物料编号")]
+        [ImporterHeader(Name = "*物料编码")]
         public string MaterialCode { get; set; }
         /// <summary>
         ///价格类型
         /// </summary>
-        [ImporterHeader(Name = "价格类型")]
+        [ImporterHeader(Name = "*分销渠道")]
         public int Type { get; set; }
+        [ImporterHeader(Name = "*客户")]
+        public string CustomerCode { get; set; }
 
     }
 

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs

@@ -23,9 +23,9 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
     /// <summary>
     /// 供应商相关应用服务
     /// </summary>
-    //[AllowAnonymous] 
+    [AllowAnonymous]
 
-    [Authorize(SettleAccountPermissions.PriceLists.Default)]
+    //[Authorize(SettleAccountPermissions.PriceLists.Default)]
     [Route("api/SettleAccount/PriceList")]
     public class PriceListAppService : ApplicationService
     /*, IPriceListAppService*/
@@ -162,33 +162,42 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
         virtual public async Task<string> ImportAsync([FromForm] IFormFileCollection files,string version)
         {
             ExportImporter _exportImporter = new ExportImporter();
-            var _mapList=  _mapRepository.Where(p => p.ProjectName == SettleAccountModuleName.PriceList).ToList();
+
-            var result = await _exportImporter.ExtendExcelImport<PriceListImportDto>(files, _excelImportService,_mapList);
+
+        
+
+            var result = await _exportImporter.UploadExcelImport<PriceListImportDto>(files, _excelImportService);
             var entityList = ObjectMapper.Map<List<PriceListImportDto>, List<PriceList>>(result);
-            var matialCodeList=entityList.Select(p => p.MaterialCode).Distinct().ToList();
+            var _ls = entityList.Where(p=>p.EndDate.ToString().Contains("9999")).GroupBy(p => new { p.MaterialCode, p.CustomerCode,p.Type }).Select(p=>p.FirstOrDefault());
-            List<PriceList> _ls = new List<PriceList>();
+
-            foreach (var itm in matialCodeList)
+
-            {
+            // List<PriceList> _ls = new List<PriceList>();
-               var priceList= entityList.Where(p => p.MaterialCode == itm).Distinct().ToList();
+            //foreach (var itm in matialCodeList)
-               var _list =priceList.OrderBy(p => p.BeginDate).ToList();
+            //{
-                int i = 0;//查询下条记录
+            //   var priceList= entityList.Where(p => p.MaterialCode == itm).Distinct().ToList();
-                foreach (var price in _list)
+            //   var _list =priceList.OrderBy(p => p.BeginDate).ToList();
+            //    int i = 0;//查询下条记录
+            //    foreach (var price in _list)
+            //    {
+            //        i++;
+            //        if (_list.Count == i)
+            //        {
+            //            price.EndDate = DateTime.MaxValue;
+            //            break;
+            //        }
+            //        else
+            //        {
+            //            var _nextPrice = _list[i];
+            //            price.EndDate = _nextPrice.BeginDate.AddDays(-1);
+            //        }
+            //        _ls.Add(price);
+            //    }
+            //}
+            foreach (var itm in _ls)
             {
-                    i++;
+                itm.Update(GuidGenerator.Create(),version);
-                    if (_list.Count == i)
-                    {
-                        price.EndDate = DateTime.MaxValue;
-                        break;
-                    }
-                    else
-                    {
-                        var _nextPrice = _list[i];
-                        price.EndDate = _nextPrice.BeginDate.AddDays(-1);
-                    }
-                    _ls.Add(price);
-                }
             }
-            await _mng.ImportAsync(_ls, version);
+            await _mng.ImportAsync(_ls.ToList(), version);
             return ApplicationConsts.SuccessStr;
         }
 

src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Prices/PriceList.cs

@@ -31,7 +31,13 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
             MaterialCode = materialCode;
             Type = type;
         }
-
+        public void Update(Guid id,string version)
+        {
+            Id = id;
+            Version = version;
+        }
+        [Display(Name = "客户")]
+        public  string CustomerCode { get; set; }
 
         /// <summary>
         ///版本

src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Prices/PriceListManager.cs

@@ -29,6 +29,11 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
             return await _repository.GetAsync(id);
         }
 
+        public virtual List<PriceList> GetPriceList(string version)
+        {
+            var entities =  _repository.Where(p => p.Version == version);
+            return entities.ToList();
+        }
 
         public virtual async Task<List<PriceList>> GetListAsync(
 
@@ -71,11 +76,31 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
             List<string> _errorList = new List<string>();
             //写校验在这里
 
+            var pricelist = GetPriceList(version);
+
+            List<PriceList> _list = new List<PriceList>();
+            foreach (var itm in pricelist)
+            {
+                var entity = entities.FirstOrDefault(p => p.Type == itm.Type && p.CustomerCode == itm.CustomerCode && p.MaterialCode == p.MaterialCode);
+                if (entity != null)
+                {
+                    itm.Price = entity.Price;
+                    entities.Remove(entity);
+                }
+            }
+
+
 
             await _repository.GetDbContext().BulkInsertAsync<PriceList>(entities);
 
-            List<PriceListVersion> _versionList = new List<PriceListVersion>() { new PriceListVersion(GuidGenerator.Create(),DateTime.Now.Year.ToString(),DateTime.Now.Month.ToString(),version) };
+
+            var _first = _versionRepository.FirstOrDefault(p => p.Version == version);
+            if (_first == null)
+            {
+
+                List<PriceListVersion> _versionList = new List<PriceListVersion>() { new PriceListVersion(GuidGenerator.Create(), DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(), version) };
                 await _versionRepository.GetDbContext().BulkInsertAsync(_versionList);
+            }
 
 
 

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs

@@ -368,11 +368,6 @@ namespace Win.Sfs.SettleAccount
         private static void ConfigurePriceList(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
         {
 
-
-
-
-
-
             builder.Entity<PriceList>(b =>
             {
 
@@ -380,6 +375,7 @@ namespace Win.Sfs.SettleAccount
               
                 b.ConfigureByConvention();
                 b.Property(x => x.MaterialCode).HasMaxLength(50);
+                b.Property(x => x.CustomerCode).HasMaxLength(50);
 
             });
         }