提交

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs

@@ -942,7 +942,7 @@ public class AssembleIssueJobAppService
             if (!string.IsNullOrEmpty(detail.TransferLibFromLocationCode))
             {
                 //库移的最终目标 挪到 推荐的目标
-                var fromloc = await _locationAppService.GetByCodeAsync(detail.TransferLibFromLocationCode).ConfigureAwait(false);
+                var fromloc = await _locationAppService.GetByCodeAsync(detail.TransferLibToLocationCode).ConfigureAwait(false);
                 var toloc =await _locationAppService.GetByCodeAsync(detail.RecommendToLocationCode).ConfigureAwait(false);
 
                 detailDto.InjectFrom(detail);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs

@@ -957,7 +957,7 @@ public class CoatingIssueJobAppService
                 if (!string.IsNullOrEmpty(detail.TransferLibFromLocationCode))
                 {
                     //库移的最终目标 挪到 推荐的目标
-                    var fromloc = await _locationAppService.GetByCodeAsync(detail.TransferLibFromLocationCode).ConfigureAwait(false);
+                    var fromloc = await _locationAppService.GetByCodeAsync(detail.TransferLibToLocationCode).ConfigureAwait(false);
                     var toloc = await _locationAppService.GetByCodeAsync(detail.RecommendToLocationCode).ConfigureAwait(false);
 
                     detailDto.InjectFrom(detail);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs

@@ -914,7 +914,7 @@ public class InjectionIssueJobAppService
             if (!string.IsNullOrEmpty(detail.TransferLibFromLocationCode))
             {
                 //库移的最终目标 挪到 推荐的目标
-                var fromloc = await _locationAppService.GetByCodeAsync(detail.TransferLibFromLocationCode).ConfigureAwait(false);
+                var fromloc = await _locationAppService.GetByCodeAsync(detail.TransferLibToLocationCode).ConfigureAwait(false);
                 var toloc = await _locationAppService.GetByCodeAsync(detail.RecommendToLocationCode).ConfigureAwait(false);
 
                 detailDto.InjectFrom(detail);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs

@@ -918,7 +918,7 @@ public class KittingIssueJobAppService
                 if (!string.IsNullOrEmpty(detail.TransferLibFromLocationCode))
                 {
                     //库移的最终目标 挪到 推荐的目标
-                    var fromloc = await _locationAppService.GetByCodeAsync(detail.TransferLibFromLocationCode).ConfigureAwait(false);
+                    var fromloc = await _locationAppService.GetByCodeAsync(detail.TransferLibToLocationCode).ConfigureAwait(false);
                     var toloc = await _locationAppService.GetByCodeAsync(detail.RecommendToLocationCode).ConfigureAwait(false);
 
                     detailDto.InjectFrom(detail);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs

@@ -914,7 +914,7 @@ public class SparePartIssueJobAppService
             if (!string.IsNullOrEmpty(detail.TransferLibFromLocationCode))
             {
                 //库移的最终目标 挪到 推荐的目标
-                var fromloc = await _locationAppService.GetByCodeAsync(detail.TransferLibFromLocationCode).ConfigureAwait(false);
+                var fromloc = await _locationAppService.GetByCodeAsync(detail.TransferLibToLocationCode).ConfigureAwait(false);
                 var toloc = await _locationAppService.GetByCodeAsync(detail.RecommendToLocationCode).ConfigureAwait(false);
 
                 detailDto.InjectFrom(detail);

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

@@ -1,7 +1,11 @@
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
+using IdentityServer4.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.ObjectMapping;
+using Win_in.Sfs.Wms.Inventory.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 using Win_in.Sfs.Wms.Store.Domain.Shared;
@@ -27,11 +31,49 @@ public class IntegrationPackingNoteAppService :
     IIntegrationPackingNoteAppService
 {
     private readonly IIntegrationPackingNoteManager _integrationPackingNoteManager;
+    private readonly IBalanceAppService _balanceAppService;
 
     public IntegrationPackingNoteAppService(
         IIntegrationPackingNoteRepository repository,
-        IIntegrationPackingNoteManager integrationPackingNoteManager) : base(repository)
+        IIntegrationPackingNoteManager integrationPackingNoteManager, IBalanceAppService balanceAppService) : base(repository)
     {
         _integrationPackingNoteManager = integrationPackingNoteManager;
+        _balanceAppService = balanceAppService;
+    }
+
+    [HttpPost("")]
+    public override Task<IntegrationPackingNoteDTO> CreateAsync(IntegrationPackingNoteEditInput input)
+    {
+        //标签记录
+
+        //库存移动
+
+        //创建标签
+        return base.CreateAsync(input);
+    }
+
+    /// <summary>
+    /// 构造 库存转移日志实体
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <returns></returns>
+    private List<TransferLogEditInput> BuildTransferLogs(IntegrationPackingNoteDTO dto)
+    {
+        var transferLogCreateInputs = new List<TransferLogEditInput>();
+
+        //foreach (var detail in dto.Details.Where(detail => detail.Qty != 0))
+        //{
+        //    var transferLog = ObjectMapper.Map<DeliverNoteDetail, TransferLogEditInput>(detail);
+
+        //    transferLog.TransType = TransType;
+        //    transferLog.TransSubType = ConvertToTransSubType(deliverNote.DeliverRequestType);
+        //    transferLog.Worker = deliverNote.Worker;
+        //    transferLog.DocNumber = deliverNote.Number;
+        //    transferLog.JobNumber = deliverNote.JobNumber;
+
+        //    transferLogCreateInputs.Add(transferLog);
+        //}
+
+        return transferLogCreateInputs;
     }
 }

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

@@ -1,19 +1,19 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Http.Headers;
 using System.Net.Http;
-using System.Text;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Omu.ValueInjecter;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Volo.Abp;
 using Volo.Abp.Application.Dtos;
-using Win_in.Sfs.Basedata.Application;
+using Volo.Abp.Uow;
+using Win_in.Sfs.Basedata;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Basedata.Domain.Shared;
 using Win_in.Sfs.Basedata.SplitPackings.Commons;
@@ -21,17 +21,10 @@ using Win_in.Sfs.Label.Application.Contracts;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Wms.Inventory.Application.Contracts;
-
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 using Win_in.Sfs.Wms.Store.Domain.Shared;
-using Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy;
 using Win_in.Sfs.Wms.Store.Options;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Volo.Abp.ObjectMapping;
-using NUglify.Helpers;
-using Volo.Abp.Uow;
 
 namespace Win_in.Sfs.Wms.Store.Application;
 
@@ -63,6 +56,7 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
     private readonly ILogger<TransferNoteAppService> _logger;
 
     private readonly IPostionLocationAppService _postionLocationAppService;
+    private readonly IProductionLineAppService _productionLineAppService;
 
     private readonly IProductionLineAppService _productionLineAppService;
 
@@ -122,34 +116,36 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
         {
             if (transferNote.Type == EnumTransSubType.Transfer_Inside.GetDisplayName()) //储位内调拨
             {
-                transferNote.Type = EnumTransSubType.Transfer_Inside.ToString();//重点 需要转换
+                transferNote.Type = EnumTransSubType.Transfer_Inside.ToString(); //重点 需要转换
                 foreach (var detail in transferNote.Details)
                 {
                     var balanceDto = await _balanceAppService.GetByItemLocationAndPackingAsync(detail.FromPackingCode,
                         detail.ItemCode, detail.FromLocationCode).ConfigureAwait(false);
-                    var toLocationDto = await _locationAppService.GetByCodeAsync(detail.ToLocationCode).ConfigureAwait(false);
+                    var toLocationDto = await _locationAppService.GetByCodeAsync(detail.ToLocationCode)
-                    var fromLocationDto = await _locationAppService.GetByCodeAsync(detail.FromLocationCode).ConfigureAwait(false);
+                        .ConfigureAwait(false);
+                    var fromLocationDto = await _locationAppService.GetByCodeAsync(detail.FromLocationCode)
+                        .ConfigureAwait(false);
 
                     CheckLocation(toLocationDto, detail);
                     CheckFromLocation(fromLocationDto, detail);
                     await CheckPackingCodeAsync(detail.FromPackingCode).ConfigureAwait(false);
                     if (toLocationDto.Type != fromLocationDto.Type)
                     {
-                        throw new UserFriendlyException($"来源库位与目标库位类型不一致");
+                        throw new UserFriendlyException("来源库位与目标库位类型不一致");
                     }
 
                     detail.OnTheWayLocationCode = bool.FalseString;
-                    detail.ItemCode=balanceDto.ItemCode;
+                    detail.ItemCode = balanceDto.ItemCode;
-                    detail.ArriveDate=balanceDto.ArriveDate;
+                    detail.ArriveDate = balanceDto.ArriveDate;
-                    detail.ItemDesc1=balanceDto.ItemDesc1;
+                    detail.ItemDesc1 = balanceDto.ItemDesc1;
-                    detail.ItemDesc2=balanceDto.ItemDesc2;
+                    detail.ItemDesc2 = balanceDto.ItemDesc2;
-                    detail.ItemName=balanceDto.ItemName;
+                    detail.ItemName = balanceDto.ItemName;
-                    detail.ProduceDate=balanceDto.ProduceDate;
+                    detail.ProduceDate = balanceDto.ProduceDate;
-                    detail.Qty=balanceDto.Qty;
+                    detail.Qty = balanceDto.Qty;
-                    detail.Uom=balanceDto.Uom;
+                    detail.Uom = balanceDto.Uom;
-                    detail.ExpireDate=balanceDto.ExpireDate;
+                    detail.ExpireDate = balanceDto.ExpireDate;
-                    detail.StdPackQty=balanceDto.StdPackQty;
+                    detail.StdPackQty = balanceDto.StdPackQty;
-                    detail.SupplierBatch=balanceDto.SupplierBatch;
+                    detail.SupplierBatch = balanceDto.SupplierBatch;
 
                     detail.FromLocationArea = balanceDto.LocationArea;
                     detail.FromContainerCode = balanceDto.ContainerCode;
@@ -300,30 +296,34 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
         return await GetSubTypeListAsync(sfsRequestDTO, EnumTransSubType.Transfer_Inside, includeDetails,
             cancellationToken).ConfigureAwait(false);
     }
+
     [HttpPost("get-Injection-list")]
     public virtual async Task<PagedResultDto<TransferNoteDTO>> GetInjectionTransferListAsync(
-    SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false,
+        SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false,
-    CancellationToken cancellationToken = default)
+        CancellationToken cancellationToken = default)
     {
         return await GetSubTypeListAsync(sfsRequestDTO, EnumTransSubType.Transfer_Injection, includeDetails,
             cancellationToken).ConfigureAwait(false);
     }
+
     [HttpPost("get-coating-list")]
     public virtual async Task<PagedResultDto<TransferNoteDTO>> GetCoatingTransferListAsync(
-    SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false,
+        SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false,
-    CancellationToken cancellationToken = default)
+        CancellationToken cancellationToken = default)
     {
         return await GetSubTypeListAsync(sfsRequestDTO, EnumTransSubType.Transfer_Coating, includeDetails,
             cancellationToken).ConfigureAwait(false);
     }
+
     [HttpPost("get-assemble-list")]
     public virtual async Task<PagedResultDto<TransferNoteDTO>> GetAssembleTransferListAsync(
-    SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false,
+        SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false,
-    CancellationToken cancellationToken = default)
+        CancellationToken cancellationToken = default)
     {
         return await GetSubTypeListAsync(sfsRequestDTO, EnumTransSubType.Transfer_Assemble, includeDetails,
             cancellationToken).ConfigureAwait(false);
     }
+
     /// <summary>
     ///     按条件获取客户储位间调拨的分页列表
     ///     request sample
@@ -376,10 +376,7 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
     {
         sfsRequestDTO.Condition.Filters.Add(new Filter
         {
-            Action = "==",
+            Action = "==", Column = "Type", Logic = EnumFilterLogic.And.ToString(), Value = type.ToString()
-            Column = "Type",
-            Logic = EnumFilterLogic.And.ToString(),
-            Value = type.ToString()
         });
 
         var expression = sfsRequestDTO.Condition.Filters?.Count > 0
@@ -399,7 +396,7 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
     /// <returns></returns>
     [HttpPost("")]
     public override async Task<TransferNoteDTO> CreateAsync(TransferNoteEditInput input)
-   {
+    {
         var entity = ObjectMapper.Map<TransferNoteEditInput, TransferNote>(input);
 
         foreach (var detail in entity.Details)
@@ -409,7 +406,8 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
                 await CheckPackingCodeAsync(detail.FromPackingCode).ConfigureAwait(false);
             }
         }
-        entity =await _transferNoteManager.CreateAsync(entity).ConfigureAwait(false);
+
+        entity = await _transferNoteManager.CreateAsync(entity).ConfigureAwait(false);
 
         var dto = ObjectMapper.Map<TransferNote, TransferNoteDTO>(entity);
 
@@ -437,6 +435,7 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
                     await CheckPackingCodeAsync(detail.FromPackingCode).ConfigureAwait(false);
                 }
             }
+
             resultEntity.Add(await _transferNoteManager.CreateAsync(entity).ConfigureAwait(false));
             _ = ObjectMapper.Map<TransferNote, TransferNoteDTO>(entity);
         }
@@ -445,7 +444,7 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
     }
 
     /// <summary>
