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

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/AssembleIssueJobsController.cs

@@ -60,10 +60,10 @@ public class AssembleIssueJobsController : AbpController
         {
             MaxResultCount = pageSize,
             SkipCount = (pageIndex - 1) * pageSize,
-            Sorting = $"{nameof(ContainerJobDTO.CreationTime)} ASC",
+            Sorting = $"{nameof(AssembleIssueJobDTO.JobStatus)} ASC,{nameof(AssembleIssueJobDTO.CreationTime)} ASC",
             Condition = new Condition
             {
-                Filters = new List<Filter> { new(nameof(ContainerJobDTO.JobStatus), jsonStatus, "In") }
+                Filters = new List<Filter> { new(nameof(AssembleIssueJobDTO.JobStatus), jsonStatus, "In") }
             }
         };
 

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/CoatingIssueJobsController.cs

@@ -60,10 +60,10 @@ public class CoatingIssueJobsController : AbpController
         {
             MaxResultCount = pageSize,
             SkipCount = (pageIndex - 1) * pageSize,
-            Sorting = $"{nameof(ContainerJobDTO.CreationTime)} ASC",
+            Sorting = $"{nameof(CoatingIssueJobDTO.JobStatus)} ASC,{nameof(CoatingIssueJobDTO.CreationTime)} ASC",
             Condition = new Condition
             {
-                Filters = new List<Filter> { new(nameof(ContainerJobDTO.JobStatus), jsonStatus, "In") }
+                Filters = new List<Filter> { new(nameof(CoatingIssueJobDTO.JobStatus), jsonStatus, "In") }
             }
         };
 

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/InjectionIssueJobsController.cs

@@ -60,10 +60,10 @@ public class InjectionIssueJobsController : AbpController
         {
             MaxResultCount = pageSize,
             SkipCount = (pageIndex - 1) * pageSize,
-            Sorting = $"{nameof(ContainerJobDTO.CreationTime)} ASC",
+            Sorting = $"{nameof(InjectionIssueJobDTO.JobStatus)} ASC,{nameof(InjectionIssueJobDTO.CreationTime)} ASC",
             Condition = new Condition
             {
-                Filters = new List<Filter> { new(nameof(ContainerJobDTO.JobStatus), jsonStatus, "In") }
+                Filters = new List<Filter> { new(nameof(InjectionIssueJobDTO.JobStatus), jsonStatus, "In") }
             }
         };
 

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/KittingIssueJobsController.cs

@@ -60,10 +60,10 @@ public class KittingIssueJobsController : AbpController
         {
             MaxResultCount = pageSize,
             SkipCount = (pageIndex - 1) * pageSize,
-            Sorting = $"{nameof(ContainerJobDTO.CreationTime)} ASC",
+            Sorting = $"{nameof(KittingIssueJobDTO.JobStatus)} ASC,{nameof(KittingIssueJobDTO.CreationTime)} ASC",
             Condition = new Condition
             {
-                Filters = new List<Filter> { new(nameof(ContainerJobDTO.JobStatus), jsonStatus, "In") }
+                Filters = new List<Filter> { new(nameof(KittingIssueJobDTO.JobStatus), jsonStatus, "In") }
             }
         };
 

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/SparePartIssueJobsController.cs

@@ -60,10 +60,10 @@ public class SparePartIssueJobsController : AbpController
         {
             MaxResultCount = pageSize,
             SkipCount = (pageIndex - 1) * pageSize,
-            Sorting = $"{nameof(ContainerJobDTO.CreationTime)} ASC",
+            Sorting = $"{nameof(SparePartIssueJobDTO.JobStatus)} ASC,{nameof(SparePartIssueJobDTO.CreationTime)} ASC",
             Condition = new Condition
             {
-                Filters = new List<Filter> { new(nameof(ContainerJobDTO.JobStatus), jsonStatus, "In") }
+                Filters = new List<Filter> { new(nameof(SparePartIssueJobDTO.JobStatus), jsonStatus, "In") }
             }
         };
 

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Dtos/SplitPackingRecDto.cs

@@ -11,6 +11,10 @@ using Win_in.Sfs.Basedata.Domain.Shared;
 namespace Win_in.Sfs.Basedata.Application.Contracts;
 
 public class SplitPackingRecDTO : SfsBaseDataDTOBase
