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

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ShipReader.cs

@@ -159,7 +159,7 @@ public class ShipReader : IReader
         var supplierAsn = new SupplierAsnExchangeDto()
         {
             Number = ship.ShipBillNo,
-            PoNumber = ship.ShipBillNo,
+            PoNumber = ship.PlanBillNo,
             SupplierCode = ship.SupplierCode,
             ContactName = ship.PlanUserCode,
             ShipDate = ship.ShipDate,
@@ -175,7 +175,7 @@ public class ShipReader : IReader
         var supplierAsnDetail = new SupplierAsnDetailExchangeDto()
         {
             Number = ship.ShipBillNo,
-            PoNumber = ship.ShipBillNo,
+            PoNumber = ship.PlanBillNo,
             LocationErpCode = ship.Loc,
             PackingCode = ship.DetailMatNo,
             Uom = ship.Unit ?? "",

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/AssembleIssueNoteConverter.cs

@@ -1,142 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using System.Threading.Tasks;
-using Volo.Abp.ObjectMapping;
-using Win_in.Sfs.Wms.DataExchange.Domain;
-using Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp;
-using Win_in.Sfs.Wms.DataExchange.Domain.Shared;
-using Win_in.Sfs.Wms.DataExchange.WMS.PCK;
-using Win_in.Sfs.Wms.Store.Application.Contracts;
-
-namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent.Outgoing;
-
-public class AssembleIssueNoteConverter : IOutgoingConverter
-{
-    private readonly string billtype = "4026";
-    private readonly IOutgoingFromWmsManager _outgoingFromWmsManager;
-    private readonly IOutgoingToExternalManager _outgoingToExternalManager;
-    private readonly IObjectMapper _objectMapper;
-
-    public AssembleIssueNoteConverter(
-        IOutgoingFromWmsManager outgoingFromWmsManager
-        , IOutgoingToExternalManager outgoingToExternalManager
-        , IObjectMapper objectMapper
-    )
-    {
-        _outgoingFromWmsManager = outgoingFromWmsManager;
-        _outgoingToExternalManager = outgoingToExternalManager;
-        _objectMapper = objectMapper;
-    }
-
-    public virtual async Task<List<OutgoingToExternal>> ConvertAsync()
-    {
-        var outgoingToExternalList = new List<OutgoingToExternal>();
-        //获取要同步得数据
-        var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.AssembleIssue, EnumSystemType.ERP).ConfigureAwait(false);
-        foreach (var outgoingFromWms in outgoingFromWmsList)
-        {
-            string tyrpNumber = outgoingFromWms.TyrpNumber;
-            #region 主表
-            var wmsReceipt = JsonSerializer.Deserialize<AssembleIssueNoteDTO>(outgoingFromWms.DataContent);
-            var exchangeReceipt = _objectMapper.Map<AssembleIssueNoteDTO, AssembleIssueNoteExchangeDto>(wmsReceipt);
-            var putawayNote = BuildDataInterface(exchangeReceipt);
-            var outgoingToExternal = new OutgoingToExternal()
-            {
-                DataType = EnumOutgoingDataType.Issue.ToString(),
-                TableType = EnumExchangeTableType.MainTable,
-                DataAction = outgoingFromWms.DataAction,
-                SerialNumber = tyrpNumber,
-                SourceSystem = EnumSystemType.WMS.ToString(),
-                SourceDataId = wmsReceipt.Id.ToString(),
-                SourceDataGroupCode = wmsReceipt.Number,
-                SourceDataDetailCode = wmsReceipt.Number,
-                Writer = nameof(TyrpOutgoingBackgroundWorker),
-                DestinationSystem = EnumSystemType.ERP.ToString(),
-                DestinationDataId = "",
-            };
-            outgoingToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
-            outgoingToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceipt);
-            outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNote);
-            outgoingToExternalList.Add(outgoingToExternal);
-            #endregion
-            var sumDetails = wmsReceipt.Details.GroupBy(r => new { r.ItemCode, r.HandledFromLocationErpCode, r.HandledToLocationErpCode }).Select(p => new AssembleIssueNoteDetailDTO { ItemCode = p.Key.ItemCode, HandledFromLocationErpCode = p.Key.HandledFromLocationErpCode, HandledToLocationErpCode = p.Key.HandledToLocationErpCode, HandledToQty = p.Sum(x => x.HandledToQty) }).ToList();
-            #region 明细
-            foreach (var detail in sumDetails)
-            {
-                var outgoingDetailToExternal = new OutgoingToExternal()
-                {
-                    DataType = EnumOutgoingDataType.Issue.ToString(),
-                    TableType = EnumExchangeTableType.DetailTable,
-                    DataAction = outgoingFromWms.DataAction,
-                    SerialNumber = tyrpNumber,
-                    SourceSystem = EnumSystemType.WMS.ToString(),
-                    SourceDataId = detail.Id.ToString(),
-                    SourceDataGroupCode = wmsReceipt.Number,
-                    SourceDataDetailCode = detail.ItemCode,
-                    Writer = nameof(TyrpOutgoingBackgroundWorker),
-                    DestinationSystem = EnumSystemType.ERP.ToString(),
-                    DestinationDataId = "",
-                };
-                outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
-                var exchangeReceiptDetail = _objectMapper.Map<AssembleIssueNoteDetailDTO, AssembleIssueNoteDetailExchangeDto>(detail);
-                outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail);
-                var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, putawayNote.scontrol_dt_w);
-                outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetail);
-                outgoingToExternalList.Add(outgoingDetailToExternal);
-            }
-            #endregion
-        }
-        //插入到中间表OutgoingToExternal
-        await _outgoingToExternalManager.CreateManyAsync(outgoingToExternalList).ConfigureAwait(false);
-        //将outgoingFromWms数据归档
-        await _outgoingFromWmsManager.ArchiveManyAsync(outgoingFromWmsList).ConfigureAwait(false);
-
-        return outgoingToExternalList;
-    }
-    /// <summary>
-    /// 构建主表
-    /// </summary>
-    /// <param name="exchangeOrder"></param>
-    /// <returns></returns>
-    private Scontrol BuildDataInterface(AssembleIssueNoteExchangeDto exchangeOrder)
-    {
-        var ret = new Scontrol()
-        {
-            scontrol_nbr = exchangeOrder.Number,
-            scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
-            scontrol_stat = "Y",
-            scontrol_dt_k = "",
-            scontrol_type = billtype,
-            scontrol_id = 0,//明细中最大scmsend_id
-        };
-        return ret;
-    }
-    /// <summary>
-    /// 构建明细
-    /// </summary>
-    /// <param name="exchangeOrder"></param>
-    /// <param name="exchangeDetailOrder"></param>
-    /// <returns></returns>
-    private Scmsend BuildDataInterfaceDetail(AssembleIssueNoteExchangeDto exchangeOrder, AssembleIssueNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
-    {
-        var ret = new Scmsend()
-        {
-            scmsend_type = billtype,
-            scmsend_dt_w = dt_w,
-            scmsend_nbr = exchangeOrder.Number,
-            scmsend_stat1 = "1",
-            scmsend_part = exchangeDetailOrder.ItemCode,
-            scmsend_delv_date = "",
-            scmsend_orderno = "",
-            scmsend_loc = exchangeDetailOrder.FromLocationErpCode,
-            //scmsend_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"),
-            scmsend_date = DateTime.Now.ToString("yyyyMMdd"),
-            scmsend_qty = exchangeDetailOrder.Qty,
-            scmsend_wipd_loc = exchangeDetailOrder.ToLocationErpCode,
-            scmsend_userid = "WMS"
-        };
-        return ret;
-    }
-}

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/IssueNote/AssembleIssueNote/AssembleIssueNoteDetailExchangeDto.cs