-    /// 校验箱码
+    ///     校验箱码
     /// </summary>
     /// <param name="packingCode"></param>
     /// <returns></returns>
@@ -463,8 +462,6 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
     }
 
 
-
-
     /// <summary>
     ///     确认对应的记录单
     /// </summary>
@@ -493,22 +490,25 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
 
 
     /// <summary>
-    /// 插入拆箱记录表
+    ///     插入拆箱记录表
     /// </summary>
     /// <param name="transferNoteEditInput"></param>
     /// <returns></returns>
-    private async Task<bool> WriteSplitPackingRec(TransferNoteEditInput transferNoteEditInput, SplitPacking_UpdateJobDetailInput updateJobDetailInput = null)
+    private async Task<bool> WriteSplitPackingRec(TransferNoteEditInput transferNoteEditInput,
+        SplitPacking_UpdateJobDetailInput updateJobDetailInput = null)
     {
-
+        var recLst = new List<SplitPackingRecEditInput>();
-        List<SplitPackingRecEditInput> recLst = new List<SplitPackingRecEditInput>();
         foreach (var inputDetail in transferNoteEditInput.Details)
         {
-            bool qtyEnough = await _splitPackingRecAppService.CheckSplitNum(inputDetail.FromPackingCode, inputDetail.Qty).ConfigureAwait(false);
+            var qtyEnough = await _splitPackingRecAppService.CheckSplitNum(inputDetail.FromPackingCode, inputDetail.Qty)
+                .ConfigureAwait(false);
             if (qtyEnough == false)
             {
-                throw new UserFriendlyException($"[WriteSplitPackingRec]拆箱记录表数量不足：FromPackingCode={inputDetail.FromPackingCode},Qty={inputDetail.Qty}");
+                throw new UserFriendlyException(
+                    $"[WriteSplitPackingRec]拆箱记录表数量不足：FromPackingCode={inputDetail.FromPackingCode},Qty={inputDetail.Qty}");
             }
-            SplitPackingRecEditInput packRec = new SplitPackingRecEditInput();
+
+            var packRec = new SplitPackingRecEditInput();
 
             packRec.OprType = OprTypeEnum.SplitBox;
             packRec.FromPackingCode = inputDetail.FromPackingCode;
@@ -539,8 +539,10 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
                 packRec.FromQty = updateJobDetailInput.FromQty;
                 packRec.ToQty = updateJobDetailInput.ToQty;
             }
+
             //根据箱码在inventoryLabel取采购订单、供应商发货单
-            var inventoryLabelDto = await _inventoryLabelAppService.GetByCodeAsync(inputDetail.FromPackingCode).ConfigureAwait(false);
+            var inventoryLabelDto = await _inventoryLabelAppService.GetByCodeAsync(inputDetail.FromPackingCode)
+                .ConfigureAwait(false);
             if (inventoryLabelDto != null)
             {
                 packRec.PurchaseInfo_PoNumber = inventoryLabelDto.PoNumber;
@@ -548,13 +550,14 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
                 //packRec.PurchaseInfo_SupplierCode = inventoryLabelDto.SupplierCode;
 
                 #region InventoryLabel兼容成员
+
                 var inputObj = inventoryLabelDto;
                 packRec.FullBarcodeString = inputObj.FullBarcodeString;
                 packRec.SupplierBatch = inputObj.SupplierBatch;
                 packRec.ArriveDate = inputObj.ArriveDate;
                 packRec.ProduceDate = inputObj.ProduceDate;
                 packRec.ExpireDate = inputObj.ExpireDate;
-                packRec.LabelStatus = (Win_in.Sfs.Basedata.LabelStatus)((int)inputObj.LabelStatus);
+                packRec.LabelStatus = (LabelStatus)(int)inputObj.LabelStatus;
                 packRec.RecommendLocationCode = inputObj.RecommendLocationCode;
                 packRec.LocationErpCode = inputObj.LocationErpCode;
                 //packRec.ContainerCode = inputObj.ContainerCode;
@@ -573,37 +576,46 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
                 packRec.SupplierItemCode = inputObj.SupplierItemCode;
                 packRec.SupplierItemName = inputObj.SupplierItemName;
                 packRec.PlanArriveDate = inputObj.PlanArriveDate;
+
                 #endregion
             }
+
             recLst.Add(packRec);
         }
