修改 整合箱 拆箱

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteDetailInput.cs

@@ -9,6 +9,18 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 public class IntegrationPackingNoteDetailInput : SfsDetailInputBase
 {
+    /// <summary>
+    ///     单号
+    /// </summary>
+    [Display(Name = "单号")]
+    public string Number { get; set; }
+
+    /// <summary>
+    ///     单号
+    /// </summary>
+    [Display(Name = "单号")]
+    public string WarehouseCode { get; set; }
+
     #region 物品基础信息
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteEditInput.cs

@@ -8,6 +8,12 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 public class IntegrationPackingNoteEditInput : SfsStoreCreateOrUpdateInputBase
 {
+    /// <summary>
+    ///     单号
+    /// </summary>
+    [Display(Name = "单号")]
+    public string Number { get; set; }
+
     #region 物品基础信息
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/SeparationPackingNotes/Inputs/SeparationPackingNoteDetailInput.cs

@@ -9,6 +9,18 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 public class SeparationPackingNoteDetailInput : SfsDetailInputBase
 {
+    /// <summary>
+    ///     单号
+    /// </summary>
+    [Display(Name = "单号")]
+    public string Number { get; set; }
+
+    /// <summary>
+    ///     单号
+    /// </summary>
+    [Display(Name = "单号")]
+    public string WarehouseCode { get; set; }
+
     #region 物品基础信息
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/SeparationPackingNotes/Inputs/SeparationPackingNoteEditInput.cs

@@ -8,6 +8,12 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 public class SeparationPackingNoteEditInput : SfsStoreCreateOrUpdateInputBase
 {
+    /// <summary>
+    ///     单号
+    /// </summary>
+    [Display(Name = "单号")]
+    public string Number { get; set; }
+
     #region 物品基础信息
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNoteAppService.cs

@@ -1,5 +1,7 @@
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.ObjectMapping;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 using Win_in.Sfs.Wms.Store.Domain.Shared;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/SeparationPackingNotes/SeparationPackingNoteAppService.cs

@@ -28,8 +28,8 @@ public class SeparationPackingNoteAppService :
 
     public SeparationPackingNoteAppService(
         ISeparationPackingNoteRepository repository,
-        ISeparationPackingNoteManager SeparationPackingNoteManager) : base(repository)
+        ISeparationPackingNoteManager separationPackingNoteManager) : base(repository)
     {
-        _separationPackingNoteManager = SeparationPackingNoteManager;
+        _separationPackingNoteManager = separationPackingNoteManager;
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs

@@ -145,5 +145,8 @@ public partial class StoreApplicationAutoMapperProfile : Profile
         KittingPackagingNoteAutoMapperProfile();
         //高通WMS-立库接口
         GaoTongAutoMapperProfile();
+        //分割箱 整合箱
+        IntegrationPackingNoteAutoMapperProfile();
+        SeparationPackingNoteAutoMapperProfile();
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/OperationPacking/SeparationPackingNotes/SeparationPackingNoteManager.cs

@@ -6,7 +6,10 @@ namespace Win_in.Sfs.Wms.Store.Domain;
 
 public class SeparationPackingNoteManager : SfsStoreManagerBase<SeparationPackingNote, SeparationPackingNoteDetail>, ISeparationPackingNoteManager
 {
-    public SeparationPackingNoteManager(ISfsStoreRepositoryBase<SeparationPackingNote> repository) : base(repository)
+    public SeparationPackingNoteManager(
+        ISeparationPackingNoteRepository repository
+    ) : base(repository)
     {
+
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ExchangeData/ExchangeDataDbContextModelCreatingExtensions.cs

@@ -30,7 +30,7 @@ public static class ExchangeDataDbContextModelCreatingExtensions
             b.Property(p => p.ReadTime);
             b.Property(p => p.ErrorCode).IsRequired().HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
             b.Property(p => p.ErrorMessage).HasMaxLength(SfsPropertyConst.RemarkLength);
-            b.Property(p => p.TyrpNumber).IsRequired().HasDefaultValueSql("");
+            //b.Property(p => p.TyrpNumber).IsRequired().HasDefaultValueSql();
             //b.Property(p => p.TyrpNumber).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
             //Relations