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

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingImportInput.cs

@@ -5,6 +5,18 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
 [Display(Name = "Kitting箱")]
 public class KittingImportInput : SfsBaseDataImportInputBase
 {
+
+
+    [Display(Name = "Kitting编码")]
+    public string Code { get; set; }
+
+    /// <summary>
+    ///     Kitting名称
+    /// </summary>
+    [Display(Name = "Kitting名称")]
+    public string Name { get; set; }
+
+
     /// <summary>
     ///     Kitting编码
     /// </summary>
@@ -34,14 +46,6 @@ public class KittingImportInput : SfsBaseDataImportInputBase
 
 
 
-    [Display(Name = "Kitting编码")]
-    public string Code { get; set; }
-
-    /// <summary>
-    ///     Kitting名称
-    /// </summary>
-    [Display(Name = "Kitting名称")]
-    public string Name { get; set; }
    
    
 

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs

@@ -37,13 +37,21 @@ public class KittingAppService : SfsBaseDataWithCodeAppServiceBase<Kitting, Kitt
 
     private readonly IExportImportService _excelService;
 
+    private new readonly IItemBasicRepository _itmBasicRepository   ;
+
+
+
     private readonly IKittingManager _manager;
 
-    public KittingAppService(IKittingRepository repository, IDistributedCache<KittingDTO> cache, IKittingManager manager, IExportImportService excelService) : base(repository,cache)
+    public KittingAppService(IKittingRepository repository, IDistributedCache<KittingDTO> cache, IKittingManager manager,
+        IExportImportService excelService,
+        IItemBasicRepository itmBasicRepository
+        ) : base(repository,cache)
     {
         _repository = repository;
         _manager = manager;
         _excelService = excelService;
+        _itmBasicRepository = itmBasicRepository;
         //base.CreatePolicyName = KittingPermissions.Create;
         //base.UpdatePolicyName = KittingPermissions.Update;
         //base.DeletePolicyName = KittingPermissions.Delete;
@@ -151,13 +159,40 @@ public class KittingAppService : SfsBaseDataWithCodeAppServiceBase<Kitting, Kitt
         var importList= _excelService.Import<KittingImportInput>(inputFileBytes).ToList();
         var checklist=importList.GroupBy(p => new { p.Code, p.ItemCode }).Where(g => g.Count() > 1).Select(p => new { Code = p.Key.Code, PartCode = p.Key.ItemCode });//导入重复报错                                                                                                                                                              //检测是否导入重复
         List<KittingErrorDto> errors = new List<KittingErrorDto>();
+
+
+        var importPartList = importList.Select(p => p.ItemCode).Distinct().ToList();
+        var partContainList = await _itmBasicRepository.GetListAsync(p => importPartList.Distinct().Contains(p.Code)).ConfigureAwait(false);
+
+        var partCodeList1 = partContainList.Select(p => p.Code);
+
+        var errorQuery = from itm in importPartList join itm1 in partCodeList1 on itm equals itm1 into temp from tm in temp.DefaultIfEmpty() where tm == null select itm;
+
+        if (errorQuery.Any())
+        {
+            foreach (var error in errorQuery)
+            {
+                errors.Add(new KittingErrorDto() { Code = "", PartCode = error, Content = "不在零件基础信息!" });
+            }
+        }
         if (checklist.Any())
         {
             foreach (var error in checklist) {
                 errors.Add(new KittingErrorDto() { Code=error.Code,PartCode=error.PartCode, Content="记录有重复!" });
             }
         }
-        var codeList=importList.Select(p=>p.Code).Distinct().ToList();
+        if (errors.Count > 0)
+        {
+            var fileContent = _excelService.Export(errors);
+            return new TestResult(fileContent.FileContents, ExportImportService.ContentType) { FileDownloadName = "错误信息" };
+        }
+        foreach (var itm in importList)
+        {
+            itm.ItemName = partContainList.FirstOrDefault(p => p.Code == itm.ItemCode)?.Name;
+            itm.ItemDesc1 = partContainList.FirstOrDefault(p => p.Code == itm.ItemCode)?.Desc1;
+            itm.ItemDesc2 = partContainList.FirstOrDefault(p => p.Code == itm.ItemCode)?.Desc2;
+        }
+        var codeList = importList.Select(p => p.Code).Distinct().ToList();
         var includeList = query.Where(p => codeList.Contains(p.Code)).ToList();
         var existCodeList = includeList.Select(p => p.Code).ToList();
         var newCodeList = from itm in codeList
@@ -188,6 +223,8 @@ public class KittingAppService : SfsBaseDataWithCodeAppServiceBase<Kitting, Kitt
                 newKittingInputList.Add(kitting);
             }
             var kittingList = ObjectMapper.Map<List<KittingEditInput>, List<Kitting>>(newKittingInputList);
+       
+       
             foreach (var itm in kittingList)
             {
                 var id = Guid.NewGuid();
@@ -196,8 +233,10 @@ public class KittingAppService : SfsBaseDataWithCodeAppServiceBase<Kitting, Kitt
                 {
                     detail.SetId(Guid.NewGuid());
                     detail.MasterId = id;
+                  
                 }
             }
+
             await _repository.InsertManyAsync(kittingList).ConfigureAwait(false);   
  
             #endregion

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ProductionLineItems/ProductionLineItemAppService.cs

@@ -16,17 +16,10 @@ public class ProductionLineItemAppService :
     SfsBaseDataAppServiceBase<ProductionLineItem, ProductionLineItemDTO, SfsBaseDataRequestInputBase,
         ProductionLineItemEditInput, ProductionLineItemImportInput>, IProductionLineItemAppService
 {
-    private new readonly IProductionLineItemRepository _repository;
-
     public ProductionLineItemAppService(
-        IProductionLineItemRepository repository
-        , IDistributedCache<ProductionLineItemDTO> cache
-        , IProductionLineItemManager manager
-        , IProductionLineAppService prodLineAppService
+        IProductionLineItemRepository repository, IDistributedCache<ProductionLineItemDTO> cache
     ) : base(repository, cache)
     {
-        _repository = repository;
-
         base.CreatePolicyName = ProductionLineItemPermissions.Create;
         base.UpdatePolicyName = ProductionLineItemPermissions.Update;
         base.DeletePolicyName = ProductionLineItemPermissions.Delete;
@@ -36,7 +29,7 @@ public class ProductionLineItemAppService :
     public virtual async Task UpsertAsync(ProductionLineItemEditInput input)
     {
         var entity = ObjectMapper.Map<ProductionLineItemEditInput, ProductionLineItem>(input);
-        await _repository.UpsertAsync(entity).ConfigureAwait(false);
+        await _repository.UpdateAsync(entity).ConfigureAwait(false);
     }
 
     protected override async Task ValidateImportModelAsync(ProductionLineItemImportInput importInput,

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ProductionLineItems/ProductionLineItem.cs

@@ -14,7 +14,6 @@ public class ProductionLineItem : SfsBaseDataAggregateRootBase
     /// <summary>
     ///     生产线代码
     /// </summary>
-    [Key]
     [Display(Name = "生产线代码")]
     [Required(ErrorMessage = "{0}是必填项")]
     [IgnoreUpdate]

be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/ProductionLineItems/ProductionLineItemDbContextModelCreatingExtensions.cs

@@ -17,21 +17,8 @@ public static class ProductionLineItemDbContextModelCreatingExtensions
             b.ConfigureByConvention();
             //Configure Sfs base properties
             b.ConfigureSfsBase();
-
-            //Properties
-            //b.Property(x => x.ProdLineId).IsRequired();
-            //b.Property(x => x.ItemId).IsRequired();
-            //b.Property(x => x.BomId).IsRequired();
-            //b.Property(x => x.RoutingId).IsRequired();
-
             b.Property(x => x.ProdLineCode).IsRequired();
             b.Property(x => x.ItemCode).IsRequired();
-
-            //Relations
-            //None
-
-            //Indexes
-            b.HasIndex(q => new { q.ProdLineCode, q.ItemCode }).IsUnique();
         });
     }
 }

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