+
         var ret = await _splitPackingRecAppService.BatchInsertAsync(recLst).ConfigureAwait(false);
         return ret;
     }
 
     /// <summary>
-    /// 采购收货拆箱，同时更新、插入PurchaseReceipt任务表、申请表
+    ///     采购收货拆箱，同时更新、插入PurchaseReceipt任务表、申请表
     /// </summary>
     /// <param name="transferNoteEditInput"></param>
     /// <param name="updateJobDetailInput"></param>
     /// <returns></returns>
     [HttpPost("split-packing-purchase-receipt")]
-    public async Task<bool> SplitPacking_PurchaseReceiptAsync(TransferNoteEditInput transferNoteEditInput, [FromQuery] SplitPacking_UpdateJobDetailInput updateJobDetailInput)
+    public async Task<bool> SplitPacking_PurchaseReceiptAsync(TransferNoteEditInput transferNoteEditInput,
+        [FromQuery] SplitPacking_UpdateJobDetailInput updateJobDetailInput)
     {
-        var jobRet = await _purchaseReceiptJobAppService.SaveDetail_SplitPackingAsync(updateJobDetailInput).ConfigureAwait(false);
+        var jobRet = await _purchaseReceiptJobAppService.SaveDetail_SplitPackingAsync(updateJobDetailInput)
-        var requestRet = await _purchaseReceiptRequestAppService.SaveDetail_SplitPackingAsync(updateJobDetailInput, jobRet.PurchaseReceiptRequestNumber).ConfigureAwait(false);
+            .ConfigureAwait(false);
-        bool ret = await WriteSplitPackingRec(transferNoteEditInput, updateJobDetailInput).ConfigureAwait(false); //采购收货-目检-拆箱时，还没有入库，不涉及库存操作
+        var requestRet = await _purchaseReceiptRequestAppService
+            .SaveDetail_SplitPackingAsync(updateJobDetailInput, jobRet.PurchaseReceiptRequestNumber)
+            .ConfigureAwait(false);
+        var ret = await WriteSplitPackingRec(transferNoteEditInput, updateJobDetailInput)
+            .ConfigureAwait(false); //采购收货-目检-拆箱时，还没有入库，不涉及库存操作
         return ret;
     }
 
     /// <summary>
