[fix]ApiFox调试通过:成品发货申请 api/wms/store/deliver-request/list

成品发货任务	api/wms/store/deliver-job/list
                成品发货记录	api/wms/store/deliver-note/list-for-normal
                FIS发货申请	api/wms/store/deliver-request-fis/list
                FIS发货记录	api/wms/store/deliver-note/list-for-fis
                客户退拆申请	api/wms/store/product-recycle-request/list
                客户退拆记录	api/wms/store/product-recycle-note/list
                生产退库申请	api/wms/store/production-return-request/list
                生产退货任务	api/wms/store/production-return-job/list
                生产退库记录	api/wms/store/production-return-note/list

be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/scripts/db.Microsoft.EntityFrameworkCore.SqlServer.StoreDbContext.sql

@@ -3069,6 +3069,7 @@ CREATE TABLE [Store_InspectNoteDetail] (
     [Weight] nvarchar(max) NULL,
     [OtherPropertyJson] nvarchar(max) NULL,
     [StdPackQty] decimal(18,6) NOT NULL,
+    [InspectDate] datetime2 NOT NULL,
     [CreationTime] datetime2 NOT NULL,
     [CreatorId] uniqueidentifier NULL,
     [LastModificationTime] datetime2 NULL,
@@ -5614,4 +5615,96 @@ CREATE UNIQUE INDEX [IX_Store_ScrapNote_Number] ON [Store_ScrapNote] ([Number])
 CREATE INDEX [IX_Store_ScrapNoteDetail_MasterID] ON [Store_ScrapNoteDetail] ([MasterID]) 
 
 
-CREATE UNIQUE INDEX [IX_Store_ScrapNoteDetail_Number_ItemCode_FromPackingCode_FromLocationCode_ToLocationCode_FromLot_FromStatus] ON [Store_ScrapNoteDetail] ([Number], [ItemCode], [FromPackingCode], [FromLocationCode], [ToLocationCode], [
+CREATE UNIQUE INDEX [IX_Store_ScrapNoteDetail_Number_ItemCode_FromPackingCode_FromLocationCode_ToLocationCode_FromLot_FromStatus] ON [Store_ScrapNoteDetail] ([Number], [ItemCode], [FromPackingCode], [FromLocationCode], [ToLocationCode], [FromLot], [FromStatus]) WHERE [FromPackingCode] IS NOT NULL AND [FromLot] IS NOT NULL 
+
+
+CREATE UNIQUE INDEX [IX_Store_ScrapRequest_Number] ON [Store_ScrapRequest] ([Number]) 
+
+
+CREATE INDEX [IX_Store_ScrapRequestDetail_MasterID] ON [Store_ScrapRequestDetail] ([MasterID]) 
+
+
+CREATE UNIQUE INDEX [IX_Store_ScrapRequestDetail_Number_ItemCode_LocationCode] ON [Store_ScrapRequestDetail] ([Number], [ItemCode], [LocationCode]) 
+
+
+CREATE UNIQUE INDEX [IX_Store_SupplierAsn_Number] ON [Store_SupplierAsn] ([Number]) 
+
+
+CREATE INDEX [IX_Store_SupplierAsn_SupplierCode] ON [Store_SupplierAsn] ([SupplierCode]) 
+
+
+CREATE INDEX [IX_Store_SupplierAsnDetail_MasterID] ON [Store_SupplierAsnDetail] ([MasterID]) 
+
+
+CREATE UNIQUE INDEX [IX_Store_SupplierAsnDetail_Number_ItemCode_PackingCode] ON [Store_SupplierAsnDetail] ([Number], [ItemCode], [PackingCode]) 
+
+
+CREATE UNIQUE INDEX [IX_Store_TransferNote_Number] ON [Store_TransferNote] ([Number]) 
+
+
+CREATE INDEX [IX_Store_TransferNoteDetail_MasterID] ON [Store_TransferNoteDetail] ([MasterID]) 
+
+
+CREATE UNIQUE INDEX [IX_Store_TransferNoteDetail_Number_FromPackingCode_FromLocationCode_ToLocationCode_FromStatus_ToStatus] ON [Store_TransferNoteDetail] ([Number], [FromPackingCode], [FromLocationCode], [ToLocationCode], [FromStatus], [ToStatus]) WHERE [FromPackingCode] IS NOT NULL 
+
+
+CREATE UNIQUE INDEX [IX_Store_TransferRequest_Number] ON [Store_TransferRequest] ([Number]) 
+
+
+CREATE INDEX [IX_Store_TransferRequestDetail_MasterID] ON [Store_TransferRequestDetail] ([MasterID]) 
+
+
+CREATE UNIQUE INDEX [IX_Store_UnplannedIssueNote_Number] ON [Store_UnplannedIssueNote] ([Number]) 
+
+
+CREATE INDEX [IX_Store_UnplannedIssueNoteDetail_MasterID] ON [Store_UnplannedIssueNoteDetail] ([MasterID]) 
+
+
+CREATE UNIQUE INDEX [IX_Store_UnplannedIssueNoteDetail_Number_PackingCode_ItemCode_Lot_Status] ON [Store_UnplannedIssueNoteDetail] ([Number], [PackingCode], [ItemCode], [Lot], [Status]) WHERE [Lot] IS NOT NULL 
+
+
+CREATE UNIQUE INDEX [IX_Store_UnplannedIssueRequest_Number] ON [Store_UnplannedIssueRequest] ([Number]) 
+
+
+CREATE INDEX [IX_Store_UnplannedIssueRequestDetail_MasterID] ON [Store_UnplannedIssueRequestDetail] ([MasterID]) 
+
+
+CREATE UNIQUE INDEX [IX_Store_UnplannedIssueRequestDetail_Number_PackingCode_ItemCode_Lot_Status] ON [Store_UnplannedIssueRequestDetail] ([Number], [PackingCode], [ItemCode], [Lot], [Status]) WHERE [Lot] IS NOT NULL 
+
+
+CREATE UNIQUE INDEX [IX_Store_UnplannedReceiptNote_Number] ON [Store_UnplannedReceiptNote] ([Number]) 
+
+
+CREATE INDEX [IX_Store_UnplannedReceiptNoteDetail_MasterID] ON [Store_UnplannedReceiptNoteDetail] ([MasterID]) 
+
+
+CREATE UNIQUE INDEX [IX_Store_UnplannedReceiptNoteDetail_Number_PackingCode_ItemCode_Lot_Status] ON [Store_UnplannedReceiptNoteDetail] ([Number], [PackingCode], [ItemCode], [Lot], [Status]) WHERE [Lot] IS NOT NULL 
+
+
+CREATE UNIQUE INDEX [IX_Store_UnplannedReceiptRequest_Number] ON [Store_UnplannedReceiptRequest] ([Number]) 
+
+
+CREATE INDEX [IX_Store_UnplannedReceiptRequestDetail_MasterID] ON [Store_UnplannedReceiptRequestDetail] ([MasterID]) 
+
+
+CREATE UNIQUE INDEX [IX_Store_UnplannedReceiptRequestDetail_Number_PackingCode_ItemCode_Lot_Status] ON [Store_UnplannedReceiptRequestDetail] ([Number], [PackingCode], [ItemCode], [Lot], [Status]) WHERE [Lot] IS NOT NULL 
+
+
+CREATE UNIQUE INDEX [IX_Store_WarehouseTransferNote_Number] ON [Store_WarehouseTransferNote] ([Number]) 
+
+
+CREATE INDEX [IX_Store_WarehouseTransferNoteDetail_MasterID] ON [Store_WarehouseTransferNoteDetail] ([MasterID]) 
+
+
+CREATE UNIQUE INDEX [IX_Store_WarehouseTransferNoteDetail_Number_FromPackingCode_FromLocationCode_ToLocationCode] ON [Store_WarehouseTransferNoteDetail] ([Number], [FromPackingCode], [FromLocationCode], [ToLocationCode]) WHERE [FromPackingCode] IS NOT NULL 
+
+
+CREATE UNIQUE INDEX [IX_Store_WorkOrder_Number] ON [Store_WorkOrder] ([Number]) 
+
+
+CREATE INDEX [IX_Store_WorkOrderDetail_MasterID] ON [Store_WorkOrderDetail] ([MasterID]) 
+
+
+CREATE UNIQUE INDEX [IX_Store_WorkOrderDetail_Number_ItemCode] ON [Store_WorkOrderDetail] ([Number], [ItemCode]) 
+
+

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/L7Controller.cs

@@ -54,7 +54,7 @@ public class L7Controller : AbpController
     [HttpPost("create-product-recycle-note-with-l7")]
     public virtual async Task<ProductRecycleNoteDTO> CreateProductRecycleNoteWithL7Async(ProductRecycleNoteEditInput input)
     {
-        return await _productRecycleNoteAppService.CreateWithL7Async(input).ConfigureAwait(false);
+        return await _productRecycleNoteAppService.CreateAsync(input).ConfigureAwait(false);
     }
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/DeliverNotes/IDeliverNoteAppService.cs

@@ -1,4 +1,9 @@
+using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.Application.Dtos;
+using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -9,4 +14,25 @@ public interface IDeliverNoteAppService :
 
     Task<DeliverNoteDTO> CreateWithL7Async(DeliverNoteEditInput input);
 
+    Task<PagedResultDto<DeliverNoteDTO>> GetForFisListAsync(
+        SfsStoreRequestInputBase sfsRequestDTO,
+        bool includeDetails = false,
+        CancellationToken cancellationToken = default);
+
+    Task<PagedResultDto<DeliverNoteDTO>> GetForNormalListAsync(
+        SfsStoreRequestInputBase sfsRequestDTO,
+        bool includeDetails = false,
+        CancellationToken cancellationToken = default);
+
+    Task<PagedResultDto<DeliverNoteDTO>> GetForRAWListAsync(
+        SfsStoreRequestInputBase sfsRequestDTO,
+        bool includeDetails = false,
+        CancellationToken cancellationToken = default);
+
+
+    Task<IActionResult> ExportForNormalAsync(SfsStoreRequestInputBase requestInput);
+
+    Task<IActionResult> ExportForRAWAsync(SfsExportRequestInput requestInput);
+
+    Task SumPrintAsync(string number);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductRecycleNotes/IProductRecycleNoteAppService.cs

@@ -7,5 +7,4 @@ public interface IProductRecycleNoteAppService :
 {
     Task<ProductRecycleNoteDTO> CreateAsync(ProductRecycleNoteEditInput input);
 
-    Task<ProductRecycleNoteDTO> CreateWithL7Async(ProductRecycleNoteEditInput input);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/ProductRecycleNotes/ProductRecycleNoteAppService.cs

@@ -54,23 +54,6 @@ public class ProductRecycleNoteAppService :
         return dto;
     }
 
-    /// <summary>
-    /// 新增退货接口
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [HttpPost("create-with-l7")]
-    public virtual async Task<ProductRecycleNoteDTO> CreateWithL7Async(ProductRecycleNoteEditInput input)
-    {
-        var entity = ObjectMapper.Map<ProductRecycleNoteEditInput, ProductRecycleNote>(input);
-
-        await _productRecycleNoteManager.CreateAsync(entity).ConfigureAwait(false);
-
-        var dto = ObjectMapper.Map<ProductRecycleNote, ProductRecycleNoteDTO>(entity);
-
-        return dto;
-    }
-
     [HttpGet("note-and-back-flush/{id}")]
     public virtual async Task<ProductRecycleNoteDTO> GetNoteAndBackFlushAsync(Guid id)
     {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/ProductionReturnNotes/ProductionReturnNoteAppService.cs

@@ -28,7 +28,7 @@ public class ProductionReturnNoteAppService :
     }
 
     /// <summary>
-    /// 新增接口
+    /// 新增实体
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductionReturnRequests/ProductionReturnRequestAutoMapperProfile.cs

@@ -20,7 +20,6 @@ public partial class StoreApplicationAutoMapperProfile : Profile
 
         CreateMap<ProductionReturnRequestDetailInput, ProductionReturnRequestDetail>()
             .IgnoreAuditedObjectProperties()
-            .Ignore(x => x.ToWarehouseCode)
             .Ignore(x => x.MasterID)
             .Ignore(x => x.TenantId)
             .Ignore(x => x.Number)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/ProductionReturnJobAutoMapperProfile.cs

@@ -52,9 +52,6 @@ public partial class StoreEventAutoMapperProfile : Profile
 
         CreateMap<ProductionReturnJobDetail, ExpectOutEditInput>()
             .MapExpectInOutTo()
-            .Ignore(x => x.LocationArea)
-            .Ignore(x => x.LocationGroup)
-            .Ignore(x => x.WarehouseCode)
             .Ignore(x => x.SerialNumber)
             .Ignore(x => x.Worker)
             .Ignore(x => x.ExtraProperties)
@@ -63,10 +60,10 @@ public partial class StoreEventAutoMapperProfile : Profile
         CreateMap<ProductionReturnJobDetail, ExpectInEditInput>()
             .MapExpectInOutTo()
             .ForMember(x => x.LocationCode, y => y.MapFrom(d => d.FromLocationCode))
+            .ForMember(x => x.LocationArea, y => y.MapFrom(d => d.FromLocationArea))
+            .ForMember(x => x.LocationGroup, y => y.MapFrom(d => d.FromLocationGroup))
             .ForMember(x => x.LocationErpCode, y => y.MapFrom(d => d.FromLocationErpCode))
             .ForMember(x => x.WarehouseCode, y => y.MapFrom(d => d.FromWarehouseCode))
-            .Ignore(x => x.LocationArea)
-            .Ignore(x => x.LocationGroup)
             .Ignore(x => x.SerialNumber)
             .Ignore(x => x.Worker)
             .Ignore(x => x.ExtraProperties);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/ExpectInOuts/ProductionReturnStoreEventHandler.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/ExpectInOuts/ProductionReturnJobEventHandler.cs

@@ -9,7 +9,7 @@ using Win_in.Sfs.Wms.Store.Event.Inventories;
 
 namespace Win_in.Sfs.Wms.Store.Event.ExpectInOuts;
 
-public class ProductionReturnStoreEventHandler :
+public class ProductionReturnJobEventHandler :
     StoreExpectInOutEventHandlerBase
 , ILocalEventHandler<SfsCreatedEntityEventData<ProductionReturnJob>>
 , ILocalEventHandler<SfsCompletedEntityEventData<ProductionReturnJob>>