@@ -1,36 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using Win_in.Sfs.Shared.Domain;
-
-namespace Win_in.Sfs.Wms.DataExchange.WMS.PCK;
-
-public class AssembleIssueNoteDetailExchangeDto
-
-{
-
-    /// <summary>
-    /// 目标ERP库位
-    /// </summary>
-    [Display(Name = "目标ERP库位")]
-    public string ToLocationErpCode { get; set; }
-
-    public string FromPackingCode { get; set; }
-    /// <summary>
-    /// 来源ERP库位
-    /// </summary>
-    public string FromLocationErpCode { get; set; }
-
-    /// <summary>
-    /// 数量
-    /// </summary>
-    [Display(Name = "数量")]
-    public decimal Qty { get; set; }
-
-    /// <summary>
-    /// 物品代码
-    /// </summary>
-    [Display(Name = "物品代码")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    [Required(ErrorMessage = "{0}是必填项")]
-    public string ItemCode { get; set; }
-
-}

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/IssueNote/AssembleIssueNote/AssembleIssueNoteExchangeDto.cs

@@ -1,29 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-
-namespace Win_in.Sfs.Wms.DataExchange.WMS.PCK;
-
-public class AssembleIssueNoteExchangeDto
-{
-    /// <summary>
-    /// 发料记录号
-    /// </summary>
-    [Display(Name = "发料记录号")]
-    public string Number { get; set; }
-    /// <summary>
-    /// 生效日期
-    /// </summary>
-    [Display(Name = "生效日期")]
-    public DateTime ActiveDate { get; set; } = DateTime.Now.Date;
-
-    /// <summary>
-    /// 操作员
-    /// </summary>
-    [Display(Name = "操作员")]
-    public string Worker { get; set; }
-    /// <summary>
-    /// 明细
-    /// </summary>
-    [Display(Name = "明细")]
-    public AssembleIssueNoteDetailExchangeDto Detail { get; set; } = new();
-}

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain.Shared/Enums/EnumOutgoingDataType.cs

@@ -33,18 +33,6 @@ public enum EnumOutgoingDataType
     Item_Transform = 25,//线边仓调整单
     WIPAdjust = 26,//回收料调整单
     SemiPutaway=27,//半成品上架 
-    /// <summary>
-    /// 注塑发料
-    /// </summary>
-    InjectionIssue = 30,
-    /// <summary>
-    /// 涂装发料
-    /// </summary>
-    CoatingIssue = 31,
-    /// <summary>
-    /// 装配发料
-    /// </summary>
-    AssembleIssue = 32,
 
 }
 public enum EnumExchangeTableType

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

@@ -173,4 +173,15 @@ public class KittingIssueJobsController : AbpController
 
         return jobDto;
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="requestNumber"></param>
+    /// <returns></returns>
+    [HttpPost("by-request-number/{requestNumber}")]
+    public virtual async Task<List<KittingIssueJobDTO>> GetByRequestNumberAsync(string requestNumber)
+    {
+        return await _kittingIssueJobAppService.GetByRequestNumberAsync(requestNumber).ConfigureAwait(false);
+    }
 }

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

@@ -72,7 +72,6 @@ public class TransferLibJobController : AbpController
     /// <param name="jobDTO"></param>
     /// <returns></returns>
     [HttpPost("complete/{id}")]
-
     public virtual async Task<TransferLibJobDTO> CompleteAsync(Guid id, TransferLibJobDTO jobDTO)
     {
         var entity = await _transferLibJobAppService.CompleteAsync(id, jobDTO).ConfigureAwait(false);

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

@@ -10,6 +10,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
 using System.Text.Json;
 using Win_in.Sfs.Shared.Domain;
 using Volo.Abp;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Pda.Controllers.Jobs;
 
@@ -51,14 +52,15 @@ public class UnplannedIssueJobController : AbpController
     /// <param name="isToday"></param>
     /// <returns></returns>
     [HttpGet("list")]
-    public virtual async Task<PagedResultDto<UnplannedIssueJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday)
+    public virtual async Task<PagedResultDto<UnplannedIssueJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, EnumUnplannedIssueType enumUnplannedIssueType)
     {
-        var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
+        //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
-        var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes);
+        //var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes);
 
         var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing };
         var jsonStatus = JsonSerializer.Serialize(status);
-
+        var issueType = new List<int>() { (int)enumUnplannedIssueType };
+        var jsonIssueType = JsonSerializer.Serialize(issueType);
         var request = new SfsJobRequestInputBase
         {
             MaxResultCount = pageSize,
@@ -68,7 +70,7 @@ public class UnplannedIssueJobController : AbpController
             {
                 Filters = new List<Filter>
                 {
-                   // new(nameof(UnplannedIssueJobDTO.WorkGroupCode),jsonWlgCodes,"In"),
+                    new(nameof(UnplannedIssueJobDTO.UnplannedIssueType),jsonIssueType,"In"),
                     new(nameof(UnplannedIssueJobDTO.JobStatus),jsonStatus,"In")
                 }
             }
@@ -81,7 +83,6 @@ public class UnplannedIssueJobController : AbpController
         {
             request.Sorting = $"{nameof(UnplannedIssueJobDTO.CreationTime)} ASC";
         }
-
         var list = await _unplannedIssueJobAppService.GetPagedListByFilterAsync(request, true).ConfigureAwait(false);
         return list;
     }

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

@@ -10,6 +10,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
 using System.Text.Json;
 using Win_in.Sfs.Shared.Domain;
 using Volo.Abp;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Pda.Controllers.Jobs;
 
@@ -50,14 +51,15 @@ public class UnplannedReceiptJobController : AbpController
     /// <param name="isToday"></param>
     /// <returns></returns>
     [HttpGet("list")]
-    public virtual async Task<PagedResultDto<UnplannedReceiptJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday)
+    public virtual async Task<PagedResultDto<UnplannedReceiptJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, EnumUnplannedReceiptType enumUnplannedReceiptType)
     {
-        var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
+        //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
-        var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes);
+        //var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes);
 
         var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing };
+        var receiptType = new List<int>() { (int)enumUnplannedReceiptType };
         var jsonStatus = JsonSerializer.Serialize(status);
-
+        var jsonreceiptType = JsonSerializer.Serialize(receiptType);
         var request = new SfsJobRequestInputBase
         {
             MaxResultCount = pageSize,
@@ -67,7 +69,7 @@ public class UnplannedReceiptJobController : AbpController
             {
                 Filters = new List<Filter>
                 {
-                  //  new(nameof(UnplannedReceiptJobDTO.WorkGroupCode),jsonWlgCodes,"In"),
+                    new(nameof(UnplannedReceiptJobDTO.UnplannedReceiptType),jsonreceiptType,"In"),
                     new(nameof(UnplannedReceiptJobDTO.JobStatus),jsonStatus,"In")
                 }
             }

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

@@ -73,10 +73,10 @@ public class KittingRequestController : AbpController
         {
             MaxResultCount = pageSize,
             SkipCount = (pageIndex - 1) * pageSize,
-            Sorting = $"{nameof(ContainerJobDTO.CreationTime)} ASC",
+            Sorting = $"{nameof(KittingIssueRequestDTO.CreationTime)} ASC",
             Condition = new Condition
             {
-                Filters = new List<Filter> { new(nameof(ContainerJobDTO.JobStatus), jsonStatus, "In") }
+                Filters = new List<Filter> { new(nameof(KittingIssueRequestDTO.RequestStatus), jsonStatus, "In") }
             }
         };
 
@@ -97,7 +97,7 @@ public class KittingRequestController : AbpController
     /// <summary>
     ///     根据Job Number 获取盘点任务列表
     /// </summary>
-    /// <param name="jobNumber"></param>
+    /// <param name="requestNumber"></param>
     /// <returns></returns>
     [HttpGet("by-number/{requestNumber}")]
     public virtual async Task<ActionResult<KittingIssueRequestDTO>> GetByNumberAsync(string requestNumber)
@@ -122,4 +122,14 @@ public class KittingRequestController : AbpController
         var result = await _kittingIssueRequestAppService.GetAsync(id).ConfigureAwait(false);
         return Ok(result);
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("IsHasNewJob")]
+    public virtual async Task<string> IsHasNewJobAsync(string requestNumber, List<string> jobNumber)
+    {
+        return await _kittingIssueRequestAppService.IsHasNewJobAsync(requestNumber, jobNumber).ConfigureAwait(false);
+    }
 }

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