-    /// 质检拆箱，同时更新、插入Inspect任务表(不更新申请表）
+    ///     质检拆箱，同时更新、插入Inspect任务表(不更新申请表）
     /// </summary>
     /// <param name="transferNoteEditInput"></param>
     /// <param name="updateJobDetailInput"></param>
     /// <returns></returns>
     [HttpPost("split-packing-inspect")]
-    public async Task<TransferNoteDTO> SplitPacking_InspectAsync(TransferNoteEditInput transferNoteEditInput, [FromQuery] SplitPacking_UpdateJobDetailInput updateJobDetailInput)
+    public async Task<TransferNoteDTO> SplitPacking_InspectAsync(TransferNoteEditInput transferNoteEditInput,
+        [FromQuery] SplitPacking_UpdateJobDetailInput updateJobDetailInput)
     {
         //SplitPacking_UpdateDetailInput newInput = new SplitPacking_UpdateDetailInput();
         //newInput.Number = updateJobDetailInput.Number;
@@ -614,21 +626,23 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
         //newInput.FromLocationCode = transferNoteEditInput.Details[0].FromLocationCode;
         //newInput.ToLocationCode = transferNoteEditInput.Details[0].ToLocationCode;
         //var expectOutRet = await _expectOutAppService.SaveDetail_SplitPackingAsync(newInput).ConfigureAwait(false);
-        var jobRet = await _inspectJobAppService.SaveDetail_SplitPackingAsync(updateJobDetailInput).ConfigureAwait(false);
+        var jobRet = await _inspectJobAppService.SaveDetail_SplitPackingAsync(updateJobDetailInput)
+            .ConfigureAwait(false);
         var ret = await SplitPackingAsync(transferNoteEditInput).ConfigureAwait(false); //库存操作
         return ret;
     }
 
     /// <summary>
