Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

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

@@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Shouldly;
+using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Caching;
 using Win.Abp.Snowflakes;
@@ -253,6 +254,20 @@ public class PriceListAppService : SettleAccountApplicationBase<PriceList>
     {
         var entity = await _settleAccountDbContext.Set<PriceList>().FindAsync(input.Id).ConfigureAwait(false);
         entity.IsCancel = input.IsCancel;
+        if (entity.IsCancel == false)
+        {
+            var existsPriceList = _settleAccountDbContext.Set<PriceList>()
+                .Where(t => t.LU == entity.LU)
+                .Where(t => t.IsCancel == false)
+                .Where(t => t.Id != entity.Id)
+                .ToList();
+
+            var existsPrice = existsPriceList.Find(t => (entity.BeginTime > t.BeginTime && entity.BeginTime < t.EndTime) || (t.BeginTime > entity.BeginTime && t.BeginTime < entity.EndTime));
+            if (existsPrice != null)
+            {
+                throw new UserFriendlyException($"无法启用！此记录启用时间区间与区间【{existsPrice.BeginTime:yyyy-MM-dd}至{existsPrice.EndTime:yyyy-MM-dd}】存在交集", "400");
+            }
+        }
         _settleAccountDbContext.Set<PriceList>().Update(entity);
         var dto = ObjectMapper.Map<PriceList, PriceListDto>(entity);
         return dto;

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs

@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Shouldly;
+using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Caching;
 using Win.Abp.Snowflakes;
@@ -211,6 +212,20 @@ public class PriceListAppServiceBJ : SettleAccountApplicationBase<PriceListBJ>
     {
         var entity = await _settleAccountDbContext.Set<PriceListBJ>().FindAsync(input.Id).ConfigureAwait(false);
         entity.IsCancel = input.IsCancel;
+        if (entity.IsCancel == false)
+        {
+            var existsPriceBjList = _settleAccountDbContext.Set<PriceListBJ>()
+                .Where(t => t.LU == entity.LU)
+                .Where(t => t.IsCancel == false)
+                .Where(t => t.Id != entity.Id)
+                .ToList();
+
+            var existsPriceBj = existsPriceBjList.Find(t => (entity.BeginDate >= t.BeginDate && entity.BeginDate < t.EndDate) || (t.BeginDate >= entity.BeginDate && t.BeginDate < entity.EndDate));
+            if (existsPriceBj != null)
+            {
+                throw new UserFriendlyException($"无法启用！此记录启用时间区间与区间【{existsPrice.BeginTime:yyyy-MM-dd}至{existsPrice.EndTime:yyyy-MM-dd}】存在交集", "400");
+            }
+        }
         _settleAccountDbContext.Set<PriceListBJ>().Update(entity);
         var dto = ObjectMapper.Map<PriceListBJ, PriceListBJDto>(entity);
         return dto;

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs

@@ -399,12 +399,6 @@ namespace SettleAccount.Bases
         /// 匹配类型
         /// </summary>
         public EnumMappingType MappingType { get; set; }
-        /// <summary>
-        /// 地点
-        /// </summary>
-        [Display(Name = "地点")]
-        [MaxLength(64)]
-        public string Place { get; set; }
     }
 
     public class SA_CAN_BASE : AuditedAggregateRoot<Guid>, ISA_BASE

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SA.cs

@@ -127,6 +127,12 @@ public class HBPO_SA_DETAIL : SA_BASE
     //public string GroupNum { get; set; } = null!;
     [Display(Name = "发票分组号")]
     public string InvGroupNum { get; set; } = null!;
+    /// <summary>
+    /// 地点
+    /// </summary>
+    [Display(Name = "地点")]
+    [MaxLength(64)]
+    public string Place { get; set; }
 
     public HBPO_SA_DETAIL(Guid guid, string keyCode, int version, string billNum, string lU, string pN, string site, decimal qty, decimal price, DateTime settleDate, string groupNum, string invGroupNum, EnumBusinessType businessType)
     {

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SA.cs

@@ -121,6 +121,12 @@ public class PUB_SA_DETAIL:SA_BASE
     /// </summary>
     [Display(Name = "计数")]
     public int IndexNum { get; set; }
+    /// <summary>
+    /// 地点
+    /// </summary>
+    [Display(Name = "地点")]
+    [MaxLength(64)]
+    public string Place { get; set; }
 
     public PUB_SA_DETAIL(Guid guid, string keyCode, int version, string billNum, string lU, string pN, string site, decimal qty, decimal price, string invGroupNum, DateTime settleDate, string extend1, string extend2, string extend3, string groupNum)
     {

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230915020001_20230915-1.cs

@@ -0,0 +1,190 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+    public partial class _202309151 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Place",
+                table: "Set_BBAC_SA_DETAIL");
+
+            migrationBuilder.AddColumn<int>(
+                name: "LineCode",
+                table: "Set_INVOICE_WAIT_DETAIL",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
+                column: "ConcurrencyStamp",
+                value: "4811f883bafc4103afa8d6d328d3a069");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
+                column: "ConcurrencyStamp",
+                value: "4ed3d65478ac4d0c8e32959f4d4d6948");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
+                column: "ConcurrencyStamp",
+                value: "e582b1ac0af543f5907bc6478f582d5d");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
+                column: "ConcurrencyStamp",
+                value: "0a984af35ced4b958987c92dc8d8b437");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
+                column: "ConcurrencyStamp",
+                value: "6e4f423b25754f45bb941d2bd83d0d01");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
+                column: "ConcurrencyStamp",
+                value: "0c087607218c4593bfe96bbf073a83bc");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
+                column: "ConcurrencyStamp",
+                value: "db9e52f68d34450e87e91298093f99e6");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
+                column: "ConcurrencyStamp",
+                value: "61c1715c5e4b41b3874ec46b1ff6a943");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
+                column: "ConcurrencyStamp",
+                value: "81c99bc19cf94f4c8d8643fb3ec703ac");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
+                column: "ConcurrencyStamp",
+                value: "b1d3eeaad1fe4f3abfaecec1d8101efa");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
+                column: "ConcurrencyStamp",
+                value: "ae4deb9271fa4f45b38a5eb8ecd6a9b5");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "LineCode",
+                table: "Set_INVOICE_WAIT_DETAIL");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Place",
+                table: "Set_BBAC_SA_DETAIL",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
+                column: "ConcurrencyStamp",
+                value: "b1d31f0c8ba14fd5baf9e86a382cf23b");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
+                column: "ConcurrencyStamp",
+                value: "cb552d924aa5468c9605fc66af7f6aa2");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
+                column: "ConcurrencyStamp",
+                value: "861d9091519a403e880429b4ec92bf48");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
+                column: "ConcurrencyStamp",
+                value: "26fc2c469b324cd38fb3ee9c1fda720d");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
+                column: "ConcurrencyStamp",
+                value: "3b34af99b803428faad0b383080a46ef");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
+                column: "ConcurrencyStamp",
+                value: "2120adc593a148ba95427da1eadc2073");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
+                column: "ConcurrencyStamp",
+                value: "9c91f78395054248aaca3cb07018d785");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
+                column: "ConcurrencyStamp",
+                value: "9f5c2dac8b544424b22248e87f78051d");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
+                column: "ConcurrencyStamp",
+                value: "628547db204a4af09bed4562a5d4e8fd");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
+                column: "ConcurrencyStamp",
+                value: "27a58b61e45c44db907e467fb594cc66");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
+                column: "ConcurrencyStamp",
+                value: "78bde67297b24c9eada8402d3f94d52b");
+        }
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs

@@ -613,10 +613,6 @@ namespace Win.Sfs.SettleAccount.Migrations
                     b.Property<string>("PartCode")
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<string>("Place")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<decimal>("Price")
                         .HasColumnType("decimal(18,2)");
 
@@ -2778,6 +2774,9 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("LastModifierId");
 
+                    b.Property<int>("LineCode")
+                        .HasColumnType("int");
+
                     b.Property<decimal>("PRICE")
                         .HasColumnType("decimal(18,2)");
 
@@ -4507,7 +4506,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
-                            ConcurrencyStamp = "27a58b61e45c44db907e467fb594cc66",
+                            ConcurrencyStamp = "b1d3eeaad1fe4f3abfaecec1d8101efa",
                             Cron = "0 0 8 26 *",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4517,7 +4516,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
-                            ConcurrencyStamp = "b1d31f0c8ba14fd5baf9e86a382cf23b",
+                            ConcurrencyStamp = "4811f883bafc4103afa8d6d328d3a069",
                             Cron = "0 0/1 * * * ?",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4527,7 +4526,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
-                            ConcurrencyStamp = "cb552d924aa5468c9605fc66af7f6aa2",
+                            ConcurrencyStamp = "4ed3d65478ac4d0c8e32959f4d4d6948",
                             Cron = "0 0/1 * * * ?",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4537,7 +4536,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
-                            ConcurrencyStamp = "9c91f78395054248aaca3cb07018d785",
+                            ConcurrencyStamp = "db9e52f68d34450e87e91298093f99e6",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4547,7 +4546,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
-                            ConcurrencyStamp = "861d9091519a403e880429b4ec92bf48",
+                            ConcurrencyStamp = "e582b1ac0af543f5907bc6478f582d5d",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4557,7 +4556,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
-                            ConcurrencyStamp = "3b34af99b803428faad0b383080a46ef",
+                            ConcurrencyStamp = "6e4f423b25754f45bb941d2bd83d0d01",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4567,7 +4566,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
-                            ConcurrencyStamp = "26fc2c469b324cd38fb3ee9c1fda720d",
+                            ConcurrencyStamp = "0a984af35ced4b958987c92dc8d8b437",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4577,7 +4576,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
-                            ConcurrencyStamp = "78bde67297b24c9eada8402d3f94d52b",
+                            ConcurrencyStamp = "ae4deb9271fa4f45b38a5eb8ecd6a9b5",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4587,7 +4586,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
-                            ConcurrencyStamp = "2120adc593a148ba95427da1eadc2073",
+                            ConcurrencyStamp = "0c087607218c4593bfe96bbf073a83bc",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4597,7 +4596,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
-                            ConcurrencyStamp = "628547db204a4af09bed4562a5d4e8fd",
+                            ConcurrencyStamp = "81c99bc19cf94f4c8d8643fb3ec703ac",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4607,7 +4606,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
-                            ConcurrencyStamp = "9f5c2dac8b544424b22248e87f78051d",
+                            ConcurrencyStamp = "61c1715c5e4b41b3874ec46b1ff6a943",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,