@@ -15,6 +15,7 @@ public interface IChassisOperationSequenceAppService
     /// </summary>
     /// <param name="kittingCode"></param>
     /// <param name="newChassisSortNumber"></param>
+    /// <param name="chassisNumber"></param>
     /// <returns></returns>
-    Task UpdateChassisSortNumberByKittingCodeAsync(string kittingCode, long newChassisSortNumber);
+    Task UpdateChassisSortNumberByKittingCodeAsync(string kittingCode, long newChassisSortNumber,string chassisNumber);
 }

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

@@ -41,7 +41,7 @@ public class ChassisOperationSequenceAppService
     /// <param name="newChassisSortNumber"></param>
     /// <returns></returns>
     [HttpPost("update-chassis-sort-number-by-kitting-code")]
-    public async Task UpdateChassisSortNumberByKittingCodeAsync(string kittingCode, long newChassisSortNumber)
+    public async Task UpdateChassisSortNumberByKittingCodeAsync(string kittingCode, long newChassisSortNumber, string chassisNumber)
     {
         var chassisOperationSequence =
             await _repository.FindAsync(p => p.KittingCode == kittingCode).ConfigureAwait(false);
@@ -50,7 +50,7 @@ public class ChassisOperationSequenceAppService
         {
             var input= new ChassisOperationSequenceEditInput();
             input.KittingCode=kittingCode;
-            input.ChassisNumber = string.Empty;
+            input.ChassisNumber = chassisNumber;
             input.ChassisSortNumber = newChassisSortNumber;
             await CreateAsync(input).ConfigureAwait(false);
         }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/KittingPackagingNotes/KittingPackagingNoteAppService.cs

@@ -3,13 +3,18 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Castle.Components.DictionaryAdapter;
+using DocumentFormat.OpenXml.Spreadsheet;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp;
+using Volo.Abp.Guids;
+using Volo.Abp.ObjectMapping;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Basedata.Boms.DTOs;
 using Win_in.Sfs.Basedata.Domain;
 using Win_in.Sfs.Basedata.Domain.Shared;
+using Win_in.Sfs.Shared.Application;
+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.Domain.Shared;
@@ -35,20 +40,25 @@ public class KittingPackagingNoteAppService
     private readonly IChassisOperationSequenceAppService _chassisOperationSequenceAppService;
     private readonly IBomAppService _bomAppService;
     private readonly IKittingAppService _kittingAppService;
+    private readonly IKittingPackagingNoteManager _kittingPackagingNoteManager;
 
     public KittingPackagingNoteAppService(
-        IKittingPackagingNoteRepository repository, IChassisOperationSequenceAppService chassisOperationSequenceAppService, IBomAppService bomAppService, IKittingAppService kittingAppService) : base(repository)
+        IKittingPackagingNoteRepository repository, IChassisOperationSequenceAppService chassisOperationSequenceAppService, IBomAppService bomAppService, IKittingAppService kittingAppService, IKittingPackagingNoteManager kittingPackagingNoteManager) : base(repository)
     {
         _chassisOperationSequenceAppService = chassisOperationSequenceAppService;
         _bomAppService = bomAppService;
         _kittingAppService = kittingAppService;
+        _kittingPackagingNoteManager = kittingPackagingNoteManager;
     }
 
     [HttpPost("")]
     public override async Task<KittingPackagingNoteDTO> CreateAsync(KittingPackagingNoteEditInput input)
     {
         var sortNumber=input.DepDetails.Max(p => p.ChassisSortNumber);
-        await _chassisOperationSequenceAppService.UpdateChassisSortNumberByKittingCodeAsync(input.KittingCode,sortNumber).ConfigureAwait(false);
+        var maxChassisDetailInputs = input.DepDetails.First(p => p.ChassisSortNumber== sortNumber);
+        input.Details = new EditableList<KittingPackagingNoteDetailInput>();
+
+        await _chassisOperationSequenceAppService.UpdateChassisSortNumberByKittingCodeAsync(input.KittingCode,sortNumber, maxChassisDetailInputs.ChassisNumber).ConfigureAwait(false);
         //所有底盘转换为总成的零件号
         var chassisItemCode = new List<string>();
         var listItemCode=input.DepDetails.Select(p => p.ItemCode);
@@ -91,6 +101,12 @@ public class KittingPackagingNoteAppService
         }
         input.DepDetails.ForEach(p=>p.KittingCode=input.KittingCode);
 