-    /// 发料拆箱，同时更新、插入Inspect任务表(没有找到申请表//??）
+    ///     发料拆箱，同时更新、插入Inspect任务表(没有找到申请表//??）
     /// </summary>
     /// <param name="transferNoteEditInput"></param>
     /// <param name="updateJobDetailInput"></param>
     /// <returns></returns>
     [HttpPost("split-packing-issue")]
-    public async Task<TransferNoteDTO> SplitPacking_IssueAsync(TransferNoteEditInput transferNoteEditInput, [FromQuery] SplitPacking_UpdateJobDetailInput updateJobDetailInput)
+    public async Task<TransferNoteDTO> SplitPacking_IssueAsync(TransferNoteEditInput transferNoteEditInput,
+        [FromQuery] SplitPacking_UpdateJobDetailInput updateJobDetailInput)
     {
-        SplitPacking_UpdateDetailInput newInput = new SplitPacking_UpdateDetailInput();
+        var newInput = new SplitPacking_UpdateDetailInput();
         newInput.Number = updateJobDetailInput.Number;
         newInput.FromPackingCode = updateJobDetailInput.FromPackingCode;
         newInput.FromQty = updateJobDetailInput.FromQty;
@@ -643,16 +657,17 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
     }
 
     /// <summary>
-    /// 拆箱，预计出表存在数据时不允许办理
+    ///     拆箱，预计出表存在数据时不允许办理
     /// </summary>
     /// <param name="transferNoteEditInput"></param>
     /// <param name="updateJobDetailInputBase"></param>
     /// <returns></returns>
     [HttpPost("split-packing-check-expect-out")]
