diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDTO.cs
index 17e94adae..a73a4e9c4 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDTO.cs
@@ -46,6 +46,37 @@ public class UnplannedIssueNoteDTO : SfsStoreDTOBase<UnplannedIssueNoteDetailDTO
     [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string OANumber { get; set; }
 
+    /// <summary>
+    ///     原因代码
+    /// </summary>
+    [Display(Name = "原因代码")]
+    public string ReasonCode { get; set; }
+
+    /// <summary>
+    ///     专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    ///     项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    ///     次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
+    /// <summary>
+    ///     说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
+
+    /// <summary>
     ///     ERP料号
     /// </summary>
     [Display(Name = "ERP料号")]
@@ -82,4 +113,9 @@ public class UnplannedIssueNoteDTO : SfsStoreDTOBase<UnplannedIssueNoteDetailDTO
     public decimal Qty { get; set; }
 
 
+    /// <summary>
+    /// 是否有箱码
+    /// </summary>
+    [Display(Name = "是否有箱码")]
+    public int IsHasPackingCode { get; set; }
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs
index b13734990..568b28b4e 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs
@@ -67,6 +67,37 @@ public class UnplannedIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase
     [Display(Name = "OA单据号")]
     public string OANumber { get; set; }
 
+    /// <summary>
+    ///     原因代码
+    /// </summary>
+    [Display(Name = "原因代码")]
+    public string ReasonCode { get; set; }
+
+    /// <summary>
+    ///     专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    ///     项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    ///     次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
+    /// <summary>
+    ///     说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
+
+    /// <summary>
     ///     ERP料号
     /// </summary>
     [Display(Name = "ERP料号")]
@@ -103,6 +134,11 @@ public class UnplannedIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase
     public decimal Qty { get; set; }
 
 
+    /// <summary>
+    /// 是否有箱码
+    /// </summary>
+    [Display(Name = "是否有箱码")]
+    public int IsHasPackingCode { get; set; }
 
 
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteImportInput.cs
index 30f01680f..d644821eb 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteImportInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteImportInput.cs
@@ -10,4 +10,77 @@ public class UnplannedIssueNoteImportInput : SfsStoreImportInputBase
     /// </summary>
     [Display(Name = "计划外出库请求单号")]
     public string UnplannedIssueRequestNumber { get; set; }
+
+    /// <summary>
+    ///     原因代码
+    /// </summary>
+    [Display(Name = "原因代码")]
+    public string ReasonCode { get; set; }
+
+    /// <summary>
+    ///     专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    ///     项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    ///     次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
+    /// <summary>
+    ///     说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
+
+    /// <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>
+    ///     ERP储位
+    /// </summary>
+    [Display(Name = "ERP储位")]
+    public string FromErpLocationCode { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+
+    /// <summary>
+    /// 是否有箱码
+    /// </summary>
+    [Display(Name = "是否有箱码")]
+    public int IsHasPackingCode { get; set; }
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDTO.cs
index 89aec1ca7..20743c67b 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDTO.cs
@@ -44,4 +44,77 @@ public class UnplannedReceiptNoteDTO : SfsStoreDTOBase<UnplannedReceiptNoteDetai
     [Display(Name = "OA单据号")]
     [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string OANumber { get; set; }
+
+    /// <summary>
+    ///     原因代码
+    /// </summary>
+    [Display(Name = "原因代码")]
+    public string ReasonCode { get; set; }
+
+    /// <summary>
+    ///     专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    ///     项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    ///     次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
+    /// <summary>
+    ///     说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
+
+    /// <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>
+    ///     ERP储位
+    /// </summary>
+    [Display(Name = "ERP储位")]
+    public string FromErpLocationCode { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+
+    /// <summary>
+    /// 是否有箱码
+    /// </summary>
+    [Display(Name = "是否有箱码")]
+    public int IsHasPackingCode { get; set; }
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteEditInput.cs
index 58f8fb00d..f74d511e7 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteEditInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteEditInput.cs
@@ -66,4 +66,77 @@ public class UnplannedReceiptNoteEditInput : SfsStoreCreateOrUpdateInputBase
     /// </summary>
     [Display(Name = "OA单据号")]
     public string OANumber { get; set; }
+
+    /// <summary>
+    ///     原因代码
+    /// </summary>
+    [Display(Name = "原因代码")]
+    public string ReasonCode { get; set; }
+
+    /// <summary>
+    ///     专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    ///     项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    ///     次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
+    /// <summary>
+    ///     说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
+
+    /// <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>
+    ///     ERP储位
+    /// </summary>
+    [Display(Name = "ERP储位")]
+    public string FromErpLocationCode { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+
+    /// <summary>
+    /// 是否有箱码
+    /// </summary>
+    [Display(Name = "是否有箱码")]
+    public int IsHasPackingCode { get; set; }
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteImportInput.cs
index 9fd4491d8..e4343b63e 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteImportInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteImportInput.cs
@@ -11,4 +11,76 @@ public class UnplannedReceiptNoteImportInput : SfsStoreImportInputBase
     [Display(Name = "计划外入库请求单号")]
     public string UnplannedReceiptRequestNumber { get; set; }
 
+    /// <summary>
+    ///     原因代码
+    /// </summary>
+    [Display(Name = "原因代码")]
+    public string ReasonCode { get; set; }
+
+    /// <summary>
+    ///     专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    ///     项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    ///     次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
+    /// <summary>
+    ///     说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
+
+    /// <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>
+    ///     ERP储位
+    /// </summary>
+    [Display(Name = "ERP储位")]
+    public string FromErpLocationCode { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+
+    /// <summary>
+    /// 是否有箱码
+    /// </summary>
+    [Display(Name = "是否有箱码")]
+    public int IsHasPackingCode { get; set; }
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs
index 157c796da..994c6b8ea 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs
@@ -408,7 +408,7 @@ public class UnplannedIssueJobAppService
                     job.IsAutoComplete = false;
                     job.DeptCode = requestDto.DeptCode;
                     job.DeptName = requestDto.DeptName;
-                    job.Worker = requestDto.Worker;
+                    job.Worker = "未执行";
                     job.OANumber = requestDto.OANumber;
                     job.Number = await _unplannedIssueJobManager.GetNumber().ConfigureAwait(true);
                     job.Details = new List<UnplannedIssueJobDetail>();
@@ -595,6 +595,11 @@ public class UnplannedIssueJobAppService
     /// <returns></returns>
     private async Task<UnplannedIssueNoteEditInput> BuildUnplannedIssueNoteAsync(UnplannedIssueJob unplannedIssueJobDto)
     {
+        if (!unplannedIssueJobDto.Details.Any())
+        {
+            return new UnplannedIssueNoteEditInput();
+        }
+
         //var createInput =
         //    ObjectMapper.Map<UnplannedIssueJob, UnplannedIssueNoteEditInput>(unplannedIssueJobDto);
         var issuenote = new UnplannedIssueNoteEditInput();
@@ -656,10 +661,6 @@ public class UnplannedIssueJobAppService
         //var errorQuery = from itm in facQuery join itm1 in query on itm.ItemCode equals itm1.ItemCode where itm1.Qty > itm.Qty select itm.ItemCode ;
         //var errorList = errorQuery.ToList();
 
-        if (dto.Details.Count == 0)
-        {
-            throw new UserFriendlyException($"任务无明细信息!");
-        }
         var sumqty = query.FirstOrDefault().Qty;
        
         if (job.Qty < sumqty)
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs
index d22602724..2655ff6af 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs
@@ -105,7 +105,6 @@ ISupplierItemAppService supplierItemAppService) : base(repository)
 
         #endregion
 
-
         foreach (var purchaseOrder in ImportData)
         {
             if (CurrentUser == null)
@@ -139,6 +138,12 @@ ISupplierItemAppService supplierItemAppService) : base(repository)
             foreach (var detail in purchaseOrder.Details)
             {
                 await CheckItemPrice(purchaseOrder.SupplierCode,detail.ItemCode).ConfigureAwait(false);
+
+                if (purchaseOrder.Details.Count(p => p.ItemCode == detail.ItemCode) > 1)
+                {
+                    throw new UserFriendlyException($"同一订单号内ERP料号不允许重复！");
+                }
+
                 detail.LineStatus = EnumOrderStatus.Open;
                 var itemBasicDto = itemBasicDtos.First(p => p.Code == detail.ItemCode);
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
index 2d606faa8..8c583a63e 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
@@ -266,7 +266,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
         request.SetId(GuidGenerator.Create());
         request.AutoCompleteJob = false;
         request.AutoSubmit = isAutoSubmit;
-        request.AutoAgree = true;
+        request.AutoAgree = false;
         request.AutoHandle = true;
         request.DirectCreateNote = false;
         request.DeptCode = first.DeptCode;
@@ -441,10 +441,8 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
             //                                           $"或{EnumUnplannedReceiptType.Raw.GetDisplayName()}】");
             //}
 
-       
-
-
-
+            await SetRequestAutoPropertiesAsync(unplannedReceiptRequest).ConfigureAwait(false);
+            await SetEntityPropertiesAsync(unplannedReceiptRequest).ConfigureAwait(false);
 
             unplannedReceiptRequest.AutoCompleteJob = false;
             unplannedReceiptRequest.AutoSubmit = true;
@@ -452,9 +450,6 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
             unplannedReceiptRequest.AutoHandle = true;
             unplannedReceiptRequest.DirectCreateNote = false;
             unplannedReceiptRequest.BuildDate = DateTime.Now;
-            await SetRequestAutoPropertiesAsync(unplannedReceiptRequest).ConfigureAwait(false);
-            await SetEntityPropertiesAsync(unplannedReceiptRequest).ConfigureAwait(false);
-
             foreach (var detail in unplannedReceiptRequest.Details)
             {
                 detail.LocationErpCode = detail.FromErpLocationCode;
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs
index 1bfa5998c..edb326ec1 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs
@@ -55,8 +55,37 @@ public class UnplannedIssueNote : SfsStoreAggregateRootBase<UnplannedIssueNoteDe
     [Display(Name = "OA单据号")]
     public string OANumber { get; set; }
 
+    /// <summary>
+    ///     原因代码
+    /// </summary>
+    [Display(Name = "原因代码")]
+    public string ReasonCode { get; set; }
 
+    /// <summary>
+    ///     专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
 
+    /// <summary>
+    ///     项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    ///     次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
+    /// <summary>
+    ///     说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
+
+    /// <summary>
     ///     ERP料号
     /// </summary>
     [Display(Name = "ERP料号")]
@@ -92,11 +121,10 @@ public class UnplannedIssueNote : SfsStoreAggregateRootBase<UnplannedIssueNoteDe
     [Display(Name = "数量")]
     public decimal Qty { get; set; }
 
-   
-
-
-
-
-
 
+    /// <summary>
+    /// 是否有箱码
+    /// </summary>
+    [Display(Name = "是否有箱码")]
+    public int IsHasPackingCode { get; set; }
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNote.cs
index d7761e1f3..48be95781 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNote.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNote.cs
@@ -54,4 +54,77 @@ public class UnplannedReceiptNote : SfsStoreAggregateRootBase<UnplannedReceiptNo
     /// </summary>
     [Display(Name = "OA单据号")]
     public string OANumber { get; set; }
+
+    /// <summary>
+    ///     原因代码
+    /// </summary>
+    [Display(Name = "原因代码")]
+    public string ReasonCode { get; set; }
+
+    /// <summary>
+    ///     专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    ///     项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    ///     次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
+    /// <summary>
+    ///     说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
+
+    /// <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>
+    ///     ERP储位
+    /// </summary>
+    [Display(Name = "ERP储位")]
+    public string FromErpLocationCode { get; set; }
+
+    /// <summary>
+    ///     数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+
+    /// <summary>
+    /// 是否有箱码
+    /// </summary>
+    [Display(Name = "是否有箱码")]
+    public int IsHasPackingCode { get; set; }
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/UnplannedIssueJobAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/UnplannedIssueJobAutoMapperProfile.cs
index 68557ee71..556c34dbc 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/UnplannedIssueJobAutoMapperProfile.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/UnplannedIssueJobAutoMapperProfile.cs
@@ -15,6 +15,11 @@ public partial class StoreEventAutoMapperProfile : Profile
             .ForMember(x => x.JobNumber, y => y.MapFrom(d => d.Number))
             .ForMember(x => x.Worker, y => y.MapFrom(d => d.CompleteUserName))
             .ForMember(x => x.ActiveDate, y => y.MapFrom(d => DateTime.Now))
+            .Ignore(x => x.ReasonCode)
+            .Ignore(x => x.CaseCode)
+            .Ignore(x => x.ProjCapacityCode)
+            .Ignore(x => x.OnceBusiCode)
+            .Ignore(x => x.Explain)
             .Ignore(x => x.Number)
             ;
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/UnplannedIssueRequestAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/UnplannedIssueRequestAutoMapperProfile.cs
index 73d43692d..7e0fbd2be 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/UnplannedIssueRequestAutoMapperProfile.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/UnplannedIssueRequestAutoMapperProfile.cs
@@ -84,7 +84,18 @@ public partial class StoreEventAutoMapperProfile : Profile
 
         CreateMap<UnplannedIssueRequest, UnplannedIssueNoteEditInput>()
             .ForMember(x => x.UnplannedIssueRequestNumber, y => y.MapFrom(d => d.Number)).Ignore(x => x.JobNumber)
-            .Ignore(x => x.ItemCode).Ignore(x=>x.ItemDesc1).Ignore(x=>x.ItemDesc2).Ignore(x=>x.Qty).Ignore(x=>x.FromErpLocationCode).Ignore(x=>x.ItemName);
+            .Ignore(x => x.ItemCode)
+            .Ignore(x=>x.ItemDesc1)
+            .Ignore(x=>x.ItemDesc2).Ignore(x=>x.Qty)
+            .Ignore(x=>x.FromErpLocationCode)
+            .Ignore(x=>x.ReasonCode)
+            .Ignore(x => x.CaseCode)
+            .Ignore(x => x.ProjCapacityCode)
+            .Ignore(x => x.OnceBusiCode)
+            .Ignore(x => x.Explain)
+            .Ignore(x => x.ItemName)
+            .Ignore(x => x.IsHasPackingCode)
+            ;
 
         CreateMap<UnplannedIssueRequestDetail, UnplannedIssueNoteDetailInput>()
             .Ignore(x => x.ReasonCode)
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/UnplannedReceiptRequestAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/UnplannedReceiptRequestAutoMapperProfile.cs
index 205a68d4a..405b16eba 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/UnplannedReceiptRequestAutoMapperProfile.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/UnplannedReceiptRequestAutoMapperProfile.cs
@@ -35,6 +35,19 @@ public partial class StoreEventAutoMapperProfile : Profile
 
         CreateMap<UnplannedReceiptRequest, UnplannedReceiptNoteEditInput>()
             .ForMember(x => x.UnplannedReceiptRequestNumber, y => y.MapFrom(d => d.Number)).Ignore(x => x.JobNumber)
+            .Ignore(x => x.ReasonCode)
+            .Ignore(x => x.CaseCode)
+            .Ignore(x => x.ProjCapacityCode)
+            .Ignore(x => x.OnceBusiCode)
+            .Ignore(x => x.Explain)
+            .Ignore(x => x.ItemName)
+            .Ignore(x => x.ItemCode)
+            .Ignore(x => x.ItemName)
+            .Ignore(x => x.ItemDesc1)
+            .Ignore(x => x.ItemDesc2)
+            .Ignore(x => x.FromErpLocationCode)
+            .Ignore(x => x.Qty)
+            .Ignore(x => x.IsHasPackingCode)
             ;
 
         CreateMap<UnplannedReceiptRequestDetail, UnplannedReceiptNoteDetailInput>()
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/UnplannedIssueJobEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/UnplannedIssueJobEventHandler.cs
index 18409e66d..6c5147718 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/UnplannedIssueJobEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/UnplannedIssueJobEventHandler.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.EventBus;
@@ -45,8 +46,11 @@ public class UnplannedIssueJobEventHandler :
             detail.SetHandledFromRecommend();
         }
 
-        var note = BuildUnplannedIssueNoteCreateInput(entity);
-        await _noteApp.CreateAsync(note).ConfigureAwait(false);
+        if (entity.Details.Any())
+        {
+            var note = BuildUnplannedIssueNoteCreateInput(entity);
+            await _noteApp.CreateAsync(note).ConfigureAwait(false);
+        }
 
         entity.JobStatus=EnumJobStatus.Done;
 
@@ -66,9 +70,11 @@ public class UnplannedIssueJobEventHandler :
     public virtual async Task HandleEventAsync(SfsCompletedEntityEventData<UnplannedIssueJob> eventData)
     {
         var entity = eventData.Entity;
-        var note = BuildUnplannedIssueNoteCreateInput(entity);
-        await _noteApp.CreateAsync(note).ConfigureAwait(false);
-
+        if (entity.Details.Any())
+        {
+            var note = BuildUnplannedIssueNoteCreateInput(entity);
+            await _noteApp.CreateAsync(note).ConfigureAwait(false);
+        }
     }
 
     /// <summary>