-        return await base.CreateAsync(input).ConfigureAwait(false);
+        var entity = input.ToObject<KittingPackagingNote>();
+        entity.SetIdAndNumberWithDetails(GuidGenerator, await GenerateNumberAsync(typeof(KittingPackagingNote).Name, entity.ActiveDate).ConfigureAwait(false));
+        entity.DepDetails.ForEach(p=>p.SetIdAndNumber(GuidGenerator, entity.Id, entity.Number));
+
+        var result=await _repository.InsertAsync(entity).ConfigureAwait(false);
+        await LocalEventBus.PublishAsync(new SfsCreatedEntityEventData<KittingPackagingNote>(result), false).ConfigureAwait(false);
+        return ObjectMapper.Map<KittingPackagingNote, KittingPackagingNoteDTO>(result);
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/KittingPackagingNotes/KittingPackagingNoteAutoMapperProfile.cs

@@ -11,5 +11,17 @@ public partial class StoreApplicationAutoMapperProfile : Profile
     {
         CreateMap<KittingPackagingNote, KittingPackagingNoteDTO>()
             .ReverseMap();
+
+        CreateMap<KittingPackagingNoteDetail, KittingPackagingNoteDetailDTO>()
+            .ReverseMap();
+
+        CreateMap<KittingPackagingNoteChassisDetail, KittingPackagingNoteChassisDetailDTO>()
+            .ReverseMap();
+
+        CreateMap<KittingPackagingNoteEditInput, KittingPackagingNote>();
+
+        CreateMap<KittingPackagingNoteDetailInput, KittingPackagingNoteDetail>();
+
+        CreateMap<KittingPackagingNoteChassisDetailInput, KittingPackagingNoteChassisDetail>();
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs

@@ -136,5 +136,6 @@ public partial class StoreApplicationAutoMapperProfile : Profile
         ChassisAutoMapperProfile();
 
         ChassisOperationSequenceAutoMapperProfile();
+        KittingPackagingNoteAutoMapperProfile();
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/KittingPackagingNotes/KittingPackagingNote.cs

@@ -18,7 +18,7 @@ public class KittingPackagingNote : SfsStoreAggregateRootBase<KittingPackagingNo
     /// <summary>
     ///     明细（记录Kitting打包中的子物品明细）
     /// </summary>
-    public List<KittingPackagingNoteDetail> Details { get; set; } = new();
+    public override List<KittingPackagingNoteDetail> Details { get; set; } = new();
 
     /// <summary>
     ///     明细（记录底盘相关的信息）

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/KittingPackagingNotes/KittingPackagingNoteDbContextModelCreatingExtensions.cs

@@ -40,7 +40,6 @@ public static class KittingPackagingNoteDbContextModelCreatingExtensions
             //Properties
             b.Property(q => q.KittingCode).HasMaxLength(SfsPropertyConst.CodeLength);
             //Indexes
-            b.HasIndex(q => new { q.KittingCode }).IsUnique();
         });
 
 