-    public async Task<TransferNoteDTO> SplitPackingCheckExpectOutAsync(TransferNoteEditInput transferNoteEditInput, [FromQuery] SplitPacking_UpdateJobDetailInputBase updateJobDetailInputBase)
+    public async Task<TransferNoteDTO> SplitPackingCheckExpectOutAsync(TransferNoteEditInput transferNoteEditInput,
+        [FromQuery] SplitPacking_UpdateJobDetailInputBase updateJobDetailInputBase)
     {
         var detailObj = transferNoteEditInput.Details[0];
-        SplitPacking_UpdateDetailInput newInput = new SplitPacking_UpdateDetailInput();
+        var newInput = new SplitPacking_UpdateDetailInput();
         newInput.Number = updateJobDetailInputBase.Number;
         newInput.FromPackingCode = detailObj.FromPackingCode;
         newInput.FromQty = detailObj.Qty;
@@ -663,21 +678,14 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
         var expectOutLst = await _expectOutAppService.GetListByJobNumberAsync(newInput).ConfigureAwait(false);
         if (expectOutLst.Count > 0)
         {
-            throw new UserFriendlyException($"预计出表存在数据，不允许办理拆箱：JobNumber={newInput.Number}|PackingCode={newInput.FromPackingCode}|Qty={newInput.FromQty}|LocationCode={newInput.FromLocationCode}");
+            throw new UserFriendlyException(
+                $"预计出表存在数据，不允许办理拆箱：JobNumber={newInput.Number}|PackingCode={newInput.FromPackingCode}|Qty={newInput.FromQty}|LocationCode={newInput.FromLocationCode}");
         }
+
         var ret = await SplitPackingAsync(transferNoteEditInput).ConfigureAwait(false);
         return ret;
-
     }
 
-    
-
-
-    
-
-
-
-
 
     [HttpPost("call-back-agv")]
     public async Task<AgvResultObject> CallBackAgvAsync(AgvRequestDto request)
@@ -685,15 +693,8 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
         var json = JsonSerializer.Serialize(request);
         var flag = DateTime.Now.ToString("yyyyMMddHHmmss");
         _logger.LogInformation($"{flag}接收到AGV确认单据内容:" + json);