@@ -6,7 +6,7 @@ using Win_in.Sfs.Wms.Store.Application.Contracts;
 namespace Win_in.Sfs.Wms.Pda.Controllers.Stores;
 
 /// <summary>
-///
+///缴库
 /// </summary>
 [ApiController]
 [Route($"{PdaHostConst.ROOT_ROUTE}store/product-receipt")]
@@ -14,14 +14,16 @@ namespace Win_in.Sfs.Wms.Pda.Controllers.Stores;
 public class ProductReceiptNoteController : AbpController
 {
     private readonly IProductReceiptNoteAppService _productReceiptNoteAppService;
-
+    private readonly IProductReceiptNoteDetailAppService  _productReceiptNoteDetailAppService;
     /// <summary>
-    ///
+    /// 缴库
     /// </summary>
     /// <param name="productReceiptNoteAppService"></param>
-    public ProductReceiptNoteController(IProductReceiptNoteAppService productReceiptNoteAppService)
+    /// <param name="productReceiptNoteDetailAppService"></param>
+    public ProductReceiptNoteController(IProductReceiptNoteAppService productReceiptNoteAppService, IProductReceiptNoteDetailAppService productReceiptNoteDetailAppService)
     {
         _productReceiptNoteAppService = productReceiptNoteAppService;
+        _productReceiptNoteDetailAppService = productReceiptNoteDetailAppService;
     }
 
     /// <summary>
@@ -34,5 +36,15 @@ public class ProductReceiptNoteController : AbpController
     {
         await _productReceiptNoteAppService.CreateAsync(input).ConfigureAwait(false);
     }
+    /// <summary>
+    /// 单件码获取方法
+    /// </summary>
+    /// <param name="mesBarCode"></param>
+    /// <returns></returns>
+    [HttpPost("get-itemcode-by-mesbarcode")]
+    public virtual async Task<ProductReceiptNoteDetailDTO> GetItemCodeByMesBarCode(string mesBarCode)
+    {
+      return  await _productReceiptNoteDetailAppService.GetItemCodeByMesBarCode(mesBarCode).ConfigureAwait(false);
+    }
 
 }

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs

@@ -75,7 +75,6 @@ public class PositionCodeAppService
         input.PartName = itemBasic.Name;
         input.PartDesc = itemBasic.Desc1;
         input.BasicUom = itemBasic.BasicUom;
-        input.StdPackQty = itemBasic.StdPackQty;
 
         var location = await LocationAppService.GetByCodeAsync(input.LocationCode).ConfigureAwait(false);
         Check.NotNull(location, "库位代码", $"库位 {input.LocationCode} 不存在");
@@ -173,23 +172,23 @@ public class PositionCodeAppService
 
     private async Task CheckPositionCodeInputAsync(PositionCodeImportInput input, List<ValidationResult> validationRresult)
     {
-        var itemEntity = await _repository.FirstOrDefaultAsync(p => p.PartCode == input.PartCode && p.Code != input.Code).ConfigureAwait(false);
+        //var itemEntity = await _repository.FirstOrDefaultAsync(p => p.PartCode == input.PartCode && p.Code != input.Code).ConfigureAwait(false);
-        if (itemEntity != null)
+        //if (itemEntity != null)
-        {
+        //{
-            validationRresult.Add(new ValidationResult($"物品代码{input.PartCode}已存在", new string[] { "物品代码" }));
+        //    validationRresult.Add(new ValidationResult($"物品代码{input.PartCode}已存在", new string[] { "物品代码" }));
-        }
+        //}
-        var itemBasic = await ItemBasicAppService.GetByCodeAsync(input.PartCode).ConfigureAwait(false);
+        //var itemBasic = await ItemBasicAppService.GetByCodeAsync(input.PartCode).ConfigureAwait(false);
-        //如果类型选择为原料，校验物料号类型必须为原料，器具、KItting 的不用加校验
+        ////如果类型选择为原料，校验物料号类型必须为原料，器具、KItting 的不用加校验
-        if (input.Type == EnumRecommendType.RAW && itemBasic.Type != "10C02")
+        //if (input.Type == EnumRecommendType.RAW && itemBasic.Type != "10C02")
-        {
+        //{
-            validationRresult.Add(new ValidationResult($"物品代码{input.PartCode} 物料号类型必须为原料", new string[] { "物料号类型" }));            
+        //    validationRresult.Add(new ValidationResult($"物品代码{input.PartCode} 物料号类型必须为原料", new string[] { "物料号类型" }));            
-        }
+        //}
-        var location = await LocationAppService.GetByCodeAsync(input.LocationCode).ConfigureAwait(false);        
+        //var location = await LocationAppService.GetByCodeAsync(input.LocationCode).ConfigureAwait(false);        
-        //如果类型选择为原料，库位的类型必须为原料库位
+        ////如果类型选择为原料，库位的类型必须为原料库位
-        if (input.Type==EnumRecommendType.RAW && location.Type != EnumLocationType.RAW)
+        //if (input.Type==EnumRecommendType.RAW && location.Type != EnumLocationType.RAW)
-        {
+        //{
-            validationRresult.Add(new ValidationResult($"库位代码{input.LocationCode} 库位的类型必须为原料库位", new string[] { "库位类型" }));            
+        //    validationRresult.Add(new ValidationResult($"库位代码{input.LocationCode} 库位的类型必须为原料库位", new string[] { "库位类型" }));            
-        }
+        //}
     }
 
     protected override async Task ValidateImportModelAsync(PositionCodeImportInput importInput, List<ValidationResult> validationRresult)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/IChassisAppService.cs

@@ -12,10 +12,5 @@ public interface IChassisAppService
         ISfsCheckStatusAppService
         , ISfsUpsertAppService<ChassisEditInput>
 {
-    /// <summary>
+  
-    ///     平板或手持使用 按照底盘返回排序大于参数中20个的
-    /// </summary>
-    /// <returns></returns>
-    Task<PagedResultDto<ChassisDTO>> GetListWithNextCountAsync(long sortNumber,int count,
-        CancellationToken cancellationToken = default);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/IChassisOperationSequenceAppService.cs

@@ -1,4 +1,6 @@
+using System.Threading;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
 using Win_in.Sfs.Shared.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
@@ -18,4 +20,11 @@ public interface IChassisOperationSequenceAppService
     /// <param name="chassisNumber"></param>
     /// <returns></returns>
     Task UpdateChassisSortNumberByKittingCodeAsync(string kittingCode, long newChassisSortNumber,string chassisNumber);
+
+    /// <summary>
+    ///     平板或手持使用 按照底盘返回排序大于参数中20个的
+    /// </summary>
+    /// <returns></returns>
+    Task<PagedResultDto<ChassisDTO>> GetListWithNextCountAsync(int count, string kittingCode,
+        CancellationToken cancellationToken = default);
 }

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