@@ -55,7 +54,6 @@ public static class KittingPackagingNoteDbContextModelCreatingExtensions
             //Properties
             b.Property(q => q.KittingCode).HasMaxLength(SfsPropertyConst.CodeLength);
             //Indexes
-            b.HasIndex(q => new { q.KittingCode }).IsUnique();
         });
     }
 }

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

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.EventBus;
+using Volo.Abp.Uow;
+using Win_in.Sfs.Basedata.Application.Contracts;
+using Win_in.Sfs.Shared.Event;
+using Win_in.Sfs.Wms.Inventory.Domain.Acl.Location;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+using ILocationAclService = Win_in.Sfs.Wms.Store.Domain.Acl.Location.ILocationAclService;
+
+namespace Win_in.Sfs.Wms.Store.Event.DataExchanges
+{
+    public class ThirdLocationNoteEventHandler :
+        StoreDataExchangeEventHandlerBase<ThirdLocationNote>
+        , ILocalEventHandler<SfsCreatedEntityEventData<ThirdLocationNote>>
+    {
+        private readonly Domain.Acl.Location.ILocationAclService _locationAclService;
+
+        public ThirdLocationNoteEventHandler(ILocationAclService locationAclService)
+        {
+            _locationAclService = locationAclService;
+        }
+
+        [UnitOfWork]
+        public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<ThirdLocationNote> eventData)
+        {
+            var entity = eventData.Entity;
+            await AddExchangeDataAsync(entity).ConfigureAwait(false);
+        }
+
+
+        protected override async Task AddExchangeDataAsync(List<ThirdLocationNote> entities)
+        {
+            var dtos = ObjectMapper.Map<List<ThirdLocationNote>, List<TransferNoteDTO>>(entities);
+           
+            var exchangeData = await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.ERP, EnumExchangeDataType.Transfer, dtos).ConfigureAwait(false);
+            await AddManyAsync(exchangeData).ConfigureAwait(false);
+
+        }
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/KittingPackagingNoteHandler.cs