+    , IHasPurchaseInfoDto
+    , IHasProductionInfoDto
+    , IHasQualityInfoDto
+
 {
     /// <summary>
     /// 操作类型
@@ -156,5 +160,163 @@ public class SplitPackingRecDTO : SfsBaseDataDTOBase
     [Display(Name = "标签类型")]
     public EnumLabelType LabelType { get; set; }
 
+
+
+
+
+    #region InventoryLabel兼容成员
+
+    /// <summary>
+    /// 完整条码文本
+    /// </summary>
+    [Display(Name = "完整条码文本")]
+    public string FullBarcodeString { get; set; }
+
+    /// <summary>
+    /// 供应商批次
+    /// </summary>
+    [Display(Name = "供应商批次")]
+    public string SupplierBatch { get; set; }
+
+    /// <summary>
+    /// 到货时间
+    /// </summary>
+    [Display(Name = "summary")]
+    public DateTime ArriveDate { get; set; }
+
+    /// <summary>
+    /// 生产时间
+    /// </summary>
+    [Display(Name = "生产时间")]
+    public DateTime ProduceDate { get; set; }
+
+    /// <summary>
+    /// 过期时间
+    /// </summary>
+    [Display(Name = "过期时间")]
+    public DateTime ExpireDate { get; set; }
+
+    /// <summary>
+    /// 标签状态
+    /// </summary>
+    [Display(Name = "标签状态")]
+    public LabelStatus LabelStatus { get; set; }
+
+    /// <summary>
+    /// 建议库位
+    /// </summary>
+    [Display(Name = "建议库位")]
+    public string RecommendLocationCode { get; set; }
+
+    /// <summary>
+    /// 目标ERP库位
+    /// </summary>
+    [Display(Name = "目标ERP库位")]
+    public string LocationErpCode { get; set; }
+
+    /// <summary>
+    /// 托标签号
+    /// </summary>
+    [Display(Name = "托标签号")]
+    public string ContainerCode { get; set; }
+
+    #region 三个子实体成员
+    //-----------------------QualityInfo
+    /// <summary>
+    /// 质量级别
+    /// </summary>
+    [Display(Name = "质量级别")]
+    public string QLevel { get; set; }
+
+    /// <summary>
+    /// 质检文件
+    /// </summary>
+    [Display(Name = "质检文件")]
+    public string QualityFile { get; set; }
+
+    //----------------------PurchaseInfo
+    /// <summary>
+    /// 供应商代码
+    /// </summary>
+    [Display(Name = "供应商代码")]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    /// 订单号
+    /// </summary>
+    [Display(Name = "订单号")]
+    public string PoNumber { get; set; }
+
+    /// <summary>
+    /// 要货看板号
+    /// </summary>
+    [Display(Name = "要货看板号")]
+    public string RpNumber { get; set; }
+
+    /// <summary>
+    /// 发货单号
+    /// </summary>
+    [Display(Name = "发货单号")]
+    public string AsnNumber { get; set; }
+
+    //--------------------------------ProductionInfo
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    [Display(Name = "生产线")]
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 班组
+    /// </summary>
+    [Display(Name = "班组")]
+    public string Team { get; set; }
+
+    /// <summary>
+    /// 班次
+    /// </summary>
+    [Display(Name = "班次")]
+    public string Shift { get; set; }
+
+    #endregion
+
+    /// <summary>
+    /// 规格
+    /// </summary>
+    [Display(Name = "规格")]
+    public string Specifications { get; set; }
+
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    [Display(Name = "供应商名称")]
+    public string SupplierName { get; set; }
+
+    /// <summary>
+    /// 供应商简称
+    /// </summary>
+    [Display(Name = "供应商简称")]
+    public string SupplierSimpleName { get; set; }
+
+    /// <summary>
+    /// 供应商ERP料号
+    /// </summary>
+    [Display(Name = "供应商ERP料号")]
+    public string SupplierItemCode { get; set; }
+
+    /// <summary>
+    /// 供应商物品名
+    /// </summary>
+    [Display(Name = "供应商物品名")]
+    public string SupplierItemName { get; set; }
+
+    /// <summary>
+    /// 要求到货时间
+    /// </summary>
+    [Display(Name = "要求到货时间")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public DateTime PlanArriveDate { get; set; }
+    #endregion
+
 }
 

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs

@@ -13,6 +13,9 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
 
 
 public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase
+    , IHasPurchaseInfoDto
+    , IHasProductionInfoDto
+    , IHasQualityInfoDto
 {
     /// <summary>
     /// 操作类型
@@ -159,4 +162,162 @@ public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase
     /// 标签类型
     /// </summary>
     public EnumLabelType LabelType { get; set; }
+
+
+
+
+    #region InventoryLabel兼容成员
+
+    /// <summary>
+    /// 完整条码文本
+    /// </summary>
+    [Display(Name = "完整条码文本")]
+    public string FullBarcodeString { get; set; }
+
+    /// <summary>
+    /// 供应商批次
+    /// </summary>
+    [Display(Name = "供应商批次")]
+    public string SupplierBatch { get; set; }
+
+    /// <summary>
+    /// 到货时间
+    /// </summary>
+    [Display(Name = "summary")]
+    public DateTime ArriveDate { get; set; }
+
+    /// <summary>
+    /// 生产时间
+    /// </summary>
+    [Display(Name = "生产时间")]
+    public DateTime ProduceDate { get; set; }
+
+    /// <summary>
+    /// 过期时间
+    /// </summary>
+    [Display(Name = "过期时间")]
+    public DateTime ExpireDate { get; set; }
+
+    /// <summary>
+    /// 标签状态
+    /// </summary>
+    [Display(Name = "标签状态")]
+    public LabelStatus LabelStatus { get; set; }
+
+    /// <summary>
+    /// 建议库位
+    /// </summary>
+    [Display(Name = "建议库位")]
+    public string RecommendLocationCode { get; set; }
+
+    /// <summary>
+    /// 目标ERP库位
+    /// </summary>
+    [Display(Name = "目标ERP库位")]
+    public string LocationErpCode { get; set; }
+
+    /// <summary>
+    /// 托标签号
+    /// </summary>
+    [Display(Name = "托标签号")]
+    public string ContainerCode { get; set; }
+
+    #region 三个子实体成员
+    //-----------------------QualityInfo
+    /// <summary>
+    /// 质量级别
+    /// </summary>
+    [Display(Name = "质量级别")]
+    public string QLevel { get; set; }
+
+    /// <summary>
+    /// 质检文件
+    /// </summary>
+    [Display(Name = "质检文件")]
+    public string QualityFile { get; set; }
+
+    //----------------------PurchaseInfo
+    /// <summary>
+    /// 供应商代码
+    /// </summary>
+    [Display(Name = "供应商代码")]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    /// 订单号
+    /// </summary>
+    [Display(Name = "订单号")]
+    public string PoNumber { get; set; }
+
+    /// <summary>
+    /// 要货看板号
+    /// </summary>
+    [Display(Name = "要货看板号")]
+    public string RpNumber { get; set; }
+
+    /// <summary>
+    /// 发货单号
+    /// </summary>
+    [Display(Name = "发货单号")]
+    public string AsnNumber { get; set; }
+
+    //--------------------------------ProductionInfo
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    [Display(Name = "生产线")]
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 班组
+    /// </summary>
+    [Display(Name = "班组")]
+    public string Team { get; set; }
+
+    /// <summary>
+    /// 班次
+    /// </summary>
+    [Display(Name = "班次")]
+    public string Shift { get; set; }
+
+    #endregion
+
+    /// <summary>
+    /// 规格
+    /// </summary>
+    [Display(Name = "规格")]
+    public string Specifications { get; set; }
+
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    [Display(Name = "供应商名称")]
+    public string SupplierName { get; set; }
+
+    /// <summary>
+    /// 供应商简称
+    /// </summary>
+    [Display(Name = "供应商简称")]
+    public string SupplierSimpleName { get; set; }
+
+    /// <summary>
+    /// 供应商ERP料号
+    /// </summary>
+    [Display(Name = "供应商ERP料号")]
+    public string SupplierItemCode { get; set; }
+
+    /// <summary>
+    /// 供应商物品名
+    /// </summary>
+    [Display(Name = "供应商物品名")]
+    public string SupplierItemName { get; set; }
+
+    /// <summary>
+    /// 要求到货时间
+    /// </summary>
+    [Display(Name = "要求到货时间")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public DateTime PlanArriveDate { get; set; }
+    #endregion
+
 }

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SplitPackings/SplitPackingRecAutoMapperProfile.cs

@@ -9,8 +9,15 @@ public partial class BasedataApplicationAutoMapperProfile : Profile
 {
     private void SplitPackingRecAutoMapperProfile()
     {
-        CreateMap<SplitPackingRec, SplitPackingRecDTO>();
+        CreateMap<SplitPackingRec, SplitPackingRecDTO>()
+          .MapPurchaseInfo()
+          .MapProductionInfo()
+          .MapQualityInfo();
+
         CreateMap<SplitPackingRecEditInput, SplitPackingRec>()
+            .MapQualityInfoDto()
+            .MapPurchaseInfoDto()
+            .MapProductionInfoDto()
             .Ignore(t => t.FromTopPackingCode)
             .Ignore(t => t.ToTopPackingCode)
             .Ignore(t => t.LastModificationTime)
@@ -19,5 +26,75 @@ public partial class BasedataApplicationAutoMapperProfile : Profile
             .Ignore(t => t.CreatorId)
             .Ignore(t => t.ConcurrencyStamp)
             .Ignore(t => t.Id);
+
+    }
+}
+
+public static class LabelCommonMapperExtensions
+{
+    public static IMappingExpression<TSource, TDestination> MapPurchaseInfo<TSource, TDestination>(
+        this IMappingExpression<TSource, TDestination> m)
+        where TSource : IHasPurchaseInfo
+        where TDestination : IHasPurchaseInfoDto
+    {
+        return m
+                .ForMember(dest => dest.SupplierCode, opts => opts.MapFrom(src => src.PurchaseInfo.SupplierCode))
+                .ForMember(dest => dest.PoNumber, opts => opts.MapFrom(src => src.PurchaseInfo.PoNumber))
+                .ForMember(dest => dest.RpNumber, opts => opts.MapFrom(src => src.PurchaseInfo.RpNumber))
+                .ForMember(dest => dest.AsnNumber, opts => opts.MapFrom(src => src.PurchaseInfo.AsnNumber))
+            ;
+    }
+
+    public static IMappingExpression<TSource, TDestination> MapProductionInfo<TSource, TDestination>(
+        this IMappingExpression<TSource, TDestination> m)
+        where TSource : IHasProductionInfo
+        where TDestination : IHasProductionInfoDto
+    {
+        return m
+                .ForMember(dest => dest.ProdLine, opts => opts.MapFrom(src => src.ProductionInfo.ProdLine))
+                .ForMember(dest => dest.Team, opts => opts.MapFrom(src => src.ProductionInfo.Team))
+                .ForMember(dest => dest.Shift, opts => opts.MapFrom(src => src.ProductionInfo.Shift))
+            ;
+    }
+
+    public static IMappingExpression<TSource, TDestination> MapPurchaseInfoDto<TSource, TDestination>(
+        this IMappingExpression<TSource, TDestination> m)
+        where TSource : IHasPurchaseInfoDto
+        where TDestination : IHasPurchaseInfo
+    {
+        return m
+                .ForMember(dest => dest.PurchaseInfo, opts => opts.MapFrom(src => new PurchaseInfo(src.SupplierCode, src.PoNumber, src.RpNumber, src.AsnNumber)))
+            ;
+    }
+
+    public static IMappingExpression<TSource, TDestination> MapProductionInfoDto<TSource, TDestination>(
+        this IMappingExpression<TSource, TDestination> m)
+        where TSource : IHasProductionInfoDto
+        where TDestination : IHasProductionInfo
+    {
+        return m
+                .ForMember(dest => dest.ProductionInfo, opts => opts.MapFrom(src => new ProductionInfo(src.ProdLine, src.Team, src.Shift)))
+            ;
+    }
+
+    public static IMappingExpression<TSource, TDestination> MapQualityInfo<TSource, TDestination>(
+        this IMappingExpression<TSource, TDestination> m)
+        where TSource : IHasQualityInfo
+        where TDestination : IHasQualityInfoDto
+    {
+        return m
+                .ForMember(dest => dest.QLevel, opts => opts.MapFrom(src => src.QualityInfo.QLevel))
+                .ForMember(dest => dest.QualityFile, opts => opts.MapFrom(src => src.QualityInfo.QualityFile))
+            ;
+    }
+
+    public static IMappingExpression<TSource, TDestination> MapQualityInfoDto<TSource, TDestination>(
+        this IMappingExpression<TSource, TDestination> m)
+        where TSource : IHasQualityInfoDto
+        where TDestination : IHasQualityInfo
+    {
+        return m
+                .ForMember(dest => dest.QualityInfo, opts => opts.MapFrom(src => new QualityInfo(src.QLevel, src.QualityFile)))
+            ;
     }
 }

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain.Shared/IHasPurchaseInfo.cs

@@ -0,0 +1,272 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.Domain.Values;
+using Win_in.Sfs.Shared.Domain;
+
+namespace Win_in.Sfs.Basedata;
+#region 枚举及实体
+/// <summary>
+/// 标签类别
+/// </summary>
+public enum EnumLabelType
+{
+    /// <summary>
+    /// 空枚举
+    /// </summary>
+    [Display(Name = "未定义")]
+    None = 0,
+
+    /// <summary>
+    /// 采购标签
+    /// </summary>
+    [Display(Name = "采购标签")]
+    PurchaseLabel = 1,
+
+    /// <summary>
+    /// 生产标签
+    /// </summary>
+    [Display(Name = "生产标签")]
+    ProductionLabel = 2,
+
+    /// <summary>
+    /// 销售标签
+    /// </summary>
+    [Display(Name = "销售标签")]
+    SaleLabel = 3,
+
+    /// <summary>
+    /// 托盘标签
+    /// </summary>
+    [Display(Name = "托盘标签")]
+    PalletLabel = 4,
+
+    /// <summary>
+    /// 盘点标签
+    /// </summary>
+    [Display(Name = "盘点标签")]
+    CountLabel = 5,
+}
+
+public enum LabelStatus
+{
+    /// <summary>
+    /// 未定义
+    /// </summary>
+    [Display(Name = "未定义")]
+    None = 0,
+
+    /// <summary>
+    /// 有效
+    /// </summary>
+    [Display(Name = "有效")]
+    Enable = 1,
+
+    /// <summary>
+    /// 无效
+    /// </summary>
+    [Display(Name = "无效")]
+    Disable = 2
+}
+
+/// <summary>
+/// 质量信息
+/// </summary>
+public class QualityInfo : ValueObject
+{
+
+    /// <summary>
+    /// 质量等级
+    /// </summary>
+    [MaxLength(SfsEfCorePropertyConst.CodeLength)]
+    public string QLevel { get; set; }
+
+    /// <summary>
+    /// 质检文件
+    /// </summary>
+    [MaxLength(SfsEfCorePropertyConst.CodeLength)]
+    public string QualityFile { get; set; }
+
+    protected override IEnumerable<object> GetAtomicValues()
+    {
+        yield return QLevel;
+        yield return QualityFile;
+    }
+
+    public QualityInfo(string qLevel, string qualityFile)
+    {
+        QLevel = qLevel;
+        QualityFile = qualityFile;
+    }
+
+    public QualityInfo()
+    {
+
+    }
+}
+
+
+/// <summary>
+/// 采购信息
+/// </summary>
+[Owned]
+public class PurchaseInfo : ValueObject
+{
+    /// <summary>
+    /// 供应商代码
+    /// </summary>
+    [MaxLength(SfsEfCorePropertyConst.CodeLength)]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    /// 订单号
+    /// </summary>
+    [MaxLength(SfsEfCorePropertyConst.CodeLength)]
+    public string PoNumber { get; set; }
+
+    /// <summary>
+    /// 要货计划号
+    /// </summary>
+    [MaxLength(SfsEfCorePropertyConst.CodeLength)]
+    public string RpNumber { get; set; }
+
+    /// <summary>
+    /// 发货单号
+    /// </summary>
+    [MaxLength(SfsEfCorePropertyConst.CodeLength)]
+    public string AsnNumber { get; set; }
+
+    protected override IEnumerable<object> GetAtomicValues()
+    {
+        yield return SupplierCode;
+        yield return PoNumber;
+        yield return RpNumber;
+        yield return AsnNumber;
+    }
+
+    public PurchaseInfo(string supplierCode, string poNumber, string rpNumber, string asnNumber)
+    {
+        SupplierCode = supplierCode;
+        PoNumber = poNumber;
+        RpNumber = rpNumber;
+        AsnNumber = asnNumber;
+    }
+
+    public PurchaseInfo()
+    {
+
+    }
+}
+
+/// <summary>
+/// 生产信息
+/// </summary>
+public class ProductionInfo : ValueObject
+{
+    public ProductionInfo()
+    {
+
+    }
+
+    public ProductionInfo(string prodLine, string team, string shift)
+    {
+        ProdLine = prodLine;
+        Team = team;
+        Shift = shift;
+    }
+
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    [MaxLength(SfsEfCorePropertyConst.CodeLength)]
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 班组
+    /// </summary>
+    [MaxLength(SfsEfCorePropertyConst.CodeLength)]
+    public string Team { get; set; }
+
+    /// <summary>
+    /// 班次
+    /// </summary>
+    [MaxLength(SfsEfCorePropertyConst.CodeLength)]
+    public string Shift { get; set; }
+
+    protected override IEnumerable<object> GetAtomicValues()
+    {
+
+        yield return ProdLine;
+        yield return Team;
+        yield return Shift;
+    }
+}
+
+#endregion
+
+
+
+
+#region 接口
+public interface IHasPurchaseInfo
+{
+    /// <summary>
+    /// 采购信息
+    /// </summary>
+    public PurchaseInfo PurchaseInfo { get; set; }
+
+}
+
+public interface IHasProductionInfo
+{
+    /// <summary>
+    /// 生产信息
+    /// </summary>
+    public ProductionInfo ProductionInfo { get; set; }
+
+}
+
+public interface IHasPurchaseInfoDto
+{
+    /// <summary>
+    /// 供应商编号
+    /// </summary>
+    [Display(Name = "供应商编号")]
+    public string SupplierCode { get; set; }
+
+    public string PoNumber { get; set; }
+
+    public string RpNumber { get; set; }
+
+    public string AsnNumber { get; set; }
+
+}
+
+public interface IHasProductionInfoDto
+{
+    public string ProdLine { get; set; }
+    public string Team { get; set; }
+    public string Shift { get; set; }
+}
+
+public interface IHasQualityInfo
+{
+    /// <summary>
+    /// 质量信息
+    /// </summary>
+    public QualityInfo QualityInfo { get; set; }
+}
+
+public interface IHasQualityInfoDto
+{
+    public string QLevel { get; set; }
+
+    public string QualityFile { get; set; }
+
+}
+
+#endregion

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain.Shared/Win_in.Sfs.Basedata.Domain.Shared.csproj

@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="5.3.5" />
     <PackageReference Include="Volo.Abp.Validation" Version="5.3.5" />
   </ItemGroup>
 
@@ -22,6 +23,10 @@
     <Content Remove="Localization\Basedata\*.json" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Shared\src\Win_in.Sfs.Shared.Domain\Win_in.Sfs.Shared.Domain.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Update="Fody" Version="6.6.4">
       <PrivateAssets>all</PrivateAssets>

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

@@ -1,6 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.Domain.Values;
 using Win_in.Sfs.Basedata.Domain.Shared;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -12,6 +15,9 @@ namespace Win_in.Sfs.Basedata.Domain;
 /// </summary>
 public class SplitPackingRec : SfsBaseDataAggregateRootBase
     , IHasItem
+    , IHasPurchaseInfo
+    , IHasQualityInfo
+    , IHasProductionInfo
 {
     /// <summary>
     /// 操作类型
@@ -141,46 +147,107 @@ public class SplitPackingRec : SfsBaseDataAggregateRootBase
     public string PutOnShelfNumber { get; set; }
 
     public EnumLabelType LabelType { get; set; }
-}
 
-/// <summary>
+
-/// 标签类别
+
-/// </summary>
+    #region InventoryLabel兼容成员
-public enum EnumLabelType
+
-{
+    /// <summary>
+    /// 完整条码文本
+    /// </summary>
+    public string FullBarcodeString { get; set; }
+
+    /// <summary>
+    /// 供应商批次
+    /// </summary>
+    public string SupplierBatch { get; set; }
+
+    /// <summary>
+    /// 到货时间
+    /// </summary>
+    public DateTime ArriveDate { get; set; }
+
+    /// <summary>
+    /// 生产时间
+    /// </summary>
+    public DateTime ProduceDate { get; set; }
+
+    /// <summary>
+    /// 过期时间
+    /// </summary>
+    public DateTime ExpireDate { get; set; }
+
     /// <summary>
-    /// 空枚举
+    /// 标签状态
     /// </summary>
-    [Display(Name = "未定义")]
+    public LabelStatus LabelStatus { get; set; }
-    None = 0,
 
     /// <summary>
-    /// 采购标签
+    /// 建议库位
     /// </summary>
-    [Display(Name = "采购标签")]
+    public string RecommendLocationCode { get; set; }
-    PurchaseLabel = 1,
 
     /// <summary>
-    /// 生产标签
+    /// 目标ERP库位
     /// </summary>
-    [Display(Name = "生产标签")]
+    public string LocationErpCode { get; set; }
-    ProductionLabel = 2,
 
     /// <summary>
-    /// 销售标签
+    /// 托标签号
     /// </summary>
-    [Display(Name = "销售标签")]
+    public string ContainerCode { get; set; }
-    SaleLabel = 3,
 
     /// <summary>
-    /// 托盘标签
+    /// 质量信息
     /// </summary>
-    [Display(Name = "托盘标签")]
+    public QualityInfo QualityInfo { get; set; } = new();
-    PalletLabel = 4,
 
     /// <summary>
-    /// 盘点标签
+    /// 采购信息
     /// </summary>
-    [Display(Name = "盘点标签")]
+    public PurchaseInfo PurchaseInfo { get; set; } = new();
-    CountLabel = 5,
+
+    /// <summary>
+    /// 生产信息
+    /// </summary>
+    public ProductionInfo ProductionInfo { get; set; } = new();
+
+    /// <summary>
+    /// 规格
+    /// </summary>
+    [Display(Name = "规格")]
+    public string Specifications { get; set; }
+
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    [Display(Name = "供应商名称")]
+    public string SupplierName { get; set; }
+
+    /// <summary>
+    /// 供应商简称
+    /// </summary>
+    [Display(Name = "供应商简称")]
+    public string SupplierSimpleName { get; set; }
+
+    /// <summary>
+    /// 供应商ERP料号
+    /// </summary>
+    [Display(Name = "供应商ERP料号")]
+    public string SupplierItemCode { get; set; }
+
+    /// <summary>
+    /// 供应商物品名
+    /// </summary>
+    [Display(Name = "供应商物品名")]
+    public string SupplierItemName { get; set; }
+
+    /// <summary>
+    /// 要求到货时间
+    /// </summary>
+    [Display(Name = "要求到货时间")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public DateTime PlanArriveDate { get; set; }
+    #endregion
 }
+

be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/SplitPackings/SplitPackingRecDbContextModelCreatingExtensions.cs

@@ -46,9 +46,30 @@ public static class SplitPackingRecDbContextModelCreatingExtensions
             b.Property(q => q.ReceiptRecNumber).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.PutOnShelfNumber).HasMaxLength(SfsPropertyConst.CodeLength);
 
+            #region InventoryLabel兼容成员
+            b.Property(q => q.FullBarcodeString).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.SupplierBatch).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.RecommendLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.LocationErpCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.ContainerCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.Specifications).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.SupplierName).HasMaxLength(SfsPropertyConst.NameLength);
+            b.Property(q => q.SupplierSimpleName).HasMaxLength(SfsPropertyConst.NameLength);
+            b.Property(q => q.SupplierItemCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.SupplierItemName).HasMaxLength(SfsPropertyConst.NameLength);
+            //子实体成员属性中已经定义字段长度
+            #endregion
+
             //Indexes
             b.HasIndex(q => new { FromPackingCode = q.FromPackingCode, ToPackingCode = q.ToPackingCode });
             b.HasIndex(q => new { ToPackingCode = q.ToPackingCode });