@@ -1,28 +1,23 @@
 using Volo.Abp.Authorization.Permissions;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 public static class CoatingIssueJobPermissions
 {
 
-    public const string Default = StorePermissions.GroupName + "." + nameof(IssueJob);
+    public const string Default = StorePermissions.GroupName + "." + nameof(CoatingIssueJob);
     public const string Create = Default + "." + StorePermissions.CreateStr;
     public const string Update = Default + "." + StorePermissions.UpdateStr;
     public const string Delete = Default + "." + StorePermissions.DeleteStr;
 
-    //自动发料任务
-    public const string AutoIssueJob = StorePermissions.GroupName + "." + nameof(AutoIssueJob);
-
     public static void AddCoatingIssueJobPermission(this PermissionGroupDefinition permissionGroup)
     {
         var IssueJobPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(IssueJob)));
         IssueJobPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
         IssueJobPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
         IssueJobPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
-
-        permissionGroup.AddPermission(AutoIssueJob, StorePermissionDefinitionProvider.L(nameof(AutoIssueJob)));
-
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductReceiptNotes/IProductReceiptNoteDetailAppService.cs

@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+public interface IProductReceiptNoteDetailAppService : ISfsStoreAppServiceBase<ProductReceiptNoteDetailDTO, SfsStoreRequestInputBase, ProductReceiptNoteDetailInput>
+{
+    Task<ProductReceiptNoteDetailDTO> GetItemCodeByMesBarCode(string mesBarCode);
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductReceiptNotes/ProductReceiptNoteDetailPermissions.cs

@@ -0,0 +1,25 @@
+using Volo.Abp.Authorization.Permissions;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+public static class ProductReceiptNoteDetailPermissions
+{
+    public const string Default = StorePermissions.GroupName + "." + nameof(ProductReceiptNoteDetail);
+    public const string Create = Default + "." + StorePermissions.CreateStr;
+    public const string Update = Default + "." + StorePermissions.UpdateStr;
+    public const string Delete = Default + "." + StorePermissions.DeleteStr;
+
+    //线边完工收货记录
+    public const string WipProductReceiptNoteDetail = StorePermissions.GroupName + "." + nameof(WipProductReceiptNoteDetail);
+
+    public static void AddProductReceiptNoteDetailPermission(this PermissionGroupDefinition permissionGroup)
+    {
+        var productReceiptNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(ProductReceiptNoteDetail)));
+        productReceiptNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
+        productReceiptNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
+        productReceiptNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
+
+        permissionGroup.AddPermission(WipProductReceiptNoteDetail, StorePermissionDefinitionProvider.L(nameof(WipProductReceiptNoteDetail)));
+
+    }
+}

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

@@ -17,6 +17,7 @@ public class StorePermissionDefinitionProvider : PermissionDefinitionProvider
         storeGroup.AddProductionPlanPermission();
         storeGroup.AddPreparationPlanPermission();
         storeGroup.AddProductReceiptNotePermission();
+        storeGroup.AddProductReceiptNoteDetailPermission();
         storeGroup.AddOfflineSettlementNotePermission();
         storeGroup.AddBackFlushNotePermission();
         storeGroup.AddWorkOrderPermission();

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/KittingIssueRequests/IKittingIssueRequestAppService.cs

@@ -12,4 +12,5 @@ public interface IKittingIssueRequestAppService
 {
     Task<KittingIssueRequestDTO> CreateAndHandleAsync(KittingIssueRequestEditInput input);
     Task UpdateStatusCompletedAsync(string number);
+    Task<string> IsHasNewJobAsync(string requestNumber,List<string> jobNumber);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Chassis/ChassisAppService.cs

@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.Application.Dtos;
-using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
@@ -74,32 +71,5 @@ public class ChassisAppService
         throw new NotImplementedException();
     }
 
-    /// <summary>
-    ///     平板或手持使用 按照底盘返回排序大于参数中20个的
-    /// </summary>
-    /// <returns></returns>
-    [HttpPost("get-list-with-next-count")]
-    public async Task<PagedResultDto<ChassisDTO>> GetListWithNextCountAsync(long sortNumber,int count,
-        CancellationToken cancellationToken = default)
-    {
-        var requestInput = new SfsStoreRequestInputBase
-        {
-            MaxResultCount = count,
-            SkipCount = 0,
-            Sorting = $"{nameof(Chassis.SortNumber)} DESC",
-            Condition = new Condition
-            {
-                Filters = new List<Filter> { new(nameof(Chassis.SortNumber), sortNumber.ToString(), ">=") }
-            }
-        };
-
-        var expression = requestInput.Condition.Filters?.Count > 0
-            ? requestInput.Condition.Filters.ToLambda<Chassis>()
-            : p => true;
-
-        return await GetPagedListAsync(expression, requestInput.SkipCount, requestInput.MaxResultCount,
-            requestInput.Sorting, false, cancellationToken).ConfigureAwait(false);
-    }
-
     #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAppService.cs

@@ -1,8 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.Application.Dtos;
+using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
@@ -21,10 +24,10 @@ public class ChassisOperationSequenceAppService
 {
     private new readonly IChassisOperationSequenceRepository _repository;
     private readonly IChassisOperationSequenceManager _manager;
+    private readonly IChassisAppService _chassisAppService;
 
     public ChassisOperationSequenceAppService(
-        IChassisOperationSequenceRepository repository, IChassisOperationSequenceManager manager
+        IChassisOperationSequenceRepository repository, IChassisOperationSequenceManager manager, IChassisAppService chassisAppService) : base(repository)
-    ) : base(repository)
     {
         base.CreatePolicyName = ChassisOperationSequencePermissions.Create;
         base.UpdatePolicyName = ChassisOperationSequencePermissions.Update;
@@ -32,6 +35,7 @@ public class ChassisOperationSequenceAppService
 
         _repository = repository;
         _manager = manager;
+        _chassisAppService = chassisAppService;
     }
 
     /// <summary>
@@ -39,6 +43,7 @@ public class ChassisOperationSequenceAppService
     /// </summary>
     /// <param name="kittingCode"></param>
     /// <param name="newChassisSortNumber"></param>
+    /// <param name="chassisNumber"></param>
     /// <returns></returns>
     [HttpPost("update-chassis-sort-number-by-kitting-code")]
     public async Task UpdateChassisSortNumberByKittingCodeAsync(string kittingCode, long newChassisSortNumber, string chassisNumber)
@@ -62,6 +67,38 @@ public class ChassisOperationSequenceAppService
         }
     }
 
+    /// <summary>
+    ///     平板或手持使用 按照底盘返回排序大于参数中20个的
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("get-list-with-next-count")]
+    public async Task<PagedResultDto<ChassisDTO>> GetListWithNextCountAsync(int count, string kittingCode,
+        CancellationToken cancellationToken = default)
+    {
+        var chassisOperationSequence=await _repository.FindAsync(p => p.KittingCode == kittingCode).ConfigureAwait(false);
+        long sortNumber = 1;
+        if (chassisOperationSequence != null)
+        {
+            sortNumber = chassisOperationSequence.ChassisSortNumber;
+        }
+
+        var requestInput = new SfsStoreRequestInputBase
+        {
+            MaxResultCount = count,
+            SkipCount = 0,
+            Sorting = $"{nameof(Chassis.SortNumber)} DESC",
+            Condition = new Condition
+            {
+                Filters = new List<Filter>
+                {
+                    new(nameof(Chassis.SortNumber), sortNumber.ToString(), ">="),
+                }
+
+            }
+        };
+        return await _chassisAppService.GetPagedListByFilterAsync(requestInput,false, cancellationToken).ConfigureAwait(false);
+    }
+
     #region 无用
 
     [NonAction]

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

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Castle.Components.DictionaryAdapter;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
@@ -95,11 +96,10 @@ public class KittingIssueJobAppService
         await _kittingIssueJobManager.CancelAsync(injectionJob).ConfigureAwait(false);
     }
 