@@ -24,13 +24,15 @@ public class KittingPackagingNoteEventHandler
     private readonly IProductionLineAppService _productionLineAppService;
     private readonly IProductionLineItemAppService _productionLineItemAppService;
     private readonly ILocationAppService _locationAppService;
+    private readonly ITransferLogAppService _transferLogAppService;
 
     public KittingPackagingNoteEventHandler(
-        IProductionLineAppService productionLineAppService, ILocationAppService locationAppService, IProductionLineItemAppService productionLineItemAppService)
+        IProductionLineAppService productionLineAppService, ILocationAppService locationAppService, IProductionLineItemAppService productionLineItemAppService, ITransferLogAppService transferLogAppService)
     {
         _productionLineAppService = productionLineAppService;
         _locationAppService = locationAppService;
         _productionLineItemAppService = productionLineItemAppService;
+        _transferLogAppService = transferLogAppService;
     }
 
     [UnitOfWork]
@@ -38,7 +40,7 @@ public class KittingPackagingNoteEventHandler
     {
         var entity = eventData.Entity;
         var transferLogEditInputs = await BuildTransferLogsAsync(entity).ConfigureAwait(false);
-        await TransferLogAppService.AddManyAsync(transferLogEditInputs).ConfigureAwait(false);
+        await _transferLogAppService.AddManyAsync(transferLogEditInputs).ConfigureAwait(false);
     }
 
     [UnitOfWork]
@@ -51,7 +53,7 @@ public class KittingPackagingNoteEventHandler
             transferLogCreateInputs.AddRange(await BuildTransferLogsAsync(entitie).ConfigureAwait(false));
         }
 
-        await TransferLogAppService.AddManyAsync(transferLogCreateInputs).ConfigureAwait(false);
+        await _transferLogAppService.AddManyAsync(transferLogCreateInputs).ConfigureAwait(false);
     }
 
     /// <summary>
@@ -73,7 +75,11 @@ public class KittingPackagingNoteEventHandler
         
         //Kitting线边库位
         var kittingLocation =
-            await LocationAclService.GetFirstByTypeAsync(EnumLocationType.KittingWip).ConfigureAwait(false);
+            await _locationAppService.GetFirstByTypeAsync(EnumLocationType.KittingWip).ConfigureAwait(false);
+        if (kittingLocation == null)
+        {
+            throw new UserFriendlyException("没有设置Kitting线边库位");
+        }
 
         foreach (var detail in kittingPackagingNote.Details.Where(detail => detail.Qty != 0))
         {
@@ -81,14 +87,14 @@ public class KittingPackagingNoteEventHandler
             if (productionLineItemDtos == null)
             {
                 var strProductionLine = string.Empty;
-                productionLineList.ForEach(dto => strProductionLine += " " + dto.Code);
-                throw new UserFriendlyException($"没有在 生产线代码列表中找到【{strProductionLine}】物料代码【{detail.ItemCode}】的配置");
+                productionLineList.ForEach(dto => strProductionLine += dto.Code+ ",");
+                throw new UserFriendlyException($"没有在 【生产线零件】中找到 生产线代码【{strProductionLine.Remove(strProductionLine.Length-1)}】物料代码【{detail.ItemCode}】的配置");
             }
 
             var list = JsonSerializer.Deserialize<List<string>>(productionLineItemDtos.WipLocationCodeListJson);
             if (list == null || list.Count < 1)
             {
-                throw new UserFriendlyException($"没有在 生产线代码【{productionLineItemDtos.ProdLineCode}】物料代码【{detail.ItemCode}】中配置线边库位");
+                throw new UserFriendlyException($"没有在 【生产线零件】中 生产线代码【{productionLineItemDtos.ProdLineCode}】物料代码【{detail.ItemCode}】中配置线边库位");
             }
 
             var assembleFirstLocationCode = list.First();