+            //Relations
+
+            b.OwnsOne(q => q.PurchaseInfo);
+            b.OwnsOne(q => q.ProductionInfo);
+            b.OwnsOne(q => q.QualityInfo);
+
         });
+
     }
 }

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

@@ -193,6 +193,34 @@ public class InventoryLabelAppService
             packRec.TaskOrderNumber = null; //任务单
             packRec.ReceiptRecNumber = null; //收货记录单
             packRec.PutOnShelfNumber = null; //上架单
+
+
+            #region InventoryLabel兼容成员
+            packRec.FullBarcodeString = inputObj.FullBarcodeString;
+            packRec.SupplierBatch = inputObj.SupplierBatch;
+            packRec.ArriveDate = inputObj.ArriveDate;
+            packRec.ProduceDate = inputObj.ProduceDate;
+            packRec.ExpireDate = inputObj.ExpireDate;
+            packRec.LabelStatus = (Win_in.Sfs.Basedata.LabelStatus)((int)inputObj.LabelStatus);
+            packRec.RecommendLocationCode = inputObj.RecommendLocationCode;
+            packRec.LocationErpCode = inputObj.LocationErpCode;
+            packRec.ContainerCode = inputObj.ContainerCode;
+            packRec.QLevel = inputObj.QLevel;//
+            packRec.QualityFile = inputObj.QualityFile;
+            packRec.SupplierCode = inputObj.SupplierCode;
+            packRec.PoNumber = inputObj.PoNumber;
+            packRec.RpNumber = inputObj.RpNumber;
+            packRec.AsnNumber = inputObj.AsnNumber;
+            packRec.ProdLine = inputObj.ProdLine;
+            packRec.Team = inputObj.Team;
+            packRec.Shift = inputObj.Shift;//
+            packRec.Specifications = inputObj.Specifications;
+            packRec.SupplierName = inputObj.SupplierName;
+            packRec.SupplierSimpleName = inputObj.SupplierSimpleName;
+            packRec.SupplierItemCode = inputObj.SupplierItemCode;
+            packRec.SupplierItemName = inputObj.SupplierItemName;
+            packRec.PlanArriveDate = inputObj.PlanArriveDate;
+            #endregion
             recLst.Add(packRec);
         }
         bool bo = await _splitPackingRecAppService.BatchInsertAsync(recLst).ConfigureAwait(false);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs

@@ -474,6 +474,34 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
             {
                 packRec.PurchaseInfo_PoNumber = inventoryLabelDto.PoNumber;
                 packRec.PurchaseInfo_AsnNumber = inventoryLabelDto.AsnNumber;
+
+                #region InventoryLabel兼容成员
+                var inputObj = inventoryLabelDto;
+                packRec.FullBarcodeString = inputObj.FullBarcodeString;
+                packRec.SupplierBatch = inputObj.SupplierBatch;
+                packRec.ArriveDate = inputObj.ArriveDate;
+                packRec.ProduceDate = inputObj.ProduceDate;
+                packRec.ExpireDate = inputObj.ExpireDate;
+                packRec.LabelStatus = (Win_in.Sfs.Basedata.LabelStatus)((int)inputObj.LabelStatus);
+                packRec.RecommendLocationCode = inputObj.RecommendLocationCode;
+                packRec.LocationErpCode = inputObj.LocationErpCode;
+                packRec.ContainerCode = inputObj.ContainerCode;
+                packRec.QLevel = inputObj.QLevel;//
+                packRec.QualityFile = inputObj.QualityFile;
+                packRec.SupplierCode = inputObj.SupplierCode;
+                packRec.PoNumber = inputObj.PoNumber;
+                packRec.RpNumber = inputObj.RpNumber;
+                packRec.AsnNumber = inputObj.AsnNumber;
+                packRec.ProdLine = inputObj.ProdLine;
+                packRec.Team = inputObj.Team;
+                packRec.Shift = inputObj.Shift;//
+                packRec.Specifications = inputObj.Specifications;
+                packRec.SupplierName = inputObj.SupplierName;
+                packRec.SupplierSimpleName = inputObj.SupplierSimpleName;
+                packRec.SupplierItemCode = inputObj.SupplierItemCode;
+                packRec.SupplierItemName = inputObj.SupplierItemName;
+                packRec.PlanArriveDate = inputObj.PlanArriveDate;
+                #endregion
             }
             recLst.Add(packRec);
         }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/Issue/AssembleIssueNoteEventHandler.cs