-
+    [HttpPost("cancel-by-request/{requestNumber}")]
-    [HttpPost("cancel-by-request/{injectionNumber}")]
+    public virtual async Task CancelByMaterialRequestAsync(string requestNumber)
-    public virtual async Task CancelByMaterialRequestAsync(string injectionNumber)
     {
-        var entities = await _repository.GetListAsync(p => p.KittingRequestNumber == injectionNumber)
+        var entities = await _repository.GetListAsync(p => p.KittingRequestNumber == requestNumber)
             .ConfigureAwait(false);
         foreach (var entity in entities)
         {
@@ -171,26 +171,36 @@ public class KittingIssueJobAppService
     public async Task ExecuteDetailAsync(Guid masterId, Guid detailId, KittingIssueJobDetailDTO issueJobDetailDto)
     {
         var kittingIssueJob = await _repository.GetAsync(masterId).ConfigureAwait(false);
+        kittingIssueJob.JobStatus = EnumJobStatus.Doing;
 
         var kittingIssueJobDto = ObjectMapper.Map<KittingIssueJob, KittingIssueJobDTO>(kittingIssueJob);
         kittingIssueJobDto.Details = new List<KittingIssueJobDetailDTO> { issueJobDetailDto };
         var kittingIssueNoteEditInput = await BuildKittingIssueNoteAsync(kittingIssueJobDto).ConfigureAwait(false);
         await _kittingIssueNoteAppService.CreateAsync(kittingIssueNoteEditInput).ConfigureAwait(false);
 
-        kittingIssueJobDto = ObjectMapper.Map<KittingIssueJob, KittingIssueJobDTO>(kittingIssueJob);
+        var issueJobDetail=ObjectMapper.Map<KittingIssueJobDetailDTO, KittingIssueJobDetail>(issueJobDetailDto);
+        var entityDetail=kittingIssueJob.Details.Find(p => p.Id == detailId);
+        issueJobDetail.HandledFromQty = entityDetail.HandledFromQty;
+        issueJobDetail.HandledToQty = entityDetail.HandledToQty;
+
+        issueJobDetail.HandledToQty += issueJobDetailDto.HandledToQty;
+        issueJobDetail.HandledFromQty += issueJobDetailDto.HandledFromQty;
+        kittingIssueJob.Details = new EditableList<KittingIssueJobDetail>() { issueJobDetail };
 
-        if (kittingIssueJob.EnumIssueSendType == EnumIssueSendType.QtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成
+        if (kittingIssueJob.EnumIssueSendType == EnumIssueSendType.BoxQtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成
         {
-            await UpdateJobStatusDoneAsync(kittingIssueJob, issueJobDetailDto).ConfigureAwait(false);
+            await UpdateRequestAndjobStatusDoneAsync(kittingIssueJob, issueJobDetailDto).ConfigureAwait(false);
         }
         else
         {
             var detail = kittingIssueJob.Details.First(p => p.Id == issueJobDetailDto.Id);
-            if (issueJobDetailDto.HandledToQty >= detail.RequestQty)
+            if (issueJobDetail.HandledToQty >= detail.RequestQty)
             {
-                await UpdateJobStatusDoneAsync(kittingIssueJob, issueJobDetailDto).ConfigureAwait(false);
+                await UpdateRequestAndjobStatusDoneAsync(kittingIssueJob, issueJobDetailDto).ConfigureAwait(false);
             }
         }
+
+        await _repository.UpdateAsync(kittingIssueJob).ConfigureAwait(false);
     }
 
     #region 私有
@@ -246,16 +256,16 @@ public class KittingIssueJobAppService
             jobDetailInputdetail.TransferLibToArriveDate = jobDetailInputdetail.RecommendToArriveDate;
             jobDetailInputdetail.TransferLibToContainerCode = jobDetailInputdetail.RecommendToContainerCode;
             jobDetailInputdetail.TransferLibToExpireDate = jobDetailInputdetail.RecommendToExpireDate;
-            jobDetailInputdetail.TransferLibToLocationArea = jobDetailInputdetail.RecommendToLocationArea;
-            jobDetailInputdetail.TransferLibToLocationCode = jobDetailInputdetail.RecommendToLocationCode;
-            jobDetailInputdetail.TransferLibToLocationErpCode = jobDetailInputdetail.RecommendToLocationErpCode;
-            jobDetailInputdetail.TransferLibToLocationGroup = jobDetailInputdetail.RecommendToLocationGroup;
             jobDetailInputdetail.TransferLibToLot = jobDetailInputdetail.RecommendToLot;
             jobDetailInputdetail.TransferLibToPackingCode = jobDetailInputdetail.RecommendToPackingCode;
             jobDetailInputdetail.TransferLibToProduceDate = jobDetailInputdetail.RecommendToProduceDate;
             jobDetailInputdetail.TransferLibToQty = jobDetailInputdetail.RecommendToQty;
             jobDetailInputdetail.TransferLibToSupplierBatch = jobDetailInputdetail.RecommendToSupplierBatch;
-            jobDetailInputdetail.TransferLibToWarehouseCode = jobDetailInputdetail.RecommendToWarehouseCode;
+            jobDetailInputdetail.TransferLibToWarehouseCode = jobDetailInputdetail.TransferLibFromWarehouseCode;
+            jobDetailInputdetail.TransferLibToLocationArea = jobDetailInputdetail.TransferLibFromLocationArea;
+            jobDetailInputdetail.TransferLibToLocationCode = jobDetailInputdetail.TransferLibFromLocationCode;
+            jobDetailInputdetail.TransferLibToLocationErpCode = jobDetailInputdetail.TransferLibFromLocationErpCode;
+            jobDetailInputdetail.TransferLibToLocationGroup = jobDetailInputdetail.TransferLibFromLocationGroup;
         }
     }
 
@@ -279,14 +289,21 @@ public class KittingIssueJobAppService
         }
     }
 
-    private async Task UpdateJobStatusDoneAsync(KittingIssueJob kittingIssueJob,
+    /// <summary>
+    /// 修改当前任务状态 和 该任务的请求状态
+    /// </summary>
+    /// <param name="kittingIssueJob"></param>
+    /// <param name="kittingIssueJobDetailDto"></param>
+    /// <returns></returns>
+    /// <exception cref="UserFriendlyException"></exception>
+    private async Task UpdateRequestAndjobStatusDoneAsync(KittingIssueJob kittingIssueJob,
         KittingIssueJobDetailDTO kittingIssueJobDetailDto)
     {
         if (kittingIssueJob.JobStatus is EnumJobStatus.Closed or EnumJobStatus.Cancelled or EnumJobStatus.None
             or EnumJobStatus.Done) //需要考虑下 多次提交的问题 所以不判断 进行中
         {
             throw new UserFriendlyException(
-                $"任务状态错误：编号为【{kittingIssueJob.Number}】的任务已经【{kittingIssueJob.JobStatus.GetDisplayName()}】");
+                $"任务状态错误：编号为【{kittingIssueJob.Number}】的任务状态为【{kittingIssueJob.JobStatus.GetDisplayName()}】");
         }
 
         kittingIssueJob.JobStatus = EnumJobStatus.Done;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs

@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp;
 using Volo.Abp.Uow;
+using Win_in.Sfs.Basedata.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;
@@ -21,11 +22,13 @@ public class TransferLibJobAppService
     ITransferLibJobAppService
 {
     private readonly IServiceProvider _serviceProvider;
+    private readonly ILocationAppService _locationAppService;
 
     public TransferLibJobAppService(
-        ITransferLibJobRepository repository, ITransferLibJobManager TransferLibJobManager, IServiceProvider serviceProvider) : base(repository, TransferLibJobManager)
+        ITransferLibJobRepository repository, ITransferLibJobManager TransferLibJobManager, IServiceProvider serviceProvider, ILocationAppService locationAppService) : base(repository, TransferLibJobManager)
     {
         _serviceProvider = serviceProvider;
+        _locationAppService = locationAppService;
     }
 
     /// <summary>
@@ -172,6 +175,27 @@ public class TransferLibJobAppService
         }
         #endregion
 
