Merge branch 'Agv分支2024-11-19' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into Agv分支2024-11-19

be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs

@@ -91,7 +91,7 @@ public abstract class SfsCrudWithDetailsAppServiceBase<TEntity, TEntityDto, TReq
     /// <param name="list">明细列表</param>
     [HttpPost("details/")]
     public virtual async Task AddDetailListAsync(Guid id, List<TDetailDTO> list)
-    {
+    {                                   
         var entity = await _repository.GetAsync(id).ConfigureAwait(false);
         Check.NotNull(entity, EntityClassName);
         var details = ObjectMapper.Map<List<TDetailDTO>, List<TDetail>>(list);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/DTOs/IntegrationPackingNoteDTO.cs

@@ -0,0 +1,236 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Label.Domain.Shared;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class IntegrationPackingNoteDTO : SfsStoreDTOBase<IntegrationPackingNoteDetailDTO>, IHasNumber
+{
+    #region 物品基础信息
+
+    /// <summary>
+    ///     ERP料号
+    /// </summary>
+    [Display(Name = "ERP料号")]
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    [Display(Name = "物品名称")]
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    [Display(Name = "物品描述1")]
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    [Display(Name = "物品描述2")]
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     配置码
+    /// </summary>
+    [Display(Name = "配置码")]
+    public string Configuration { get; set; }
+
+    #endregion
+
+    #region 库存信息
+
+    /// <summary>
+    ///     标签
+    /// </summary>
+    [Display(Name = "标签")]
+    public string PackingCode { get; set; }
+
+    /// <summary>
+    ///     库位
+    /// </summary>
+    [Display(Name = "库位")]
+    public string LocationCode { get; set; }
+
+    /// <summary>
+    ///     托号
+    /// </summary>
+    [Display(Name = "托号")]
+    public string ContainerCode { get; set; }
+
+    /// <summary>
+    ///     批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Lot { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    [Display(Name = "库存状态")]
+    public EnumInventoryStatus InventoryStatuses { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    [Display(Name = "计量单位")]
+    public string Uom { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    #endregion
+
+    #region 标签信息
+
+    #region InventoryLabel兼容成员
+
+    /// <summary>
+    ///     标签类型
+    /// </summary>
+    [Display(Name = "标签类型")]
+    public EnumLabelType LabelType { get; set; }
+
+    /// <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 string RecommendLocationCode { get; set; }
+
+    /// <summary>
+    ///     目标ERP库位
+    /// </summary>
+    [Display(Name = "目标ERP库位")]
+    public string LocationErpCode { get; set; }
+
+    /// <summary>
+    ///     供应商代码
+    /// </summary>
+    [Display(Name = "供应商代码")]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    ///     要货看板号
+    /// </summary>
+    [Display(Name = "要货看板号")]
+    public string RpNumber { get; set; }
+
+    #endregion
+
+    #region 标签订单信息
+
+    /// <summary>
+    ///     采购订单
+    /// </summary>
+    [Display(Name = "采购订单")]
+    public string PurchaseInfo_PoNumber { get; set; }
+
+    /// <summary>
+    ///     供应商发货单
+    /// </summary>
+    [Display(Name = "供应商发货单")]
+    public string PurchaseInfo_AsnNumber { get; set; }
+
+    /// <summary>
+    ///     到货通知
+    /// </summary>
+    [Display(Name = "到货通知")]
+    public string ArrivalNoticNumber { get; set; }
+
+    /// <summary>
+    ///     任务单
+    /// </summary>
+    [Display(Name = "任务单")]
+    public string TaskOrderNumber { get; set; }
+
+    /// <summary>
+    ///     收货记录单
+    /// </summary>
+    [Display(Name = "收货记录单")]
+    public string ReceiptRecNumber { get; set; }
+
+    /// <summary>
+    ///     上架单
+    /// </summary>
+    [Display(Name = "上架单")]
+    public string PutOnShelfNumber { 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 = "要求到货时间")]
+    public DateTime PlanArriveDate { get; set; }
+
+    #endregion
+
+    #endregion
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/DTOs/IntegrationPackingNoteDetailDTO.cs

@@ -0,0 +1,235 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Label.Domain.Shared;
+using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class IntegrationPackingNoteDetailDTO : SfsDetailDTOBase
+{
+    #region 物品基础信息
+
+    /// <summary>
+    ///     ERP料号
+    /// </summary>
+    [Display(Name = "ERP料号")]
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    [Display(Name = "物品名称")]
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    [Display(Name = "物品描述1")]
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    [Display(Name = "物品描述2")]
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     配置码
+    /// </summary>
+    [Display(Name = "配置码")]
+    public string Configuration { get; set; }
+
+    #endregion
+
+    #region 库存信息
+
+    /// <summary>
+    ///     标签
+    /// </summary>
+    [Display(Name = "标签")]
+    public string PackingCode { get; set; }
+
+    /// <summary>
+    ///     库位
+    /// </summary>
+    [Display(Name = "库位")]
+    public string LocationCode { get; set; }
+
+    /// <summary>
+    ///     托号
+    /// </summary>
+    [Display(Name = "托号")]
+    public string ContainerCode { get; set; }
+
+    /// <summary>
+    ///     批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Lot { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    [Display(Name = "库存状态")]
+    public EnumInventoryStatus InventoryStatuses { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    [Display(Name = "计量单位")]
+    public string Uom { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    #endregion
+
+    #region 标签信息
+
+    #region InventoryLabel兼容成员
+
+    /// <summary>
+    ///     标签类型
+    /// </summary>
+    [Display(Name = "标签类型")]
+    public EnumLabelType LabelType { get; set; }
+
+    /// <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 string RecommendLocationCode { get; set; }
+
+    /// <summary>
+    ///     目标ERP库位
+    /// </summary>
+    [Display(Name = "目标ERP库位")]
+    public string LocationErpCode { get; set; }
+
+    /// <summary>
+    ///     供应商代码
+    /// </summary>
+    [Display(Name = "供应商代码")]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    ///     要货看板号
+    /// </summary>
+    [Display(Name = "要货看板号")]
+    public string RpNumber { get; set; }
+
+    #endregion
+
+    #region 标签订单信息
+
+    /// <summary>
+    ///     采购订单
+    /// </summary>
+    [Display(Name = "采购订单")]
+    public string PurchaseInfo_PoNumber { get; set; }
+
+    /// <summary>
+    ///     供应商发货单
+    /// </summary>
+    [Display(Name = "供应商发货单")]
+    public string PurchaseInfo_AsnNumber { get; set; }
+
+    /// <summary>
+    ///     到货通知
+    /// </summary>
+    [Display(Name = "到货通知")]
+    public string ArrivalNoticNumber { get; set; }
+
+    /// <summary>
+    ///     任务单
+    /// </summary>
+    [Display(Name = "任务单")]
+    public string TaskOrderNumber { get; set; }
+
+    /// <summary>
+    ///     收货记录单
+    /// </summary>
+    [Display(Name = "收货记录单")]
+    public string ReceiptRecNumber { get; set; }
+
+    /// <summary>
+    ///     上架单
+    /// </summary>
+    [Display(Name = "上架单")]
+    public string PutOnShelfNumber { 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 = "要求到货时间")]
+    public DateTime PlanArriveDate { get; set; }
+
+    #endregion
+
+    #endregion
+}

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

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public interface IIntegrationPackingNoteAppService : ISfsStoreMasterReadOnlyAppServiceBase<IntegrationPackingNoteDTO, SfsStoreRequestInputBase, IntegrationPackingNoteDetailDTO, SfsStoreRequestInputBase>
+{
+   
+}

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

@@ -0,0 +1,247 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Label.Domain.Shared;
+using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+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>
+    ///     ERP料号
+    /// </summary>
+    [Display(Name = "ERP料号")]
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    [Display(Name = "物品名称")]
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    [Display(Name = "物品描述1")]
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    [Display(Name = "物品描述2")]
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     配置码
+    /// </summary>
+    [Display(Name = "配置码")]
+    public string Configuration { get; set; }
+
+    #endregion
+
+    #region 库存信息
+
+    /// <summary>
+    ///     标签
+    /// </summary>
+    [Display(Name = "标签")]
+    public string PackingCode { get; set; }
+
+    /// <summary>
+    ///     库位
+    /// </summary>
+    [Display(Name = "库位")]
+    public string LocationCode { get; set; }
+
+    /// <summary>
+    ///     托号
+    /// </summary>
+    [Display(Name = "托号")]
+    public string ContainerCode { get; set; }
+
+    /// <summary>
+    ///     批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Lot { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    [Display(Name = "库存状态")]
+    public EnumInventoryStatus InventoryStatuses { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    [Display(Name = "计量单位")]
+    public string Uom { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    #endregion
+
+    #region 标签信息
+
+    #region InventoryLabel兼容成员
+
+    /// <summary>
+    ///     标签类型
+    /// </summary>
+    [Display(Name = "标签类型")]
+    public EnumLabelType LabelType { get; set; }
+
+    /// <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 string RecommendLocationCode { get; set; }
+
+    /// <summary>
+    ///     目标ERP库位
+    /// </summary>
+    [Display(Name = "目标ERP库位")]
+    public string LocationErpCode { get; set; }
+
+    /// <summary>
+    ///     供应商代码
+    /// </summary>
+    [Display(Name = "供应商代码")]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    ///     要货看板号
+    /// </summary>
+    [Display(Name = "要货看板号")]
+    public string RpNumber { get; set; }
+
+    #endregion
+
+    #region 标签订单信息
+
+    /// <summary>
+    ///     采购订单
+    /// </summary>
+    [Display(Name = "采购订单")]
+    public string PurchaseInfo_PoNumber { get; set; }
+
+    /// <summary>
+    ///     供应商发货单
+    /// </summary>
+    [Display(Name = "供应商发货单")]
+    public string PurchaseInfo_AsnNumber { get; set; }
+
+    /// <summary>
+    ///     到货通知
+    /// </summary>
+    [Display(Name = "到货通知")]
+    public string ArrivalNoticNumber { get; set; }
+
+    /// <summary>
+    ///     任务单
+    /// </summary>
+    [Display(Name = "任务单")]
+    public string TaskOrderNumber { get; set; }
+
+    /// <summary>
+    ///     收货记录单
+    /// </summary>
+    [Display(Name = "收货记录单")]
+    public string ReceiptRecNumber { get; set; }
+
+    /// <summary>
+    ///     上架单
+    /// </summary>
+    [Display(Name = "上架单")]
+    public string PutOnShelfNumber { 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 = "要求到货时间")]
+    public DateTime PlanArriveDate { get; set; }
+
+    #endregion
+
+    #endregion
+}

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

@@ -0,0 +1,246 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Label.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class IntegrationPackingNoteEditInput : SfsStoreCreateOrUpdateInputBase
+{
+    /// <summary>
+    ///     单号
+    /// </summary>
+    [Display(Name = "单号")]
+    public string Number { get; set; }
+
+    #region 物品基础信息
+
+    /// <summary>
+    ///     ERP料号
+    /// </summary>
+    [Display(Name = "ERP料号")]
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    [Display(Name = "物品名称")]
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    [Display(Name = "物品描述1")]
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    [Display(Name = "物品描述2")]
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     配置码
+    /// </summary>
+    [Display(Name = "配置码")]
+    public string Configuration { get; set; }
+
+    #endregion
+
+    #region 库存信息
+
+    /// <summary>
+    ///     标签
+    /// </summary>
+    [Display(Name = "标签")]
+    public string PackingCode { get; set; }
+
+    /// <summary>
+    ///     库位
+    /// </summary>
+    [Display(Name = "库位")]
+    public string LocationCode { get; set; }
+
+    /// <summary>
+    ///     托号
+    /// </summary>
+    [Display(Name = "托号")]
+    public string ContainerCode { get; set; }
+
+    /// <summary>
+    ///     批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Lot { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    [Display(Name = "库存状态")]
+    public EnumInventoryStatus InventoryStatuses { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    [Display(Name = "计量单位")]
+    public string Uom { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    #endregion
+
+    #region 标签信息
+
+    #region InventoryLabel兼容成员
+
+    /// <summary>
+    ///     标签类型
+    /// </summary>
+    [Display(Name = "标签类型")]
+    public EnumLabelType LabelType { get; set; }
+
+    /// <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 string RecommendLocationCode { get; set; }
+
+    /// <summary>
+    ///     目标ERP库位
+    /// </summary>
+    [Display(Name = "目标ERP库位")]
+    public string LocationErpCode { get; set; }
+
+    /// <summary>
+    ///     供应商代码
+    /// </summary>
+    [Display(Name = "供应商代码")]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    ///     要货看板号
+    /// </summary>
+    [Display(Name = "要货看板号")]
+    public string RpNumber { get; set; }
+
+    #endregion
+
+    #region 标签订单信息
+
+    /// <summary>
+    ///     采购订单
+    /// </summary>
+    [Display(Name = "采购订单")]
+    public string PurchaseInfo_PoNumber { get; set; }
+
+    /// <summary>
+    ///     供应商发货单
+    /// </summary>
+    [Display(Name = "供应商发货单")]
+    public string PurchaseInfo_AsnNumber { get; set; }
+
+    /// <summary>
+    ///     到货通知
+    /// </summary>
+    [Display(Name = "到货通知")]
+    public string ArrivalNoticNumber { get; set; }
+
+    /// <summary>
+    ///     任务单
+    /// </summary>
+    [Display(Name = "任务单")]
+    public string TaskOrderNumber { get; set; }
+
+    /// <summary>
+    ///     收货记录单
+    /// </summary>
+    [Display(Name = "收货记录单")]
+    public string ReceiptRecNumber { get; set; }
+
+    /// <summary>
+    ///     上架单
+    /// </summary>
+    [Display(Name = "上架单")]
+    public string PutOnShelfNumber { 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 = "要求到货时间")]
+    public DateTime PlanArriveDate { get; set; }
+
+    #endregion
+
+    #endregion
+
+    /// <summary>
+    /// 明细列表
+    /// </summary>
+    [Display(Name = "明细列表")]
+    public List<IntegrationPackingNoteDetailInput> Details { get; set; }
+}

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

@@ -0,0 +1,233 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Label.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class IntegrationPackingNoteImportInput : SfsStoreImportInputBase
+{
+    #region 物品基础信息
+
+    /// <summary>
+    ///     ERP料号
+    /// </summary>
+    [Display(Name = "ERP料号")]
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    [Display(Name = "物品名称")]
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    [Display(Name = "物品描述1")]
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    [Display(Name = "物品描述2")]
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     配置码
+    /// </summary>
+    [Display(Name = "配置码")]
+    public string Configuration { get; set; }
+
+    #endregion
+
+    #region 库存信息
+
+    /// <summary>
+    ///     标签
+    /// </summary>
+    [Display(Name = "标签")]
+    public string PackingCode { get; set; }
+
+    /// <summary>
+    ///     库位
+    /// </summary>
+    [Display(Name = "库位")]
+    public string LocationCode { get; set; }
+
+    /// <summary>
+    ///     托号
+    /// </summary>
+    [Display(Name = "托号")]
+    public string ContainerCode { get; set; }
+
+    /// <summary>
+    ///     批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Lot { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    [Display(Name = "库存状态")]
+    public EnumInventoryStatus InventoryStatuses { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    [Display(Name = "计量单位")]
+    public string Uom { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    #endregion
+
+    #region 标签信息
+
+    #region InventoryLabel兼容成员
+
+    /// <summary>
+    ///     标签类型
+    /// </summary>
+    [Display(Name = "标签类型")]
+    public EnumLabelType LabelType { get; set; }
+
+    /// <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 string RecommendLocationCode { get; set; }
+
+    /// <summary>
+    ///     目标ERP库位
+    /// </summary>
+    [Display(Name = "目标ERP库位")]
+    public string LocationErpCode { get; set; }
+
+    /// <summary>
+    ///     供应商代码
+    /// </summary>
+    [Display(Name = "供应商代码")]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    ///     要货看板号
+    /// </summary>
+    [Display(Name = "要货看板号")]
+    public string RpNumber { get; set; }
+
+    #endregion
+
+    #region 标签订单信息
+
+    /// <summary>
+    ///     采购订单
+    /// </summary>
+    [Display(Name = "采购订单")]
+    public string PurchaseInfo_PoNumber { get; set; }
+
+    /// <summary>
+    ///     供应商发货单
+    /// </summary>
+    [Display(Name = "供应商发货单")]
+    public string PurchaseInfo_AsnNumber { get; set; }
+
+    /// <summary>
+    ///     到货通知
+    /// </summary>
+    [Display(Name = "到货通知")]
+    public string ArrivalNoticNumber { get; set; }
+
+    /// <summary>
+    ///     任务单
+    /// </summary>
+    [Display(Name = "任务单")]
+    public string TaskOrderNumber { get; set; }
+
+    /// <summary>
+    ///     收货记录单
+    /// </summary>
+    [Display(Name = "收货记录单")]
+    public string ReceiptRecNumber { get; set; }
+
+    /// <summary>
+    ///     上架单
+    /// </summary>
+    [Display(Name = "上架单")]
+    public string PutOnShelfNumber { 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 = "要求到货时间")]
+    public DateTime PlanArriveDate { get; set; }
+
+    #endregion
+
+    #endregion
+}

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

@@ -0,0 +1,21 @@
+using Volo.Abp.Authorization.Permissions;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public static class IntegrationPackingNotePermissions
+{
+
+    public const string Default = StorePermissions.GroupName + "." + nameof(IntegrationPackingNote);
+    public const string Create = Default + "." + StorePermissions.CreateStr;
+    public const string Update = Default + "." + StorePermissions.UpdateStr;
+    public const string Delete = Default + "." + StorePermissions.DeleteStr;
+
+    public static void AddIntegrationPackingNotePermission(this PermissionGroupDefinition permissionGroup)
+    {
+        var integrationPackingNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(IntegrationPackingNote)));
+        integrationPackingNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
+        integrationPackingNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
+        integrationPackingNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/SeparationPackingNotes/DTOs/SeparationPackingNoteDTO.cs

@@ -0,0 +1,236 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Label.Domain.Shared;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class SeparationPackingNoteDTO : SfsStoreDTOBase<SeparationPackingNoteDetailDTO>, IHasNumber
+{
+    #region 物品基础信息
+
+    /// <summary>
+    ///     ERP料号
+    /// </summary>
+    [Display(Name = "ERP料号")]
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    [Display(Name = "物品名称")]
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    [Display(Name = "物品描述1")]
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    [Display(Name = "物品描述2")]
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     配置码
+    /// </summary>
+    [Display(Name = "配置码")]
+    public string Configuration { get; set; }
+
+    #endregion
+
+    #region 库存信息
+
+    /// <summary>
+    ///     标签
+    /// </summary>
+    [Display(Name = "标签")]
+    public string PackingCode { get; set; }
+
+    /// <summary>
+    ///     库位
+    /// </summary>
+    [Display(Name = "库位")]
+    public string LocationCode { get; set; }
+
+    /// <summary>
+    ///     托号
+    /// </summary>
+    [Display(Name = "托号")]
+    public string ContainerCode { get; set; }
+
+    /// <summary>
+    ///     批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Lot { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    [Display(Name = "库存状态")]
+    public EnumInventoryStatus InventoryStatuses { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    [Display(Name = "计量单位")]
+    public string Uom { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    #endregion
+
+    #region 标签信息
+
+    #region InventoryLabel兼容成员
+
+    /// <summary>
+    ///     标签类型
+    /// </summary>
+    [Display(Name = "标签类型")]
+    public EnumLabelType LabelType { get; set; }
+
+    /// <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 string RecommendLocationCode { get; set; }
+
+    /// <summary>
+    ///     目标ERP库位
+    /// </summary>
+    [Display(Name = "目标ERP库位")]
+    public string LocationErpCode { get; set; }
+
+    /// <summary>
+    ///     供应商代码
+    /// </summary>
+    [Display(Name = "供应商代码")]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    ///     要货看板号
+    /// </summary>
+    [Display(Name = "要货看板号")]
+    public string RpNumber { get; set; }
+
+    #endregion
+
+    #region 标签订单信息
+
+    /// <summary>
+    ///     采购订单
+    /// </summary>
+    [Display(Name = "采购订单")]
+    public string PurchaseInfo_PoNumber { get; set; }
+
+    /// <summary>
+    ///     供应商发货单
+    /// </summary>
+    [Display(Name = "供应商发货单")]
+    public string PurchaseInfo_AsnNumber { get; set; }
+
+    /// <summary>
+    ///     到货通知
+    /// </summary>
+    [Display(Name = "到货通知")]
+    public string ArrivalNoticNumber { get; set; }
+
+    /// <summary>
+    ///     任务单
+    /// </summary>
+    [Display(Name = "任务单")]
+    public string TaskOrderNumber { get; set; }
+
+    /// <summary>
+    ///     收货记录单
+    /// </summary>
+    [Display(Name = "收货记录单")]
+    public string ReceiptRecNumber { get; set; }
+
+    /// <summary>
+    ///     上架单
+    /// </summary>
+    [Display(Name = "上架单")]
+    public string PutOnShelfNumber { 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 = "要求到货时间")]
+    public DateTime PlanArriveDate { get; set; }
+
+    #endregion
+
+    #endregion
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/SeparationPackingNotes/DTOs/SeparationPackingNoteDetailDTO.cs

@@ -0,0 +1,235 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Label.Domain.Shared;
+using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class SeparationPackingNoteDetailDTO : SfsDetailDTOBase
+{
+    #region 物品基础信息
+
+    /// <summary>
+    ///     ERP料号
+    /// </summary>
+    [Display(Name = "ERP料号")]
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    [Display(Name = "物品名称")]
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    [Display(Name = "物品描述1")]
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    [Display(Name = "物品描述2")]
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     配置码
+    /// </summary>
+    [Display(Name = "配置码")]
+    public string Configuration { get; set; }
+
+    #endregion
+
+    #region 库存信息
+
+    /// <summary>
+    ///     标签
+    /// </summary>
+    [Display(Name = "标签")]
+    public string PackingCode { get; set; }
+
+    /// <summary>
+    ///     库位
+    /// </summary>
+    [Display(Name = "库位")]
+    public string LocationCode { get; set; }
+
+    /// <summary>
+    ///     托号
+    /// </summary>
+    [Display(Name = "托号")]
+    public string ContainerCode { get; set; }
+
+    /// <summary>
+    ///     批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Lot { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    [Display(Name = "库存状态")]
+    public EnumInventoryStatus InventoryStatuses { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    [Display(Name = "计量单位")]
+    public string Uom { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    #endregion
+
+    #region 标签信息
+
+    #region InventoryLabel兼容成员
+
+    /// <summary>
+    ///     标签类型
+    /// </summary>
+    [Display(Name = "标签类型")]
+    public EnumLabelType LabelType { get; set; }
+
+    /// <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 string RecommendLocationCode { get; set; }
+
+    /// <summary>
+    ///     目标ERP库位
+    /// </summary>
+    [Display(Name = "目标ERP库位")]
+    public string LocationErpCode { get; set; }
+
+    /// <summary>
+    ///     供应商代码
+    /// </summary>
+    [Display(Name = "供应商代码")]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    ///     要货看板号
+    /// </summary>
+    [Display(Name = "要货看板号")]
+    public string RpNumber { get; set; }
+
+    #endregion
+
+    #region 标签订单信息
+
+    /// <summary>
+    ///     采购订单
+    /// </summary>
+    [Display(Name = "采购订单")]
+    public string PurchaseInfo_PoNumber { get; set; }
+
+    /// <summary>
+    ///     供应商发货单
+    /// </summary>
+    [Display(Name = "供应商发货单")]
+    public string PurchaseInfo_AsnNumber { get; set; }
+
+    /// <summary>
+    ///     到货通知
+    /// </summary>
+    [Display(Name = "到货通知")]
+    public string ArrivalNoticNumber { get; set; }
+
+    /// <summary>
+    ///     任务单
+    /// </summary>
+    [Display(Name = "任务单")]
+    public string TaskOrderNumber { get; set; }
+
+    /// <summary>
+    ///     收货记录单
+    /// </summary>
+    [Display(Name = "收货记录单")]
+    public string ReceiptRecNumber { get; set; }
+
+    /// <summary>
+    ///     上架单
+    /// </summary>
+    [Display(Name = "上架单")]
+    public string PutOnShelfNumber { 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 = "要求到货时间")]
+    public DateTime PlanArriveDate { get; set; }
+
+    #endregion
+
+    #endregion
+}

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

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public interface ISeparationPackingNoteAppService : ISfsStoreMasterReadOnlyAppServiceBase<SeparationPackingNoteDTO, SfsStoreRequestInputBase, SeparationPackingNoteDetailDTO, SfsStoreRequestInputBase>
+{
+    
+}

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

@@ -0,0 +1,247 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Label.Domain.Shared;
+using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+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>
+    ///     ERP料号
+    /// </summary>
+    [Display(Name = "ERP料号")]
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    [Display(Name = "物品名称")]
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    [Display(Name = "物品描述1")]
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    [Display(Name = "物品描述2")]
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     配置码
+    /// </summary>
+    [Display(Name = "配置码")]
+    public string Configuration { get; set; }
+
+    #endregion
+
+    #region 库存信息
+
+    /// <summary>
+    ///     标签
+    /// </summary>
+    [Display(Name = "标签")]
+    public string PackingCode { get; set; }
+
+    /// <summary>
+    ///     库位
+    /// </summary>
+    [Display(Name = "库位")]
+    public string LocationCode { get; set; }
+
+    /// <summary>
+    ///     托号
+    /// </summary>
+    [Display(Name = "托号")]
+    public string ContainerCode { get; set; }
+
+    /// <summary>
+    ///     批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Lot { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    [Display(Name = "库存状态")]
+    public EnumInventoryStatus InventoryStatuses { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    [Display(Name = "计量单位")]
+    public string Uom { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    #endregion
+
+    #region 标签信息
+
+    #region InventoryLabel兼容成员
+
+    /// <summary>
+    ///     标签类型
+    /// </summary>
+    [Display(Name = "标签类型")]
+    public EnumLabelType LabelType { get; set; }
+
+    /// <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 string RecommendLocationCode { get; set; }
+
+    /// <summary>
+    ///     目标ERP库位
+    /// </summary>
+    [Display(Name = "目标ERP库位")]
+    public string LocationErpCode { get; set; }
+
+    /// <summary>
+    ///     供应商代码
+    /// </summary>
+    [Display(Name = "供应商代码")]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    ///     要货看板号
+    /// </summary>
+    [Display(Name = "要货看板号")]
+    public string RpNumber { get; set; }
+
+    #endregion
+
+    #region 标签订单信息
+
+    /// <summary>
+    ///     采购订单
+    /// </summary>
+    [Display(Name = "采购订单")]
+    public string PurchaseInfo_PoNumber { get; set; }
+
+    /// <summary>
+    ///     供应商发货单
+    /// </summary>
+    [Display(Name = "供应商发货单")]
+    public string PurchaseInfo_AsnNumber { get; set; }
+
+    /// <summary>
+    ///     到货通知
+    /// </summary>
+    [Display(Name = "到货通知")]
+    public string ArrivalNoticNumber { get; set; }
+
+    /// <summary>
+    ///     任务单
+    /// </summary>
+    [Display(Name = "任务单")]
+    public string TaskOrderNumber { get; set; }
+
+    /// <summary>
+    ///     收货记录单
+    /// </summary>
+    [Display(Name = "收货记录单")]
+    public string ReceiptRecNumber { get; set; }
+
+    /// <summary>
+    ///     上架单
+    /// </summary>
+    [Display(Name = "上架单")]
+    public string PutOnShelfNumber { 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 = "要求到货时间")]
+    public DateTime PlanArriveDate { get; set; }
+
+    #endregion
+
+    #endregion
+}

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

@@ -0,0 +1,246 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Label.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class SeparationPackingNoteEditInput : SfsStoreCreateOrUpdateInputBase
+{
+    /// <summary>
+    ///     单号
+    /// </summary>
+    [Display(Name = "单号")]
+    public string Number { get; set; }
+
+    #region 物品基础信息
+
+    /// <summary>
+    ///     ERP料号
+    /// </summary>
+    [Display(Name = "ERP料号")]
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    [Display(Name = "物品名称")]
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    [Display(Name = "物品描述1")]
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    [Display(Name = "物品描述2")]
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     配置码
+    /// </summary>
+    [Display(Name = "配置码")]
+    public string Configuration { get; set; }
+
+    #endregion
+
+    #region 库存信息
+
+    /// <summary>
+    ///     标签
+    /// </summary>
+    [Display(Name = "标签")]
+    public string PackingCode { get; set; }
+
+    /// <summary>
+    ///     库位
+    /// </summary>
+    [Display(Name = "库位")]
+    public string LocationCode { get; set; }
+
+    /// <summary>
+    ///     托号
+    /// </summary>
+    [Display(Name = "托号")]
+    public string ContainerCode { get; set; }
+
+    /// <summary>
+    ///     批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Lot { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    [Display(Name = "库存状态")]
+    public EnumInventoryStatus InventoryStatuses { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    [Display(Name = "计量单位")]
+    public string Uom { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    #endregion
+
+    #region 标签信息
+
+    #region InventoryLabel兼容成员
+
+    /// <summary>
+    ///     标签类型
+    /// </summary>
+    [Display(Name = "标签类型")]
+    public EnumLabelType LabelType { get; set; }
+
+    /// <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 string RecommendLocationCode { get; set; }
+
+    /// <summary>
+    ///     目标ERP库位
+    /// </summary>
+    [Display(Name = "目标ERP库位")]
+    public string LocationErpCode { get; set; }
+
+    /// <summary>
+    ///     供应商代码
+    /// </summary>
+    [Display(Name = "供应商代码")]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    ///     要货看板号
+    /// </summary>
+    [Display(Name = "要货看板号")]
+    public string RpNumber { get; set; }
+
+    #endregion
+
+    #region 标签订单信息
+
+    /// <summary>
+    ///     采购订单
+    /// </summary>
+    [Display(Name = "采购订单")]
+    public string PurchaseInfo_PoNumber { get; set; }
+
+    /// <summary>
+    ///     供应商发货单
+    /// </summary>
+    [Display(Name = "供应商发货单")]
+    public string PurchaseInfo_AsnNumber { get; set; }
+
+    /// <summary>
+    ///     到货通知
+    /// </summary>
+    [Display(Name = "到货通知")]
+    public string ArrivalNoticNumber { get; set; }
+
+    /// <summary>
+    ///     任务单
+    /// </summary>
+    [Display(Name = "任务单")]
+    public string TaskOrderNumber { get; set; }
+
+    /// <summary>
+    ///     收货记录单
+    /// </summary>
+    [Display(Name = "收货记录单")]
+    public string ReceiptRecNumber { get; set; }
+
+    /// <summary>
+    ///     上架单
+    /// </summary>
+    [Display(Name = "上架单")]
+    public string PutOnShelfNumber { 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 = "要求到货时间")]
+    public DateTime PlanArriveDate { get; set; }
+
+    #endregion
+
+    #endregion
+
+    /// <summary>
+    /// 明细列表
+    /// </summary>
+    [Display(Name = "明细列表")]
+    public List<SeparationPackingNoteDetailInput> Details { get; set; }
+}

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

@@ -0,0 +1,233 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Label.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class SeparationPackingNoteImportInput : SfsStoreImportInputBase
+{
+    #region 物品基础信息
+
+    /// <summary>
+    ///     ERP料号
+    /// </summary>
+    [Display(Name = "ERP料号")]
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    [Display(Name = "物品名称")]
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    [Display(Name = "物品描述1")]
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    [Display(Name = "物品描述2")]
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     配置码
+    /// </summary>
+    [Display(Name = "配置码")]
+    public string Configuration { get; set; }
+
+    #endregion
+
+    #region 库存信息
+
+    /// <summary>
+    ///     标签
+    /// </summary>
+    [Display(Name = "标签")]
+    public string PackingCode { get; set; }
+
+    /// <summary>
+    ///     库位
+    /// </summary>
+    [Display(Name = "库位")]
+    public string LocationCode { get; set; }
+
+    /// <summary>
+    ///     托号
+    /// </summary>
+    [Display(Name = "托号")]
+    public string ContainerCode { get; set; }
+
+    /// <summary>
+    ///     批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Lot { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    [Display(Name = "库存状态")]
+    public EnumInventoryStatus InventoryStatuses { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    [Display(Name = "计量单位")]
+    public string Uom { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    #endregion
+
+    #region 标签信息
+
+    #region InventoryLabel兼容成员
+
+    /// <summary>
+    ///     标签类型
+    /// </summary>
+    [Display(Name = "标签类型")]
+    public EnumLabelType LabelType { get; set; }
+
+    /// <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 string RecommendLocationCode { get; set; }
+
+    /// <summary>
+    ///     目标ERP库位
+    /// </summary>
+    [Display(Name = "目标ERP库位")]
+    public string LocationErpCode { get; set; }
+
+    /// <summary>
+    ///     供应商代码
+    /// </summary>
+    [Display(Name = "供应商代码")]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    ///     要货看板号
+    /// </summary>
+    [Display(Name = "要货看板号")]
+    public string RpNumber { get; set; }
+
+    #endregion
+
+    #region 标签订单信息
+
+    /// <summary>
+    ///     采购订单
+    /// </summary>
+    [Display(Name = "采购订单")]
+    public string PurchaseInfo_PoNumber { get; set; }
+
+    /// <summary>
+    ///     供应商发货单
+    /// </summary>
+    [Display(Name = "供应商发货单")]
+    public string PurchaseInfo_AsnNumber { get; set; }
+
+    /// <summary>
+    ///     到货通知
+    /// </summary>
+    [Display(Name = "到货通知")]
+    public string ArrivalNoticNumber { get; set; }
+
+    /// <summary>
+    ///     任务单
+    /// </summary>
+    [Display(Name = "任务单")]
+    public string TaskOrderNumber { get; set; }
+
+    /// <summary>
+    ///     收货记录单
+    /// </summary>
+    [Display(Name = "收货记录单")]
+    public string ReceiptRecNumber { get; set; }
+
+    /// <summary>
+    ///     上架单
+    /// </summary>
+    [Display(Name = "上架单")]
+    public string PutOnShelfNumber { 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 = "要求到货时间")]
+    public DateTime PlanArriveDate { get; set; }
+
+    #endregion
+
+    #endregion
+}

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

@@ -0,0 +1,22 @@
+using Volo.Abp.Authorization.Permissions;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public static class SeparationPackingNotePermissions
+{
+
+    public const string Default = StorePermissions.GroupName + "." + nameof(SeparationPackingNote);
+    public const string Create = Default + "." + StorePermissions.CreateStr;
+    public const string Update = Default + "." + StorePermissions.UpdateStr;
+    public const string Delete = Default + "." + StorePermissions.DeleteStr;
+
+    
+    public static void AddSeparationPackingNotePermission(this PermissionGroupDefinition permissionGroup)
+    {
+        var separationPackingNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(SeparationPackingNote)));
+        separationPackingNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
+        separationPackingNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
+        separationPackingNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Permissions/StorePermissionDefinitionProvider.cs

@@ -134,6 +134,8 @@ public class StorePermissionDefinitionProvider : PermissionDefinitionProvider
 
         #endregion
 
+        storeGroup.AddSeparationPackingNotePermission();
+        storeGroup.AddIntegrationPackingNotePermission();
     }
 
     public static LocalizableString L(string name)

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

@@ -0,0 +1,37 @@
+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;
+
+namespace Win_in.Sfs.Wms.Store.Application;
+
+/// <summary>
+///     分割箱
+/// </summary>
+[Authorize]
+[Route($"{StoreConsts.RootPath}integration-packing-note")]
+public class IntegrationPackingNoteAppService :
+    SfsStoreWithDetailsAppServiceBase<
+        IntegrationPackingNote,
+        IntegrationPackingNoteDTO,
+        SfsStoreRequestInputBase,
+        IntegrationPackingNoteEditInput,
+        IntegrationPackingNoteDetail,
+        IntegrationPackingNoteDetailDTO,
+        SfsStoreRequestInputBase,
+        IntegrationPackingNoteImportInput
+    >,
+    IIntegrationPackingNoteAppService
+{
+    private readonly IIntegrationPackingNoteManager _integrationPackingNoteManager;
+
+    public IntegrationPackingNoteAppService(
+        IIntegrationPackingNoteRepository repository,
+        IIntegrationPackingNoteManager integrationPackingNoteManager) : base(repository)
+    {
+        _integrationPackingNoteManager = integrationPackingNoteManager;
+    }
+}

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

@@ -0,0 +1,36 @@
+using AutoMapper;
+using Volo.Abp.AutoMapper;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application;
+
+public partial class StoreApplicationAutoMapperProfile : Profile
+{
+    private void IntegrationPackingNoteAutoMapperProfile()
+    {
+        CreateMap<IntegrationPackingNote, IntegrationPackingNoteDTO>().ReverseMap();
+
+        CreateMap<IntegrationPackingNoteDetail, IntegrationPackingNoteDetailDTO>()
+            .ReverseMap();
+
+        CreateMap<IntegrationPackingNoteDetailInput, IntegrationPackingNoteDetail>()
+            .IgnoreAuditedObjectProperties()
+            .Ignore(x => x.MasterID)
+            .Ignore(x => x.TenantId)
+            .Ignore(x => x.Number)
+            .Ignore(x => x.Id);
+
+        CreateMap<IntegrationPackingNoteEditInput, IntegrationPackingNote>()
+            .Ignore(x => x.TenantId)
+            .Ignore(x => x.Number)
+            .Ignore(x => x.Id)
+            ;
+        CreateMap<IntegrationPackingNoteDetailInput, IntegrationPackingNoteDetail>()
+            .Ignore(x => x.MasterID)
+            .Ignore(x => x.TenantId)
+            .Ignore(x => x.Number)
+            .Ignore(x => x.Id);
+        ;
+    }
+}

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

@@ -0,0 +1,35 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application;
+
+/// <summary>
+///     整合箱
+/// </summary>
+[Authorize]
+[Route($"{StoreConsts.RootPath}separation-packing-note")]
+public class SeparationPackingNoteAppService :
+    SfsStoreWithDetailsAppServiceBase<
+        SeparationPackingNote,
+        SeparationPackingNoteDTO,
+        SfsStoreRequestInputBase,
+        SeparationPackingNoteEditInput,
+        SeparationPackingNoteDetail,
+        SeparationPackingNoteDetailDTO,
+        SfsStoreRequestInputBase,
+        SeparationPackingNoteImportInput
+    >,
+    ISeparationPackingNoteAppService
+{
+    private readonly ISeparationPackingNoteManager _separationPackingNoteManager;
+
+    public SeparationPackingNoteAppService(
+        ISeparationPackingNoteRepository repository,
+        ISeparationPackingNoteManager separationPackingNoteManager) : base(repository)
+    {
+        _separationPackingNoteManager = separationPackingNoteManager;
+    }
+}

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

@@ -0,0 +1,36 @@
+using AutoMapper;
+using Volo.Abp.AutoMapper;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application;
+
+public partial class StoreApplicationAutoMapperProfile : Profile
+{
+    private void SeparationPackingNoteAutoMapperProfile()
+    {
+        CreateMap<SeparationPackingNote, SeparationPackingNoteDTO>().ReverseMap();
+
+        CreateMap<SeparationPackingNoteDetail, SeparationPackingNoteDetailDTO>()
+            .ReverseMap();
+
+        CreateMap<SeparationPackingNoteDetailInput, SeparationPackingNoteDetail>()
+            .IgnoreAuditedObjectProperties()
+            .Ignore(x => x.MasterID)
+            .Ignore(x => x.TenantId)
+            .Ignore(x => x.Number)
+            .Ignore(x => x.Id);
+
+        CreateMap<SeparationPackingNoteEditInput, SeparationPackingNote>()
+            .Ignore(x => x.TenantId)
+            .Ignore(x => x.Number)
+            .Ignore(x => x.Id)
+            ;
+        CreateMap<SeparationPackingNoteDetailInput, SeparationPackingNoteDetail>()
+            .Ignore(x => x.MasterID)
+            .Ignore(x => x.TenantId)
+            .Ignore(x => x.Number)
+            .Ignore(x => x.Id);
+        ;
+    }
+}

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/IntegrationPackingNotes/IIntegrationPackingNoteManager.cs

@@ -0,0 +1,8 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface IIntegrationPackingNoteManager : ISfsStoreManager<IntegrationPackingNote, IntegrationPackingNoteDetail>
+{
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/OperationPacking/IntegrationPackingNotes/IIntegrationPackingNoteRepository.cs

@@ -0,0 +1,5 @@
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface IIntegrationPackingNoteRepository : ISfsStoreRepositoryBase<IntegrationPackingNote>
+{
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNote.cs

@@ -0,0 +1,242 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Label.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+/// <summary>
+///     分割箱记录
+/// </summary>
+public class IntegrationPackingNote : SfsStoreAggregateRootBase<IntegrationPackingNoteDetail>
+{
+    #region 物品基础信息
+
+    /// <summary>
+    ///     ERP料号
+    /// </summary>
+    [Display(Name = "ERP料号")]
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    [Display(Name = "物品名称")]
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    [Display(Name = "物品描述1")]
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    [Display(Name = "物品描述2")]
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     配置码
+    /// </summary>
+    [Display(Name = "配置码")]
+    public string Configuration { get; set; }
+
+    #endregion
+
+    #region 库存信息
+
+    /// <summary>
+    ///     标签
+    /// </summary>
+    [Display(Name = "标签")]
+    public string PackingCode { get; set; }
+
+    /// <summary>
+    ///     库位
+    /// </summary>
+    [Display(Name = "库位")]
+    public string LocationCode { get; set; }
+
+    /// <summary>
+    ///     托号
+    /// </summary>
+    [Display(Name = "托号")]
+    public string ContainerCode { get; set; }
+
+    /// <summary>
+    ///     批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Lot { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    [Display(Name = "库存状态")]
+    public EnumInventoryStatus InventoryStatuses { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    [Display(Name = "计量单位")]
+    public string Uom { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    #endregion
+
+    #region 标签信息
+
+    #region InventoryLabel兼容成员
+
+    /// <summary>
+    ///     标签类型
+    /// </summary>
+    [Display(Name = "标签类型")]
+    public EnumLabelType LabelType { get; set; }
+
+    /// <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 string RecommendLocationCode { get; set; }
+
+    /// <summary>
+    ///     目标ERP库位
+    /// </summary>
+    [Display(Name = "目标ERP库位")]
+    public string LocationErpCode { get; set; }
+
+    /// <summary>
+    ///     供应商代码
+    /// </summary>
+    [Display(Name = "供应商代码")]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    ///     要货看板号
+    /// </summary>
+    [Display(Name = "要货看板号")]
+    public string RpNumber { get; set; }
+
+    #endregion
+
+    #region 标签订单信息
+
+    /// <summary>
+    ///     采购订单
+    /// </summary>
+    [Display(Name = "采购订单")]
+    public string PurchaseInfo_PoNumber { get; set; }
+
+    /// <summary>
+    ///     供应商发货单
+    /// </summary>
+    [Display(Name = "供应商发货单")]
+    public string PurchaseInfo_AsnNumber { get; set; }
+
+    /// <summary>
+    ///     到货通知
+    /// </summary>
+    [Display(Name = "到货通知")]
+    public string ArrivalNoticNumber { get; set; }
+
+    /// <summary>
+    ///     任务单
+    /// </summary>
+    [Display(Name = "任务单")]
+    public string TaskOrderNumber { get; set; }
+
+    /// <summary>
+    ///     收货记录单
+    /// </summary>
+    [Display(Name = "收货记录单")]
+    public string ReceiptRecNumber { get; set; }
+
+    /// <summary>
+    ///     上架单
+    /// </summary>
+    [Display(Name = "上架单")]
+    public string PutOnShelfNumber { 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 = "要求到货时间")]
+    public DateTime PlanArriveDate { get; set; }
+
+    #endregion
+
+    #endregion
+
+    /// <summary>
+    ///     明细列表
+    /// </summary>
+    public override List<IntegrationPackingNoteDetail> Details { get; set; } = new();
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNoteDetail.cs

@@ -0,0 +1,236 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Label.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+// <summary>
+/// 回冲记录明细表
+/// </summary>
+public class IntegrationPackingNoteDetail : SfsStoreDetailWithLotPackingQtyLocationStatusEntityBase
+{
+    #region 物品基础信息
+
+    /// <summary>
+    ///     ERP料号
+    /// </summary>
+    [Display(Name = "ERP料号")]
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    [Display(Name = "物品名称")]
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    [Display(Name = "物品描述1")]
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    [Display(Name = "物品描述2")]
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     配置码
+    /// </summary>
+    [Display(Name = "配置码")]
+    public string Configuration { get; set; }
+
+    #endregion
+
+    #region 库存信息
+
+    /// <summary>
+    ///     标签
+    /// </summary>
+    [Display(Name = "标签")]
+    public string PackingCode { get; set; }
+
+    /// <summary>
+    ///     库位
+    /// </summary>
+    [Display(Name = "库位")]
+    public string LocationCode { get; set; }
+
+    /// <summary>
+    ///     托号
+    /// </summary>
+    [Display(Name = "托号")]
+    public string ContainerCode { get; set; }
+
+    /// <summary>
+    ///     批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Lot { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    [Display(Name = "库存状态")]
+    public EnumInventoryStatus InventoryStatuses { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    [Display(Name = "计量单位")]
+    public string Uom { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    #endregion
+
+    #region 标签信息
+
+    #region InventoryLabel兼容成员
+
+    /// <summary>
+    ///     标签类型
+    /// </summary>
+    [Display(Name = "标签类型")]
+    public EnumLabelType LabelType { get; set; }
+
+    /// <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 string RecommendLocationCode { get; set; }
+
+    /// <summary>
+    ///     目标ERP库位
+    /// </summary>
+    [Display(Name = "目标ERP库位")]
+    public string LocationErpCode { get; set; }
+
+    /// <summary>
+    ///     供应商代码
+    /// </summary>
+    [Display(Name = "供应商代码")]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    ///     要货看板号
+    /// </summary>
+    [Display(Name = "要货看板号")]
+    public string RpNumber { get; set; }
+
+    #endregion
+
+    #region 标签订单信息
+
+    /// <summary>
+    ///     采购订单
+    /// </summary>
+    [Display(Name = "采购订单")]
+    public string PurchaseInfo_PoNumber { get; set; }
+
+    /// <summary>
+    ///     供应商发货单
+    /// </summary>
+    [Display(Name = "供应商发货单")]
+    public string PurchaseInfo_AsnNumber { get; set; }
+
+    /// <summary>
+    ///     到货通知
+    /// </summary>
+    [Display(Name = "到货通知")]
+    public string ArrivalNoticNumber { get; set; }
+
+    /// <summary>
+    ///     任务单
+    /// </summary>
+    [Display(Name = "任务单")]
+    public string TaskOrderNumber { get; set; }
+
+    /// <summary>
+    ///     收货记录单
+    /// </summary>
+    [Display(Name = "收货记录单")]
+    public string ReceiptRecNumber { get; set; }
+
+    /// <summary>
+    ///     上架单
+    /// </summary>
+    [Display(Name = "上架单")]
+    public string PutOnShelfNumber { 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 = "要求到货时间")]
+    public DateTime PlanArriveDate { get; set; }
+
+    #endregion
+
+    #endregion
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNoteManager.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public class IntegrationPackingNoteManager : SfsStoreManagerBase<IntegrationPackingNote, IntegrationPackingNoteDetail>, IIntegrationPackingNoteManager
+{
+
+    public IntegrationPackingNoteManager(
+     IIntegrationPackingNoteRepository repository
+    ) : base(repository)
+    {
+
+    }
+
+}

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

@@ -0,0 +1,8 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface ISeparationPackingNoteManager : ISfsStoreManager<SeparationPackingNote, SeparationPackingNoteDetail>
+{
+}

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

@@ -0,0 +1,5 @@
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface ISeparationPackingNoteRepository : ISfsStoreRepositoryBase<SeparationPackingNote>
+{
+}

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

@@ -0,0 +1,242 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Label.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+/// <summary>
+///     分割箱记录
+/// </summary>
+public class SeparationPackingNote : SfsStoreAggregateRootBase<SeparationPackingNoteDetail>
+{
+    #region 物品基础信息
+
+    /// <summary>
+    ///     ERP料号
+    /// </summary>
+    [Display(Name = "ERP料号")]
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    [Display(Name = "物品名称")]
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    [Display(Name = "物品描述1")]
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    [Display(Name = "物品描述2")]
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     配置码
+    /// </summary>
+    [Display(Name = "配置码")]
+    public string Configuration { get; set; }
+
+    #endregion
+
+    #region 库存信息
+
+    /// <summary>
+    ///     标签
+    /// </summary>
+    [Display(Name = "标签")]
+    public string PackingCode { get; set; }
+
+    /// <summary>
+    ///     库位
+    /// </summary>
+    [Display(Name = "库位")]
+    public string LocationCode { get; set; }
+
+    /// <summary>
+    ///     托号
+    /// </summary>
+    [Display(Name = "托号")]
+    public string ContainerCode { get; set; }
+
+    /// <summary>
+    ///     批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Lot { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    [Display(Name = "库存状态")]
+    public EnumInventoryStatus InventoryStatuses { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    [Display(Name = "计量单位")]
+    public string Uom { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    #endregion
+
+    #region 标签信息
+
+    #region InventoryLabel兼容成员
+
+    /// <summary>
+    ///     标签类型
+    /// </summary>
+    [Display(Name = "标签类型")]
+    public EnumLabelType LabelType { get; set; }
+
+    /// <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 string RecommendLocationCode { get; set; }
+
+    /// <summary>
+    ///     目标ERP库位
+    /// </summary>
+    [Display(Name = "目标ERP库位")]
+    public string LocationErpCode { get; set; }
+
+    /// <summary>
+    ///     供应商代码
+    /// </summary>
+    [Display(Name = "供应商代码")]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    ///     要货看板号
+    /// </summary>
+    [Display(Name = "要货看板号")]
+    public string RpNumber { get; set; }
+
+    #endregion
+
+    #region 标签订单信息
+
+    /// <summary>
+    ///     采购订单
+    /// </summary>
+    [Display(Name = "采购订单")]
+    public string PurchaseInfo_PoNumber { get; set; }
+
+    /// <summary>
+    ///     供应商发货单
+    /// </summary>
+    [Display(Name = "供应商发货单")]
+    public string PurchaseInfo_AsnNumber { get; set; }
+
+    /// <summary>
+    ///     到货通知
+    /// </summary>
+    [Display(Name = "到货通知")]
+    public string ArrivalNoticNumber { get; set; }
+
+    /// <summary>
+    ///     任务单
+    /// </summary>
+    [Display(Name = "任务单")]
+    public string TaskOrderNumber { get; set; }
+
+    /// <summary>
+    ///     收货记录单
+    /// </summary>
+    [Display(Name = "收货记录单")]
+    public string ReceiptRecNumber { get; set; }
+
+    /// <summary>
+    ///     上架单
+    /// </summary>
+    [Display(Name = "上架单")]
+    public string PutOnShelfNumber { 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 = "要求到货时间")]
+    public DateTime PlanArriveDate { get; set; }
+
+    #endregion
+
+    #endregion
+
+    /// <summary>
+    ///     明细列表
+    /// </summary>
+    public override List<SeparationPackingNoteDetail> Details { get; set; } = new();
+}

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

@@ -0,0 +1,236 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Label.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+// <summary>
+/// 回冲记录明细表
+/// </summary>
+public class SeparationPackingNoteDetail : SfsStoreDetailWithLotPackingQtyLocationStatusEntityBase
+{
+    #region 物品基础信息
+
+    /// <summary>
+    ///     ERP料号
+    /// </summary>
+    [Display(Name = "ERP料号")]
+    public string ItemCode { get; set; }
+
+    /// <summary>
+    ///     物品名称
+    /// </summary>
+    [Display(Name = "物品名称")]
+    public string ItemName { get; set; }
+
+    /// <summary>
+    ///     物品描述1
+    /// </summary>
+    [Display(Name = "物品描述1")]
+    public string ItemDesc1 { get; set; }
+
+    /// <summary>
+    ///     物品描述2
+    /// </summary>
+    [Display(Name = "物品描述2")]
+    public string ItemDesc2 { get; set; }
+
+    /// <summary>
+    ///     配置码
+    /// </summary>
+    [Display(Name = "配置码")]
+    public string Configuration { get; set; }
+
+    #endregion
+
+    #region 库存信息
+
+    /// <summary>
+    ///     标签
+    /// </summary>
+    [Display(Name = "标签")]
+    public string PackingCode { get; set; }
+
+    /// <summary>
+    ///     库位
+    /// </summary>
+    [Display(Name = "库位")]
+    public string LocationCode { get; set; }
+
+    /// <summary>
+    ///     托号
+    /// </summary>
+    [Display(Name = "托号")]
+    public string ContainerCode { get; set; }
+
+    /// <summary>
+    ///     批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Lot { get; set; }
+
+    /// <summary>
+    ///     库存状态
+    /// </summary>
+    [Display(Name = "库存状态")]
+    public EnumInventoryStatus InventoryStatuses { get; set; }
+
+    /// <summary>
+    ///     标包数量
+    /// </summary>
+    [Display(Name = "标包数量")]
+    public decimal StdPackQty { get; set; }
+
+    /// <summary>
+    ///     计量单位
+    /// </summary>
+    [Display(Name = "计量单位")]
+    public string Uom { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    #endregion
+
+    #region 标签信息
+
+    #region InventoryLabel兼容成员
+
+    /// <summary>
+    ///     标签类型
+    /// </summary>
+    [Display(Name = "标签类型")]
+    public EnumLabelType LabelType { get; set; }
+
+    /// <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 string RecommendLocationCode { get; set; }
+
+    /// <summary>
+    ///     目标ERP库位
+    /// </summary>
+    [Display(Name = "目标ERP库位")]
+    public string LocationErpCode { get; set; }
+
+    /// <summary>
+    ///     供应商代码
+    /// </summary>
+    [Display(Name = "供应商代码")]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    ///     要货看板号
+    /// </summary>
+    [Display(Name = "要货看板号")]
+    public string RpNumber { get; set; }
+
+    #endregion
+
+    #region 标签订单信息
+
+    /// <summary>
+    ///     采购订单
+    /// </summary>
+    [Display(Name = "采购订单")]
+    public string PurchaseInfo_PoNumber { get; set; }
+
+    /// <summary>
+    ///     供应商发货单
+    /// </summary>
+    [Display(Name = "供应商发货单")]
+    public string PurchaseInfo_AsnNumber { get; set; }
+
+    /// <summary>
+    ///     到货通知
+    /// </summary>
+    [Display(Name = "到货通知")]
+    public string ArrivalNoticNumber { get; set; }
+
+    /// <summary>
+    ///     任务单
+    /// </summary>
+    [Display(Name = "任务单")]
+    public string TaskOrderNumber { get; set; }
+
+    /// <summary>
+    ///     收货记录单
+    /// </summary>
+    [Display(Name = "收货记录单")]
+    public string ReceiptRecNumber { get; set; }
+
+    /// <summary>
+    ///     上架单
+    /// </summary>
+    [Display(Name = "上架单")]
+    public string PutOnShelfNumber { 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 = "要求到货时间")]
+    public DateTime PlanArriveDate { get; set; }
+
+    #endregion
+
+    #endregion
+}

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

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public class SeparationPackingNoteManager : SfsStoreManagerBase<SeparationPackingNote, SeparationPackingNoteDetail>, ISeparationPackingNoteManager
+{
+    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
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/IStoreDbContext.cs

@@ -151,4 +151,8 @@ public interface IStoreDbContext : IEfCoreDbContext
 
     //底盘序列
     public DbSet<ChassisOperationSequence> ChassisOperationSequence { get; }
+    //分割箱
+    public DbSet<IntegrationPackingNote> IntegrationPackingNote { get; }
+    //整合箱
+    public DbSet<SeparationPackingNote> SeparationPackingNote { get; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20241230092930_Add_OperationPacking.cs

@@ -0,0 +1,797 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Win_in.Sfs.Wms.Store.Migrations
+{
+    public partial class Add_OperationPacking : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "CaseCode",
+                table: "Store_UnplannedReceiptNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Executor",
+                table: "Store_UnplannedReceiptNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Explain",
+                table: "Store_UnplannedReceiptNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "FromErpLocationCode",
+                table: "Store_UnplannedReceiptNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IsHasPackingCode",
+                table: "Store_UnplannedReceiptNote",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ItemCode",
+                table: "Store_UnplannedReceiptNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ItemDesc1",
+                table: "Store_UnplannedReceiptNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ItemDesc2",
+                table: "Store_UnplannedReceiptNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ItemName",
+                table: "Store_UnplannedReceiptNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "OnceBusiCode",
+                table: "Store_UnplannedReceiptNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ProjCapacityCode",
+                table: "Store_UnplannedReceiptNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "Qty",
+                table: "Store_UnplannedReceiptNote",
+                type: "decimal(18,6)",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ReasonCode",
+                table: "Store_UnplannedReceiptNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "FromErpLocationCode",
+                table: "Store_UnplannedIssueRequestDetail",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "FromErpLocationCode",
+                table: "Store_UnplannedIssueRequest",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "CaseCode",
+                table: "Store_UnplannedIssueNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Executor",
+                table: "Store_UnplannedIssueNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Explain",
+                table: "Store_UnplannedIssueNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "FromErpLocationCode",
+                table: "Store_UnplannedIssueNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IsHasPackingCode",
+                table: "Store_UnplannedIssueNote",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ItemCode",
+                table: "Store_UnplannedIssueNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ItemDesc1",
+                table: "Store_UnplannedIssueNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ItemDesc2",
+                table: "Store_UnplannedIssueNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ItemName",
+                table: "Store_UnplannedIssueNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "OnceBusiCode",
+                table: "Store_UnplannedIssueNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ProjCapacityCode",
+                table: "Store_UnplannedIssueNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "Qty",
+                table: "Store_UnplannedIssueNote",
+                type: "decimal(18,6)",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ReasonCode",
+                table: "Store_UnplannedIssueNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "TyrpNumber",
+                table: "Store_ExchangeData",
+                type: "nvarchar(max)",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(64)",
+                oldMaxLength: 64);
+
+            migrationBuilder.AddColumn<string>(
+                name: "CustomerName",
+                table: "Store_CustomerProductionReturnNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IsHasPackingCode",
+                table: "Job_UnplannedReceiptJob",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "CaseCode",
+                table: "Job_UnplannedIssueJob",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Explain",
+                table: "Job_UnplannedIssueJob",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "FromErpLocationCode",
+                table: "Job_UnplannedIssueJob",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IsHasPackingCode",
+                table: "Job_UnplannedIssueJob",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ItemCode",
+                table: "Job_UnplannedIssueJob",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ItemDesc1",
+                table: "Job_UnplannedIssueJob",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ItemDesc2",
+                table: "Job_UnplannedIssueJob",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ItemName",
+                table: "Job_UnplannedIssueJob",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "OnceBusiCode",
+                table: "Job_UnplannedIssueJob",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ProjCapacityCode",
+                table: "Job_UnplannedIssueJob",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "Qty",
+                table: "Job_UnplannedIssueJob",
+                type: "decimal(18,6)",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.CreateTable(
+                name: "Job_UnplannedIssueJobFacDetail",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    ReasonCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    CaseCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ProjCapacityCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    OnceBusiCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Explain = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    MasterID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Number = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Remark = table.Column<string>(type: "nvarchar(3072)", maxLength: 3072, nullable: true),
+                    ItemName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ItemDesc1 = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ItemDesc2 = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ItemCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    StdPackQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    Status = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    RecommendContainerCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    RecommendPackingCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    RecommendSupplierBatch = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    RecommendArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendLot = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    RecommendFromLocationCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    RecommendFromLocationArea = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    RecommendFromLocationGroup = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    RecommendFromLocationErpCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    RecommendFromWarehouseCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    Uom = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RecommendQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    HandledContainerCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    HandledPackingCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    HandledSupplierBatch = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    HandledArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    HandledProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    HandledExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    HandledLot = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    HandledFromLocationCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    HandledFromLocationArea = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    HandledFromLocationGroup = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    HandledFromLocationErpCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    HandledFromWarehouseCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    HandledQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Job_UnplannedIssueJobFacDetail", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Job_UnplannedIssueJobFacDetail_Job_UnplannedIssueJob_MasterID",
+                        column: x => x.MasterID,
+                        principalTable: "Job_UnplannedIssueJob",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Store_IntegrationPackingNote",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    ItemCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ItemName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ItemDesc1 = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ItemDesc2 = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Configuration = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PackingCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    LocationCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ContainerCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Lot = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    InventoryStatuses = table.Column<int>(type: "int", nullable: false),
+                    StdPackQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    Uom = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Qty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    LabelType = table.Column<int>(type: "int", nullable: false),
+                    FullBarcodeString = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierBatch = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    ProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    ExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendLocationCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    LocationErpCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RpNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PurchaseInfo_PoNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PurchaseInfo_AsnNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ArrivalNoticNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TaskOrderNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ReceiptRecNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PutOnShelfNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierSimpleName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierItemCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierItemName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PlanArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Remark = table.Column<string>(type: "nvarchar(3072)", maxLength: 3072, nullable: true),
+                    Worker = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Number = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ActiveDate = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Store_IntegrationPackingNote", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Store_SeparationPackingNote",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    ItemCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ItemName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ItemDesc1 = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ItemDesc2 = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Configuration = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PackingCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    LocationCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ContainerCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Lot = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    InventoryStatuses = table.Column<int>(type: "int", nullable: false),
+                    StdPackQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    Uom = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Qty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    LabelType = table.Column<int>(type: "int", nullable: false),
+                    FullBarcodeString = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierBatch = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    ProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    ExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendLocationCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    LocationErpCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RpNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PurchaseInfo_PoNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PurchaseInfo_AsnNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ArrivalNoticNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TaskOrderNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ReceiptRecNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PutOnShelfNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierSimpleName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierItemCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierItemName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PlanArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Remark = table.Column<string>(type: "nvarchar(3072)", maxLength: 3072, nullable: true),
+                    Worker = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Number = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ActiveDate = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Store_SeparationPackingNote", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Store_IntegrationPackingNoteDetail",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    ItemCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ItemName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ItemDesc1 = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ItemDesc2 = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    Configuration = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PackingCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    LocationCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ContainerCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    Lot = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    InventoryStatuses = table.Column<int>(type: "int", nullable: false),
+                    StdPackQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    Uom = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Qty = table.Column<decimal>(type: "decimal(18,6)", precision: 18, scale: 6, nullable: false),
+                    LabelType = table.Column<int>(type: "int", nullable: false),
+                    FullBarcodeString = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierBatch = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    ProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    ExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendLocationCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    LocationErpCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    SupplierCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RpNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PurchaseInfo_PoNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PurchaseInfo_AsnNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ArrivalNoticNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TaskOrderNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ReceiptRecNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PutOnShelfNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierSimpleName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierItemCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierItemName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PlanArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    MasterID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Number = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Remark = table.Column<string>(type: "nvarchar(3072)", maxLength: 3072, nullable: true),
+                    LocationArea = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    LocationGroup = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    WarehouseCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Status = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Store_IntegrationPackingNoteDetail", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Store_IntegrationPackingNoteDetail_Store_IntegrationPackingNote_MasterID",
+                        column: x => x.MasterID,
+                        principalTable: "Store_IntegrationPackingNote",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Store_SeparationPackingNoteDetail",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    ItemCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ItemName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ItemDesc1 = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ItemDesc2 = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    Configuration = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PackingCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    LocationCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ContainerCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    Lot = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    InventoryStatuses = table.Column<int>(type: "int", nullable: false),
+                    StdPackQty = table.Column<decimal>(type: "decimal(18,6)", nullable: false),
+                    Uom = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Qty = table.Column<decimal>(type: "decimal(18,6)", precision: 18, scale: 6, nullable: false),
+                    LabelType = table.Column<int>(type: "int", nullable: false),
+                    FullBarcodeString = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierBatch = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    ProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    ExpireDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RecommendLocationCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    LocationErpCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    SupplierCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RpNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PurchaseInfo_PoNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PurchaseInfo_AsnNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ArrivalNoticNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    TaskOrderNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ReceiptRecNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PutOnShelfNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierSimpleName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierItemCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SupplierItemName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PlanArriveDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    MasterID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Number = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Remark = table.Column<string>(type: "nvarchar(3072)", maxLength: 3072, nullable: true),
+                    LocationArea = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    LocationGroup = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    WarehouseCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Status = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Store_SeparationPackingNoteDetail", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Store_SeparationPackingNoteDetail_Store_SeparationPackingNote_MasterID",
+                        column: x => x.MasterID,
+                        principalTable: "Store_SeparationPackingNote",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Job_UnplannedIssueJobFacDetail_MasterID",
+                table: "Job_UnplannedIssueJobFacDetail",
+                column: "MasterID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Store_IntegrationPackingNote_Number",
+                table: "Store_IntegrationPackingNote",
+                column: "Number",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Store_IntegrationPackingNoteDetail_MasterID",
+                table: "Store_IntegrationPackingNoteDetail",
+                column: "MasterID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Store_SeparationPackingNote_Number",
+                table: "Store_SeparationPackingNote",
+                column: "Number",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Store_SeparationPackingNoteDetail_MasterID",
+                table: "Store_SeparationPackingNoteDetail",
+                column: "MasterID");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Job_UnplannedIssueJobFacDetail");
+
+            migrationBuilder.DropTable(
+                name: "Store_IntegrationPackingNoteDetail");
+
+            migrationBuilder.DropTable(
+                name: "Store_SeparationPackingNoteDetail");
+
+            migrationBuilder.DropTable(
+                name: "Store_IntegrationPackingNote");
+
+            migrationBuilder.DropTable(
+                name: "Store_SeparationPackingNote");
+
+            migrationBuilder.DropColumn(
+                name: "CaseCode",
+                table: "Store_UnplannedReceiptNote");
+
+            migrationBuilder.DropColumn(
+                name: "Executor",
+                table: "Store_UnplannedReceiptNote");
+
+            migrationBuilder.DropColumn(
+                name: "Explain",
+                table: "Store_UnplannedReceiptNote");
+
+            migrationBuilder.DropColumn(
+                name: "FromErpLocationCode",
+                table: "Store_UnplannedReceiptNote");
+
+            migrationBuilder.DropColumn(
+                name: "IsHasPackingCode",
+                table: "Store_UnplannedReceiptNote");
+
+            migrationBuilder.DropColumn(
+                name: "ItemCode",
+                table: "Store_UnplannedReceiptNote");
+
+            migrationBuilder.DropColumn(
+                name: "ItemDesc1",
+                table: "Store_UnplannedReceiptNote");
+
+            migrationBuilder.DropColumn(
+                name: "ItemDesc2",
+                table: "Store_UnplannedReceiptNote");
+
+            migrationBuilder.DropColumn(
+                name: "ItemName",
+                table: "Store_UnplannedReceiptNote");
+
+            migrationBuilder.DropColumn(
+                name: "OnceBusiCode",
+                table: "Store_UnplannedReceiptNote");
+
+            migrationBuilder.DropColumn(
+                name: "ProjCapacityCode",
+                table: "Store_UnplannedReceiptNote");
+
+            migrationBuilder.DropColumn(
+                name: "Qty",
+                table: "Store_UnplannedReceiptNote");
+
+            migrationBuilder.DropColumn(
+                name: "ReasonCode",
+                table: "Store_UnplannedReceiptNote");
+
+            migrationBuilder.DropColumn(
+                name: "FromErpLocationCode",
+                table: "Store_UnplannedIssueRequestDetail");
+
+            migrationBuilder.DropColumn(
+                name: "FromErpLocationCode",
+                table: "Store_UnplannedIssueRequest");
+
+            migrationBuilder.DropColumn(
+                name: "CaseCode",
+                table: "Store_UnplannedIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "Executor",
+                table: "Store_UnplannedIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "Explain",
+                table: "Store_UnplannedIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "FromErpLocationCode",
+                table: "Store_UnplannedIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "IsHasPackingCode",
+                table: "Store_UnplannedIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "ItemCode",
+                table: "Store_UnplannedIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "ItemDesc1",
+                table: "Store_UnplannedIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "ItemDesc2",
+                table: "Store_UnplannedIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "ItemName",
+                table: "Store_UnplannedIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "OnceBusiCode",
+                table: "Store_UnplannedIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "ProjCapacityCode",
+                table: "Store_UnplannedIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "Qty",
+                table: "Store_UnplannedIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "ReasonCode",
+                table: "Store_UnplannedIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "CustomerName",
+                table: "Store_CustomerProductionReturnNote");
+
+            migrationBuilder.DropColumn(
+                name: "IsHasPackingCode",
+                table: "Job_UnplannedReceiptJob");
+
+            migrationBuilder.DropColumn(
+                name: "CaseCode",
+                table: "Job_UnplannedIssueJob");
+
+            migrationBuilder.DropColumn(
+                name: "Explain",
+                table: "Job_UnplannedIssueJob");
+
+            migrationBuilder.DropColumn(
+                name: "FromErpLocationCode",
+                table: "Job_UnplannedIssueJob");
+
+            migrationBuilder.DropColumn(
+                name: "IsHasPackingCode",
+                table: "Job_UnplannedIssueJob");
+
+            migrationBuilder.DropColumn(
+                name: "ItemCode",
+                table: "Job_UnplannedIssueJob");
+
+            migrationBuilder.DropColumn(
+                name: "ItemDesc1",
+                table: "Job_UnplannedIssueJob");
+
+            migrationBuilder.DropColumn(
+                name: "ItemDesc2",
+                table: "Job_UnplannedIssueJob");
+
+            migrationBuilder.DropColumn(
+                name: "ItemName",
+                table: "Job_UnplannedIssueJob");
+
+            migrationBuilder.DropColumn(
+                name: "OnceBusiCode",
+                table: "Job_UnplannedIssueJob");
+
+            migrationBuilder.DropColumn(
+                name: "ProjCapacityCode",
+                table: "Job_UnplannedIssueJob");
+
+            migrationBuilder.DropColumn(
+                name: "Qty",
+                table: "Job_UnplannedIssueJob");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "TyrpNumber",
+                table: "Store_ExchangeData",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "nvarchar(max)",
+                oldNullable: true);
+        }
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNoteDbContextModelCreatingExtensions.cs

@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore.Modeling;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
+
+public static class IntegrationPackingNoteDbContextModelCreatingExtensions
+{
+    public static void ConfigureIntegrationPackingNote(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options)
+    {
+        builder.Entity<IntegrationPackingNote>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(options.TablePrefix + nameof(IntegrationPackingNote), options.Schema);
+            //Configure ABP properties
+            b.ConfigureByConvention();
+            //Configure Sfs base properties
+            b.ConfigureSfsStoreBase();
+
+            //Relations
+            b.HasMany(q => q.Details).WithOne().HasForeignKey(d => d.MasterID).IsRequired();
+
+            //Indexes
+            b.HasIndex(q => new { q.Number }).IsUnique();
+        });
+
+        builder.Entity<IntegrationPackingNoteDetail>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(options.TablePrefix + nameof(IntegrationPackingNoteDetail), options.Schema);
+            //Configure ABP properties
+            b.ConfigureByConvention();
+            //Configure Sfs base properties
+            b.ConfigureSfsStoreBase();
+            //Configure Sfs store detail properties
+            b.ConfigureSfsStoreDetailBase();
+        });
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNoteEfCoreRepository.cs

@@ -0,0 +1,11 @@
+using Volo.Abp.EntityFrameworkCore;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
+
+public class IntegrationPackingNoteEfCoreRepository : SfsStoreEfCoreRepositoryBase<StoreDbContext, IntegrationPackingNote>, IIntegrationPackingNoteRepository
+{
+    public IntegrationPackingNoteEfCoreRepository(IDbContextProvider<StoreDbContext> dbContextProvider) : base(dbContextProvider)
+    {
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/OperationPacking/SeparationPackingNotes/IntegrationPackingNoteDbContextModelCreatingExtensions.cs

@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore.Modeling;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
+
+public static class SeparationPackingNoteDbContextModelCreatingExtensions
+{
+    public static void ConfigureSeparationPackingNote(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options)
+    {
+        builder.Entity<SeparationPackingNote>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(options.TablePrefix + nameof(SeparationPackingNote), options.Schema);
+            //Configure ABP properties
+            b.ConfigureByConvention();
+            //Configure Sfs base properties
+            b.ConfigureSfsStoreBase();
+
+            //Relations
+            b.HasMany(q => q.Details).WithOne().HasForeignKey(d => d.MasterID).IsRequired();
+
+            //Indexes
+            b.HasIndex(q => new { q.Number }).IsUnique();
+        });
+
+        builder.Entity<SeparationPackingNoteDetail>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(options.TablePrefix + nameof(SeparationPackingNoteDetail), options.Schema);
+            //Configure ABP properties
+            b.ConfigureByConvention();
+            //Configure Sfs base properties
+            b.ConfigureSfsStoreBase();
+            //Configure Sfs store detail properties
+            b.ConfigureSfsStoreDetailBase();
+        });
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/OperationPacking/SeparationPackingNotes/IntegrationPackingNoteEfCoreRepository.cs

@@ -0,0 +1,11 @@
+using Volo.Abp.EntityFrameworkCore;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
+
+public class SeparationPackingNoteEfCoreRepository : SfsStoreEfCoreRepositoryBase<StoreDbContext, SeparationPackingNote>, ISeparationPackingNoteRepository
+{
+    public SeparationPackingNoteEfCoreRepository(IDbContextProvider<StoreDbContext> dbContextProvider) : base(dbContextProvider)
+    {
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs

@@ -146,8 +146,9 @@ public class StoreDbContext : AbpDbContext<StoreDbContext>, IStoreDbContext
 
    //底盘序列
     public DbSet<ChassisOperationSequence> ChassisOperationSequence { get; set; }
-
     public DbSet<KittingPackagingNote> KittingPackagingNote { get; set; }
+    public DbSet<IntegrationPackingNote> IntegrationPackingNote { get; set; }
+    public DbSet<SeparationPackingNote> SeparationPackingNote { get; set; }
 
     public StoreDbContext(DbContextOptions<StoreDbContext> options)
         : base(options)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContextModelCreatingExtensions.cs

@@ -117,6 +117,8 @@ public static class StoreDbContextModelCreatingExtensions
         builder.ConfigureInjectioModelPlan(options);
         builder.ConfigureCustomerProductionReturnNote(options);
         builder.ConfigureKittingPackagingNote(options);
+        builder.ConfigureIntegrationPackingNote(options);
+        builder.ConfigureSeparationPackingNote(options);
         #endregion
 
         #region Jobs

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs

@@ -46,7 +46,6 @@ public class StoreEntityFrameworkCoreModule : AbpModule
         context.Services.AddTransient<ICustomerAsnRepository, CustomerAsnEfCoreRepository>();
         context.Services.AddTransient<IInjectioModelPlanRepository, InjectioModelPlanEfCoreRepository>();
 
-
         #endregion
 
         #region Requests
@@ -63,7 +62,7 @@ public class StoreEntityFrameworkCoreModule : AbpModule
         context.Services.AddTransient<IKittingIssueRequestRepository, KittingIssueRequestEfCoreRepository>();
         context.Services.AddTransient<IAssembleIssueRequestRepository, AssembleIssueRequestEfCoreRepository>();
         context.Services.AddTransient<IThirdLocationRequestRepository, ThirdLocationRequestEfCoreRepository>();
-        context.Services.AddTransient<IDeliverRequestRepository, DeliverRequestEfCoreRepository>();        
+        context.Services.AddTransient<IDeliverRequestRepository, DeliverRequestEfCoreRepository>();
         context.Services.AddTransient<IContainerRequestRepository, ContainerRequestEfCoreRepository>();
         context.Services.AddTransient<IInspectRequestRepository, InspectRequestEfCoreRepository>();
         context.Services.AddTransient<IProductionReturnRequestRepository, ProductionReturnRequestEfCoreRepository>();
@@ -74,13 +73,11 @@ public class StoreEntityFrameworkCoreModule : AbpModule
         context.Services.AddTransient<IPutawayRequestRepository, PutawayRequestEfCoreRepository>();
         context.Services.AddTransient<IScrapRequestRepository, ScrapRequestEfCoreRepository>();
         context.Services.AddTransient<ICountAdjustRequestRepository, CountAdjustRequestEfCoreRepository>();
-        context.Services.AddTransient<IWipWarehouseAdjustRequestRepository, WipWarehouseAdjustRequestEfCoreRepository>();
+        context.Services
+            .AddTransient<IWipWarehouseAdjustRequestRepository, WipWarehouseAdjustRequestEfCoreRepository>();
 
         context.Services.AddTransient<ICoatingIssueRequestRepository, CoatingIssueRequestEfCoreRepository>();
 
-
-
-
         #endregion
 
         #region Notes
@@ -128,10 +125,10 @@ public class StoreEntityFrameworkCoreModule : AbpModule
         context.Services.AddTransient<INoOkConvertOkNoteRepository, NoOkConvertOkNoteEfCoreRepository>();
         context.Services.AddTransient<IWipWarehouseAdjustNoteRepository, WipWarehouseAdjustNoteEfCoreRepository>();
         context.Services.AddTransient<ICoatingIssueNoteRepository, CoatingIssueNoteEfCoreRepository>();
-        context.Services.AddTransient<ICustomerProductionReturnNoteRepository, CustomerProductionReturnNoteEfCoreRepository>();
+        context.Services
+            .AddTransient<ICustomerProductionReturnNoteRepository, CustomerProductionReturnNoteEfCoreRepository>();
         context.Services.AddTransient<IMesNoteRepository, MesNoteEfCoreRepository>();
         context.Services.AddTransient<IMesRecordRepository, MesRecordEfCoreRepository>();
-    
 
         #endregion
 
@@ -160,6 +157,7 @@ public class StoreEntityFrameworkCoreModule : AbpModule
         context.Services.AddTransient<IProductionReturnJobRepository, ProductionReturnJobEfCoreRepository>();
         context.Services.AddTransient<ICoatingIssueJobRepository, CoatingIssueJobEfCoreRepository>();
         context.Services.AddTransient<ITransferLibJobRepository, TransferLibJobEfCoreRepository>();
+
         #endregion
 
         context.Services.AddTransient<IExchangeDataRepository, ExchangeDataEfCoreRepository>();
@@ -169,6 +167,10 @@ public class StoreEntityFrameworkCoreModule : AbpModule
         context.Services.AddTransient<IChassisOperationSequenceRepository, ChassisOperationSequenceEfCoreRepository>();
 
         context.Services.AddTransient<IKittingPackagingNoteRepository, KittingPackagingNoteEfCoreRepository>();
+
+        context.Services.AddTransient<IIntegrationPackingNoteRepository, IntegrationPackingNoteEfCoreRepository>();
+
+        context.Services.AddTransient<ISeparationPackingNoteRepository, SeparationPackingNoteEfCoreRepository>();
     }
 
     private void ConfigureEntity()
@@ -192,7 +194,7 @@ public class StoreEntityFrameworkCoreModule : AbpModule
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
 
             options.Entity<InjectioModelPlan>(orderOptions =>
-              orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<PreparationPlan>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<DeliverPlan>(orderOptions =>
@@ -219,19 +221,19 @@ public class StoreEntityFrameworkCoreModule : AbpModule
             options.Entity<MaterialRequest>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<InjectionIssueRequest>(orderOptions =>
-               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<InjectionPlanRequest>(orderOptions =>
-              orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<SparePartIssueRequest>(orderOptions =>
-              orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<KittingIssueRequest>(orderOptions =>
-               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<CoatingIssueRequest>(orderOptions =>
-               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<AssembleIssueRequest>(orderOptions =>
-               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ThirdLocationRequest>(orderOptions =>
-               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ContainerRequest>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<PurchaseReceiptRequest>(orderOptions =>
@@ -284,25 +286,25 @@ public class StoreEntityFrameworkCoreModule : AbpModule
             options.Entity<IssueNote>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<CoatingIssueNote>(orderOptions =>
-            orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<InjectionIssueNote>(orderOptions =>
-               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<InjectionPlanNote>(orderOptions =>
-              orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<AssembleIssueNote>(orderOptions =>
-              orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<SparePartIssueNote>(orderOptions =>
-               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<KittingIssueNote>(orderOptions =>
-               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ThirdLocationNote>(orderOptions =>
-             orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ContainerNote>(orderOptions =>
-               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ScrapNote>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<MesNote>(orderOptions =>
-              orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<IsolationNote>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ReceiptAbnormalNote>(orderOptions =>
@@ -322,17 +324,18 @@ public class StoreEntityFrameworkCoreModule : AbpModule
             options.Entity<PurchaseReceiptNote>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<CountNote>(orderOptions =>
-                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details).Include(o => o.DepDetails));
+                orderOptions.DefaultWithDetailsFunc =
+                    query => query.Include(o => o.Details).Include(o => o.DepDetails));
             options.Entity<InspectNote>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details)
-                                                                    .Include(o => o.SummaryDetails));
+                    .Include(o => o.SummaryDetails));
             options.Entity<InventoryTransferNote>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<WarehouseTransferNote>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ProductRecycleNote>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details)
-                                                                    .Include(t => t.MaterialDetails));
+                    .Include(t => t.MaterialDetails));
             options.Entity<ProductionReturnNote>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<CustomerReturnNote>(orderOptions =>
@@ -354,65 +357,72 @@ public class StoreEntityFrameworkCoreModule : AbpModule
             options.Entity<WipWarehouseAdjustNote>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<MesRecord>(orderOptions =>
-           orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
 
             options.Entity<CustomerProductionReturnNote>(orderOptions =>
-          orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
 
             options.Entity<KittingPackagingNote>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details)
                     .Include(o => o.DepDetails));
+
+            options.Entity<IntegrationPackingNote>(orderOptions =>
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+
+            options.Entity<SeparationPackingNote>(orderOptions =>
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+
             #endregion
 
             #region Jobs
 
             options.Entity<CountJob>(orderOptions =>
-                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details).Include(o => o.DepDetails));
+                orderOptions.DefaultWithDetailsFunc =
+                    query => query.Include(o => o.Details).Include(o => o.DepDetails));
             options.Entity<CheckJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ProductReceiveJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ProductRecycleJob>(orderOptions =>
-               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<PurchaseReturnJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<IssueJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<InjectionIssueJob>(orderOptions =>
-               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<InjectionPlanJob>(orderOptions =>
-              orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<AssembleIssueJob>(orderOptions =>
-              orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<SparePartIssueJob>(orderOptions =>
-              orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<KittingIssueJob>(orderOptions =>
-               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<CoatingIssueJob>(orderOptions =>
-            orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ThirdLocationJob>(orderOptions =>
-             orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ContainerJob>(orderOptions =>
-               orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<PutawayJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<PurchaseReceiptJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<InspectJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details)
-                                                                    .Include(o => o.SummaryDetails));
+                    .Include(o => o.SummaryDetails));
             options.Entity<DeliverJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<JisDeliverJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<UnplannedIssueJob>(orderOptions =>
-                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details).Include(o=>o.FacDetails));
+                orderOptions.DefaultWithDetailsFunc =
-        
+                    query => query.Include(o => o.Details).Include(o => o.FacDetails));
             options.Entity<UnplannedReceiptJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ProductionReturnJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
-
             options.Entity<TransferLibJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));