@@ -24,15 +24,15 @@ public class AssembleIssueNoteEventHandler
     [UnitOfWork]
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<AssembleIssueNote> eventData)
     {
-        //var entity = eventData.Entity;
+        var entity = eventData.Entity;
-        //await AddExchangeDataAsync(entity).ConfigureAwait(false);
+        await AddExchangeDataAsync(entity).ConfigureAwait(false);
     }
 
     [UnitOfWork]
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<AssembleIssueNote>> eventData)
     {
-        //var entities = eventData.Entity;
+        var entities = eventData.Entity;
-        //await AddExchangeDataAsync(entities).ConfigureAwait(false);
+        await AddExchangeDataAsync(entities).ConfigureAwait(false);
     }
 
     protected override async Task AddExchangeDataAsync(List<AssembleIssueNote> entities)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/Issue/CoatingIssueNoteEventHandler.cs

@@ -24,15 +24,15 @@ public class CoatingIssueNoteEventHandler
     [UnitOfWork]
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<CoatingIssueNote> eventData)
     {
-        //var entity = eventData.Entity;
+        var entity = eventData.Entity;
-        //await AddExchangeDataAsync(entity).ConfigureAwait(false);
+        await AddExchangeDataAsync(entity).ConfigureAwait(false);
     }
 
     [UnitOfWork]
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<CoatingIssueNote>> eventData)
     {
-        //var entities = eventData.Entity;
+        var entities = eventData.Entity;
-        //await AddExchangeDataAsync(entities).ConfigureAwait(false);
+        await AddExchangeDataAsync(entities).ConfigureAwait(false);
     }
 
     protected override async Task AddExchangeDataAsync(List<CoatingIssueNote> entities)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/Issue/InjectionIssueNoteEventHandler.cs