+        foreach (var detail in dto.Details)
+        {
+            detail.HandledFromContainerCode = string.Empty;
+            detail.HandledToContainerCode = string.Empty;
+
+            var fromLocationDto=await _locationAppService.GetByCodeAsync(detail.HandledFromLocationCode).ConfigureAwait(false);
+            var toLocationDto=await _locationAppService.GetByCodeAsync(detail.HandledToLocationCode).ConfigureAwait(false);
+
+            detail.HandledFromLocationArea = fromLocationDto.AreaCode;
+            detail.HandledFromLocationCode = fromLocationDto.Code;
+            detail.HandledFromLocationErpCode = fromLocationDto.ErpLocationCode;
+            detail.HandledFromLocationGroup = fromLocationDto.LocationGroupCode;
+            detail.HandledFromWarehouseCode = fromLocationDto.WarehouseCode;
+
+            detail.HandledToLocationArea = toLocationDto.AreaCode;
+            detail.HandledToLocationCode = toLocationDto.Code ;
+            detail.HandledToLocationErpCode = toLocationDto.ErpLocationCode;
+            detail.HandledToLocationGroup = toLocationDto.LocationGroupCode;
+            detail.HandledToWarehouseCode = toLocationDto.WarehouseCode;
+        }
+
         var ret = await base.CompleteAsync(id, dto).ConfigureAwait(false);
         if (ret != null)
         {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/ProductReceiptNotes/ProductReceiptNoteDetailAppService.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.Application.Dtos;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+using Volo.Abp.Application.Services;
+using Microsoft.AspNetCore.Authorization;
+using Win_in.Sfs.Wms.Store.Domain.Shared;
+using Win_in.Sfs.Wms.Store.Application;
+using Volo.Abp.Domain.Repositories;
+
+namespace Win_in.Sfs.Wms.Store.Notes.ProductReceiptNotes;
+[Authorize]
+[Route($"{StoreConsts.RootPath}product-receipt-note-detail")]
+
+public class ProductReceiptNoteDetailAppService : SfsStoreAppServiceBase<ProductReceiptNoteDetail, ProductReceiptNoteDetailDTO, SfsStoreRequestInputBase, ProductReceiptNoteDetailInput, ProductReceiptNoteImportInput>, IProductReceiptNoteDetailAppService
+{
+    private readonly IProductReceiptNoteDetailRepository _productReceiptNoteDetailRepository;
+    public ProductReceiptNoteDetailAppService(
+        IProductReceiptNoteDetailRepository repository
+    ) : base(repository)
+    {
+        _productReceiptNoteDetailRepository = repository;
+    }
+
+
+    [HttpGet("get-itemcode-by-mesbarcode")]
+    public virtual async Task<ProductReceiptNoteDetailDTO> GetItemCodeByMesBarCode(string mesBarCode)
+    {
+        var entity = await _productReceiptNoteDetailRepository.FirstOrDefaultAsync(r => r.MesBarCode == mesBarCode).ConfigureAwait(false);
+        var dto = ObjectMapper.Map<ProductReceiptNoteDetail, ProductReceiptNoteDetailDTO>(entity);
+        return dto;
+    }
+
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs

@@ -2,8 +2,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Castle.Components.DictionaryAdapter;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using NUglify.Helpers;
 using Volo.Abp;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -138,14 +140,38 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase<Kitti
         return kittingIssueRequestDto;
     }
 
+    public override async Task<KittingIssueRequestDTO> CancelAsync(Guid id)
+    {
+        var request=await _repository.GetAsync(id).ConfigureAwait(false);
+
+        var list=await _kittingIssueJobAppService.GetByRequestNumberAsync(request.Number).ConfigureAwait(false);
+        if (list.Any())
+        {
+            foreach (var kittingIssueJobDto in list)
+            {
+                if (kittingIssueJobDto.JobStatus == EnumJobStatus.Open ||
+                    kittingIssueJobDto.JobStatus == EnumJobStatus.Partial ||
+                    kittingIssueJobDto.JobStatus == EnumJobStatus.Doing ||
+                    kittingIssueJobDto.JobStatus == EnumJobStatus.Wait)
+                {
+                    await _kittingIssueJobAppService.CancelAsync(kittingIssueJobDto.Id).ConfigureAwait(false);
+                }
+            }
+        }
+
+        return await base.CancelAsync(id).ConfigureAwait(false);
+    }
+
     [HttpPost("UpdateStatusCompleted")]
     public async Task UpdateStatusCompletedAsync(string number)
     {
         var kittingIssueRequest=await _repository.FindAsync(p=>p.Number== number).ConfigureAwait(false);
 
+        await UpdateKittingIssueRequestDetailQtyAsync(kittingIssueRequest,new EditableList<KittingIssueJobDTO>()).ConfigureAwait(false);
+
         var kittingIssueJobDtos=await _kittingIssueJobAppService.GetByRequestNumberAsync(kittingIssueRequest.Number).ConfigureAwait(false);
 
-        if (!kittingIssueJobDtos.Any(p =>
+        if (kittingIssueJobDtos.Any(p =>
                 p.JobStatus == EnumJobStatus.Open || p.JobStatus == EnumJobStatus.Doing ||
                 p.JobStatus == EnumJobStatus.Partial) )
         {
@@ -175,6 +201,81 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase<Kitti
         kittingIssueRequest.RequestStatus = EnumRequestStatus.Completed;
     }
 
+    /// <summary>
+    ///     修改请求的 已发 已收数量
+    /// </summary>
+    /// <param name="kittingIssueRequest"></param>
+    /// <param name="addKittingIssueJobDtos"></param>
+    /// <returns></returns>
+    private async Task UpdateKittingIssueRequestDetailQtyAsync(KittingIssueRequest kittingIssueRequest,
+        List<KittingIssueJobDTO> addKittingIssueJobDtos)
+    {
+        //原有任务
+        var existKittingIssueJobDtos = await _kittingIssueJobAppService.GetByRequestNumberAsync(kittingIssueRequest.Number)
+            .ConfigureAwait(false);
+
+        //新增的任务和已有的任务总和
+        var allKittingIssueJobDtos = new List<KittingIssueJobDTO>();
+        allKittingIssueJobDtos.AddRange(addKittingIssueJobDtos);
+        allKittingIssueJobDtos.AddRange(existKittingIssueJobDtos);
+
+        var groupByItemCodeLocationCode = kittingIssueRequest.Details.GroupBy(p =>
+            new { p.ItemCode, p.ToLocationCode });
+        foreach (var group in groupByItemCodeLocationCode)
+        {
+            foreach (var requestDetail in group)
+            {
+                //所有已发数量
+                decimal allIssuedQty = 0;
+
+                //所有已发数量
+                decimal allReceivedQty = 0;
+
+                foreach (var allKittingIssueJobDto in allKittingIssueJobDtos)
+                {
+                    var jobDetailDtos = allKittingIssueJobDto.Details.Where(p =>
+                        p.ItemCode == group.Key.ItemCode && p.RequestLocationCode == group.Key.ToLocationCode);
+                    //所有已发数量
+                    allIssuedQty += jobDetailDtos.Sum(p => p.RequestQty);
+                    //所有已发数量
+                    allReceivedQty += jobDetailDtos.Sum(p => p.HandledToQty);
+                }
+
+                requestDetail.IssuedQty += allIssuedQty;
+                requestDetail.ReceivedQty += allReceivedQty;
+            }
+        }
+
+        await _repository.UpdateAsync(kittingIssueRequest).ConfigureAwait(false);
+    }
+
+    [HttpPost("IsHasNewJob")]
+    public async Task<string> IsHasNewJobAsync(string requestNumber,List<string> jobNumber)
+    {
+        var joblIssueJobDtos=await _kittingIssueJobAppService.GetByRequestNumberAsync(requestNumber).ConfigureAwait(false);
+        if (joblIssueJobDtos != null && joblIssueJobDtos.Any())
+        {
+            var jobNumberList = joblIssueJobDtos.Select(p => p.Number);
+
+            var difference = jobNumberList.Except(jobNumber);
+            if (difference.Any())
+            {
+                var result = "已生成任务号";
+                difference.ForEach(p=> result+="【"+p+"】");
+                result += "的任务";
+                return result;
+            }
+            else
+            {
+                return "无任务生成，请检查库存";
+            }
+        }
+        else
+        {
+            return "无任务生成，请检查库存";
+        }
+    }
+
     #region 校验
 
     private void CheckStatus(EnumRequestStatus targetStatus, EnumRequestStatus nowStatus)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ExchangeDatas/EnumExchangeDataType.cs

@@ -33,17 +33,5 @@ public enum EnumExchangeDataType
     Item_Transform = 28,
     //半成品上架
     SemiPutaway = 29,  
-    /// <summary>
-    /// 注塑发料
-    /// </summary>
-    InjectionIssue=30,
-    /// <summary>
-    /// 涂装发料
-    /// </summary>
-    CoatingIssue=31,
-    /// <summary>
-    /// 装配发料
-    /// </summary>
-    AssembleIssue=32,
 
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobManager.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Volo.Abp;
+using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Users;
 using Volo.Abp.Validation;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -18,7 +19,9 @@ public class KittingIssueJobManager : SfsJobManagerBase<KittingIssueJob, Kitting
     private readonly IExpectOutAppService _expectOutAppService;
 
     public KittingIssueJobManager(
-        IKittingIssueJobRepository repository, IBalanceAppService balanceAppService, IExpectOutAppService expectOutAppService) : base(repository)
+        IKittingIssueJobRepository repository,
+        IBalanceAppService balanceAppService,
+        IExpectOutAppService expectOutAppService) : base(repository)
     {
         _balanceAppService = balanceAppService;
         _expectOutAppService = expectOutAppService;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/TransferLibJobs/TransferLibJobManager.cs

@@ -50,7 +50,7 @@ public class TransferLibJobManager : SfsJobManagerBase<TransferLibJob, TransferL
         entity.RequestNumber = input.RequestNumber;
         entity.JobNumber = input.JobNumber;
         entity.Type = input.Type;
-        entity.UseOnTheWayLocation = input.UseOnTheWayLocation;
+        entity.UseOnTheWayLocation = false;
         entity.ConfirmTime = input.ConfirmTime;
         entity.CreationTime = input.CreationTime;
         entity.CreatorId = input.CreatorId;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductReceiptNotes/IProductReceiptNoteDetailRepository.cs

@@ -0,0 +1,4 @@
+namespace Win_in.Sfs.Wms.Store.Domain;
+public interface IProductReceiptNoteDetailRepository : ISfsStoreRepositoryBase<ProductReceiptNoteDetail>
+{
+}

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

@@ -74,6 +74,8 @@ public interface IStoreDbContext : IEfCoreDbContext
 
     public DbSet<JisProductReceiptNote> JisProductReceiptNotes { get; }
     public DbSet<ProductReceiptNote> ProductReceiptNotes { get; }
+
+    public DbSet<ProductReceiptNoteDetail> ProductReceiptNoteDetails { get; }
     public DbSet<OfflineSettlementNote> OfflineSettlementNotes { get; }
     public DbSet<BackFlushNote> BackFlushNotes { get; }
     public DbSet<ProductL7PartsNote> ProductL7PartsNotes { get; }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/ProductReceiptNotes/ProductReceiptNoteDetailEfCoreRepository.cs

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

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

@@ -73,6 +73,8 @@ public class StoreDbContext : AbpDbContext<StoreDbContext>, IStoreDbContext
 
     public DbSet<JisProductReceiptNote> JisProductReceiptNotes { get; set; }
     public DbSet<ProductReceiptNote> ProductReceiptNotes { get; set; }
+
+    public DbSet<ProductReceiptNoteDetail> ProductReceiptNoteDetails { get; set; }
     public DbSet<OfflineSettlementNote> OfflineSettlementNotes { get; set; }
     public DbSet<BackFlushNote> BackFlushNotes { get; set; }
     public DbSet<ProductL7PartsNote> ProductL7PartsNotes { get; set; }

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

@@ -95,6 +95,7 @@ public class StoreEntityFrameworkCoreModule : AbpModule
         context.Services.AddTransient<IJisDeliverNoteRepository, JisDeliverNoteEfCoreRepository>();
         context.Services.AddTransient<IProductL7PartsNoteRepository, ProductL7PartsNoteEfCoreRepository>();
         context.Services.AddTransient<IProductReceiptNoteRepository, ProductReceiptNoteEfCoreRepository>();
+        context.Services.AddTransient<IProductReceiptNoteDetailRepository, ProductReceiptNoteDetailEfCoreRepository>();
         context.Services.AddTransient<IOfflineSettlementNoteRepository, OfflineSettlementNoteEfCoreRepository>();
         context.Services.AddTransient<IBackFlushNoteRepository, BackFlushNoteEfCoreRepository>();
         context.Services.AddTransient<IPurchaseReceiptNoteRepository, PurchaseReceiptNoteEfCoreRepository>();
@@ -106,7 +107,8 @@ public class StoreEntityFrameworkCoreModule : AbpModule
         context.Services.AddTransient<IIssueNoteRepository, IssueNoteEfCoreRepository>();
         context.Services.AddTransient<IInjectionIssueNoteRepository, InjectionIssueNoteEfCoreRepository>();
         context.Services.AddTransient<IAssembleIssueNoteRepository, AssembleIssueNoteEfCoreRepository>();
-		context.Services.AddTransient<IKittingIssueNoteRepository, KittingIssueNoteEfCoreRepository>();        context.Services.AddTransient<IThirdLocationNoteRepository, ThirdLocationNoteEfCoreRepository>();
+		context.Services.AddTransient<IKittingIssueNoteRepository, KittingIssueNoteEfCoreRepository>();
+        context.Services.AddTransient<IThirdLocationNoteRepository, ThirdLocationNoteEfCoreRepository>();
         context.Services.AddTransient<IContainerNoteRepository, ContainerNoteEfCoreRepository>();
         context.Services.AddTransient<IUnplannedReceiptNoteRepository, UnplannedReceiptNoteEfCoreRepository>();
         context.Services.AddTransient<IUnplannedIssueNoteRepository, UnplannedIssueNoteEfCoreRepository>();

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

@@ -12,15 +12,15 @@ using Win_in.Sfs.Wms.Store.Notes.IssueNotes;
 namespace Win_in.Sfs.Wms.Store.Event.DataExchanges;
 
 /// <summary>
-/// 装配发料记录传给TYRP(线边仓领料单)
+/// 装配线边=>外购件 库移记录传给TYRP(线边仓领料单)
 /// </summary>
 public class AssembleIssueNoteEventHandler
     : StoreDataExchangeEventHandlerBase<AssembleIssueNote>
     , ILocalEventHandler<SfsCreatedEntityEventData<AssembleIssueNote>>
     , ILocalEventHandler<SfsCreatedEntityEventData<List<AssembleIssueNote>>>
 {
-
+    //线边仓领料单
-    private const EnumExchangeDataType ExchangeDataType = EnumExchangeDataType.AssembleIssue;
+    private const EnumExchangeDataType ExchangeDataType = EnumExchangeDataType.Issue;
 
     [UnitOfWork]
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<AssembleIssueNote> eventData)

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

@@ -19,8 +19,8 @@ public class CoatingIssueNoteEventHandler
     , ILocalEventHandler<SfsCreatedEntityEventData<CoatingIssueNote>>
     , ILocalEventHandler<SfsCreatedEntityEventData<List<CoatingIssueNote>>>
 {
-
+    //线边仓领料单
-    private const EnumExchangeDataType ExchangeDataType = EnumExchangeDataType.CoatingIssue;
+    private const EnumExchangeDataType ExchangeDataType = EnumExchangeDataType.Issue;
 
     [UnitOfWork]
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<CoatingIssueNote> eventData)

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

@@ -18,8 +18,8 @@ public class InjectionIssueNoteEventHandler
     , ILocalEventHandler<SfsCreatedEntityEventData<InjectionIssueNote>>
     , ILocalEventHandler<SfsCreatedEntityEventData<List<InjectionIssueNote>>>
 {
-
+    //线边仓领料单
-    private const EnumExchangeDataType ExchangeDataType = EnumExchangeDataType.InjectionIssue;
+    private const EnumExchangeDataType ExchangeDataType = EnumExchangeDataType.Issue;
 
     [UnitOfWork]
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<InjectionIssueNote> eventData)

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

@@ -0,0 +1,107 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.EventBus;
+using Volo.Abp.Uow;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Event;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Notes.IssueNotes;
+
+namespace Win_in.Sfs.Wms.Store.Event.DataExchanges;
+
+/// <summary>
+/// Kitting区=>装配线边库移记录传给TYRP(线边仓领料单)
+/// </summary>
+public class KittingIssueNoteEventHandler
+    : StoreDataExchangeEventHandlerBase<KittingIssueNote>
+    , ILocalEventHandler<SfsCreatedEntityEventData<KittingIssueNote>>
+    , ILocalEventHandler<SfsCreatedEntityEventData<List<KittingIssueNote>>>
+{
+    //Kitting区 线边仓领料单
+    private const EnumExchangeDataType ExchangeDataType = EnumExchangeDataType.Issue;
+
+    [UnitOfWork]
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<KittingIssueNote> eventData)
+    {
+        var entity = eventData.Entity;
+        await AddExchangeDataAsync(entity).ConfigureAwait(false);
+    }
+
+    [UnitOfWork]
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<KittingIssueNote>> eventData)
+    {
+        var entities = eventData.Entity;
+        await AddExchangeDataAsync(entities).ConfigureAwait(false);
+    }
+
+    protected override async Task AddExchangeDataAsync(List<KittingIssueNote> entities)
+    {
+        var dtos = ObjectMapper.Map<List<KittingIssueNote>, List<KittingIssueNoteDTO>>(entities);
+        foreach (var detail in dtos.SelectMany(dto => dto.Details))
+        {
+            if (string.IsNullOrEmpty(detail.HandledFromLocationErpCode))
+            {
+                var location = await LocationAclService.GetByCodeAsync(detail.HandledFromLocationCode).ConfigureAwait(false);
+                if (location != null)
+                {
+                    detail.HandledFromLocationErpCode = location.ErpLocationCode;
+                    detail.HandledFromLocationGroup = location.LocationGroupCode;
+                    detail.HandledFromLocationArea = location.AreaCode;
+
+                    if (string.IsNullOrEmpty(detail.HandledFromWarehouseCode))
+                    {
+                        detail.HandledFromWarehouseCode = location.WarehouseCode;
+                    }
+                }
+            }
+
+            if (string.IsNullOrEmpty(detail.HandledToLocationErpCode))
+            {
+                var location = await LocationAclService.GetByCodeAsync(detail.HandledToLocationCode).ConfigureAwait(false);
+                if (location != null)
+                {
+                    detail.HandledToLocationErpCode = location.ErpLocationCode;
+                    detail.HandledToLocationGroup = location.LocationGroupCode;
+                    detail.HandledToLocationArea = location.AreaCode;
+
+                    if (string.IsNullOrEmpty(detail.HandledToWarehouseCode))
+                    {
+                        detail.HandledToWarehouseCode = location.WarehouseCode;
+                    }
+                }
+            }
+
+        }
+
+        var toErpDto = new List<KittingIssueNoteDTO>();
+        foreach (var item in dtos)
+        {
+            if (item.Details != null && item.Details.Count != 0)
+            {
+                toErpDto.Add(item);
+            }
+        }
+
+        //2023-12-6要求同储位不传入接口  按历史规则
+        var result = new List<KittingIssueNoteDTO>();
+        foreach (var kittingIssueNoteDto in toErpDto)
+        {
+            kittingIssueNoteDto.Details.RemoveAll(p => p.HandledFromLocationErpCode == p.HandledToLocationErpCode);
+            if (kittingIssueNoteDto.Details.Count > 0)
+            {
+                result.Add(kittingIssueNoteDto);
+            }
+        }
+
+        if (result.Count > 0)
+        {
+            var exchangeDataerp =
+                await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.ERP, ExchangeDataType, result)
+                    .ConfigureAwait(false);
+            await AddManyAsync(exchangeDataerp).ConfigureAwait(false);
+        }
+    }
+
+}

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

@@ -14,16 +14,15 @@ using ILocationAclService = Win_in.Sfs.Wms.Store.Domain.Acl.Location.ILocationAc
 
 namespace Win_in.Sfs.Wms.Store.Event.DataExchanges
 {
+    /// <summary>
+    /// 三方库库移记录传给TYRP(储位调拨单)
+    /// </summary>
     public class ThirdLocationNoteEventHandler :
         StoreDataExchangeEventHandlerBase<ThirdLocationNote>
         , ILocalEventHandler<SfsCreatedEntityEventData<ThirdLocationNote>>
     {
-        private readonly Domain.Acl.Location.ILocationAclService _locationAclService;
+        //三方库 储位调拨单
-
+        private const EnumExchangeDataType ExchangeDataType = EnumExchangeDataType.Transfer;               
-        public ThirdLocationNoteEventHandler(ILocationAclService locationAclService)
-        {
-            _locationAclService = locationAclService;
-        }
 
         [UnitOfWork]
         public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<ThirdLocationNote> eventData)
@@ -32,11 +31,22 @@ namespace Win_in.Sfs.Wms.Store.Event.DataExchanges
             await AddExchangeDataAsync(entity).ConfigureAwait(false);
         }
 
+        [UnitOfWork]
+        public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<ThirdLocationNote>> eventData)
+        {
+            var entities = eventData.Entity;
+            await AddExchangeDataAsync(entities).ConfigureAwait(false);
+        }
+
         protected override async Task AddExchangeDataAsync(List<ThirdLocationNote> entities)
         {
             var dtos = ObjectMapper.Map<List<ThirdLocationNote>, List<ThirdLocationNoteDTO>>(entities);
+            foreach (var detail in dtos.SelectMany(dto => dto.Details))
+            {
+                await detail.TrySetLocationAsync(LocationAclService).ConfigureAwait(false);
+            }
 
-            var exchangeData = await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.ERP, EnumExchangeDataType.Transfer, dtos).ConfigureAwait(false);
+            var exchangeData = await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.ERP, ExchangeDataType, dtos).ConfigureAwait(false);
             await AddManyAsync(exchangeData).ConfigureAwait(false);
 
         }

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

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Castle.Components.DictionaryAdapter;
 using Volo.Abp.EventBus;
 using Volo.Abp.Uow;
 using Win_in.Sfs.Basedata.Application.Contracts;
@@ -183,6 +184,8 @@ public class KittingIssueJobEventHandler :
                     detailInput.RecommendToLocationErpCode = detail.RecommendToLocationErpCode;
                     detailInput.RecommendToWarehouseCode = detail.RecommendToWarehouseCode;
 
+                    input.Details = new EditableList<TransferLibRequestDetailInput>() { detailInput };
+
                     await _transferLibRequestAppService.CreateAsync(input).ConfigureAwait(false);
                 }
             }