Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRec.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
+using Volo.Abp.Auditing;
 using Volo.Abp.Domain.Values;
 using Win_in.Sfs.Basedata.Domain.Shared;
 using Win_in.Sfs.Shared.Domain;
@@ -13,6 +14,7 @@ namespace Win_in.Sfs.Basedata.Domain;
 /// <summary>
 /// 采购标签
 /// </summary>
+[DisableAuditing]
 public class SplitPackingRec : SfsBaseDataAggregateRootBase
     , IHasItem
     //, IHasPurchaseInfo

be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/Migrations/20240718051538_BaseData0718-01.cs

@@ -0,0 +1,102 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Win_in.Sfs.Basedata.Migrations
+{
+    public partial class BaseData071801 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ContainerCode",
+                table: "Basedata_SplitPackingRec");
+
+            migrationBuilder.DropColumn(
+                name: "ProdLine",
+                table: "Basedata_SplitPackingRec");
+
+            migrationBuilder.DropColumn(
+                name: "QLevel",
+                table: "Basedata_SplitPackingRec");
+
+            migrationBuilder.DropColumn(
+                name: "QualityFile",
+                table: "Basedata_SplitPackingRec");
+
+            migrationBuilder.DropColumn(
+                name: "Shift",
+                table: "Basedata_SplitPackingRec");
+
+            migrationBuilder.DropColumn(
+                name: "Specifications",
+                table: "Basedata_SplitPackingRec");
+
+            migrationBuilder.DropColumn(
+                name: "Team",
+                table: "Basedata_SplitPackingRec");
+
+            migrationBuilder.DropColumn(
+                name: "Conf",
+                table: "Basedata_KittingDetail");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "ContainerCode",
+                table: "Basedata_SplitPackingRec",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ProdLine",
+                table: "Basedata_SplitPackingRec",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "QLevel",
+                table: "Basedata_SplitPackingRec",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "QualityFile",
+                table: "Basedata_SplitPackingRec",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Shift",
+                table: "Basedata_SplitPackingRec",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Specifications",
+                table: "Basedata_SplitPackingRec",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Team",
+                table: "Basedata_SplitPackingRec",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Conf",
+                table: "Basedata_KittingDetail",
+                type: "nvarchar(max)",
+                nullable: true);
+        }
+    }
+}

be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs

@@ -225,7 +225,7 @@ public class InventoryLabelAppService
             #endregion
             recLst.Add(packRec);
         }
-        int pageSize = 50;
+        int pageSize = 2000;
         int pageTotal =  PageHelper.GetTotalPages(recLst.Count, pageSize);
         for (int i = 1; i <= pageTotal; i++)
         {