@@ -24,15 +24,15 @@ public class InjectionIssueNoteEventHandler
     [UnitOfWork]
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<InjectionIssueNote> eventData)
     {
-        //var entity = eventData.Entity;
+        var entity = eventData.Entity;
-        //await AddExchangeDataAsync(entity).ConfigureAwait(false);
+        await AddExchangeDataAsync(entity).ConfigureAwait(false);
     }
 
     [UnitOfWork]
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<InjectionIssueNote>> eventData)
     {
-        //var entities = eventData.Entity;
+        var entities = eventData.Entity;
-        //await AddExchangeDataAsync(entities).ConfigureAwait(false);
+        await AddExchangeDataAsync(entities).ConfigureAwait(false);
     }
 
     protected override async Task AddExchangeDataAsync(List<InjectionIssueNote> entities)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/Issue/SparePartIssueNoteEventHandler.cs

@@ -24,15 +24,15 @@ public class SparePartIssueNoteEventHandler
     [UnitOfWork]
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<SparePartIssueNote> eventData)
     {
-        //var entity = eventData.Entity;
+        var entity = eventData.Entity;
-        //await AddExchangeDataAsync(entity).ConfigureAwait(false);
+        await AddExchangeDataAsync(entity).ConfigureAwait(false);
     }
 
     [UnitOfWork]
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<SparePartIssueNote>> eventData)
     {
-        //var entities = eventData.Entity;
+        var entities = eventData.Entity;
-        //await AddExchangeDataAsync(entities).ConfigureAwait(false);
+        await AddExchangeDataAsync(entities).ConfigureAwait(false);
     }
 
     protected override async Task AddExchangeDataAsync(List<SparePartIssueNote> entities)