-#if DEBUG
-#endif
         var errors = new List<string>();
-        var ret = new AgvResultObject
+        var ret = new AgvResultObject { Code = "0", Message = "OK", ReqCode = "" };
-        {
-            Code = "0",
-            Message = "OK",
-            ReqCode = "",
-        };
         using var unitOfWork = _unitOfWorkManager.Begin();
         try
         {
@@ -703,18 +704,18 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
 
                 foreach (var detail in notes)
                 {
-                    TransferNoteEditInput transfer = new TransferNoteEditInput();
+                    var transfer = new TransferNoteEditInput();
                     transfer.CallJobNumber = detail.OrderNum;
-                  
+
                     transfer.Worker = "Agv";
                     transfer.UseOnTheWayLocation = false;
-                    List<TransferNoteDetailInput> transferNoteDetailInputs = new List<TransferNoteDetailInput>();
+                    var transferNoteDetailInputs = new List<TransferNoteDetailInput>();
-                    TransferNoteDetailInput detailInput = new TransferNoteDetailInput();
+                    var detailInput = new TransferNoteDetailInput();
-             
 
 
-                    LocationDTO fromlocation = await _locationAppService.GetByCodeAsync(detail.BeginPosition).ConfigureAwait(false);
+                    var fromlocation =
-                    
+                        await _locationAppService.GetByCodeAsync(detail.BeginPosition).ConfigureAwait(false);
+
                     if (fromlocation == null)
                     {
                         errors.Add($"来源起始点{detail.BeginPosition}库位没查到");
@@ -764,17 +765,17 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
                         detailInput.ItemCode = item.Code;
                         detailInput.Uom = item.BasicUom;
                         detailInput.ItemName = item.Name;
-                        detailInput.ItemDesc1 = !string.IsNullOrEmpty(item.Desc1) ? item.Desc1:string.Empty;
+                        detailInput.ItemDesc1 = !string.IsNullOrEmpty(item.Desc1) ? item.Desc1 : string.Empty;
                     }
+
                     if (errors.Count > 0)
                     {
-                        return ret = new AgvResultObject()
+                        return ret = new AgvResultObject
                         {
-                            Code = "-1",
+                            Code = "-1", ReqCode = "", Message = string.Join(",", errors.ToArray())
-                            ReqCode = "",
-                            Message = string.Join(",", errors.ToArray())
                         };
                     }
+
                     detailInput.ToLocationCode = tolocation.Code;
                     detailInput.ToLocationGroup = tolocation.LocationGroupCode;
                     detailInput.ToLocationArea = tolocation.AreaCode;
@@ -783,7 +784,6 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
                     detailInput.FromStatus = tolocation.DefaultInventoryStatus;
 
 
-
                     detailInput.Qty = detail.MatQty;
                     detailInput.ToLot = !string.IsNullOrEmpty(detail.BatchAttr07) ? detail.BatchAttr07 : string.Empty;
                     detailInput.ToPackingCode = string.Empty;
@@ -796,7 +796,7 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
                     detailInput.Qty = detail.MatQty;
                     detailInput.FromLot = !string.IsNullOrEmpty(detail.BatchAttr07) ? detail.BatchAttr07 : string.Empty;
                     detailInput.FromPackingCode = string.Empty;
-                   
+
                     transfer.Details.Add(detailInput);
 
 
@@ -810,34 +810,16 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
         }
         catch (Exception ex)
         {
-            ret = new AgvResultObject
+            ret = new AgvResultObject { Code = "-1", ReqCode = "", Message = ex.Message };
-            {
-                Code = "-1",
-                ReqCode = "",
-                Message = ex.Message
-            };
             await unitOfWork.RollbackAsync().ConfigureAwait(false);
-            
         }
 
         if (errors.Count > 0)
         {
-            ret = new AgvResultObject
+            ret = new AgvResultObject { Code = "-1", Message = string.Join(",", errors.ToArray()), ReqCode = "" };
-            {
-                Code = "-1",
-                Message = string.Join(",", errors.ToArray()),
-                ReqCode = ""
-            };
             await unitOfWork.RollbackAsync().ConfigureAwait(false);
         }
+
         return ret;
     }
-   
-
-
-
-
-
-
-
 }