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

be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Job/EnumJobStatus.cs

@@ -45,5 +45,11 @@ public enum EnumJobStatus
     /// 作废
     /// </summary>
     [Display(Name = "作废")]
-    Cancelled = 9
+    Cancelled = 9,
+
+    /// <summary>
+    /// 等待
+    /// </summary>
+    [Display(Name = "等待")]
+    Wait=30,
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionJobDTO.cs

@@ -42,5 +42,4 @@ public class InjectionJobDTO : SfsJobDTOBase<InjectionJobDetailDTO>
     /// </summary>
     [Display(Name = "使用在途库")]
     public bool UseOnTheWayLocation { get; set; }
-
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/IInjectionJobAppService.cs

@@ -8,7 +8,7 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 public interface IInjectionJobAppService
     : ISfsJobAppServiceBase<InjectionJobDTO, SfsJobRequestInputBase, InjectionJobCheckInput, InjectionJobEditInput>
 {
-    Task<List<InjectionJobDTO>> CheckJobExistByItemCodeAndLocationCode(string itemCode, string locationCode);
+    Task<List<InjectionJobDTO>> CheckJobExistByItemCodeAndLocationCodeAsync(string itemCode, string locationCode);
 
     Task CancelByMaterialRequestAsync(string injectionNumber);
 
@@ -22,5 +22,4 @@ public interface IInjectionJobAppService
     /// </summary>
     /// <returns></returns>
     Task<InjectionJobDTO> SaveDetail_SplitPackingAsync(SplitPacking_UpdateJobDetailInput input);
-
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionJobs/InjectionJobAppService.cs

@@ -15,6 +15,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
 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.Notes;
 
 namespace Win_in.Sfs.Wms.Store.Application;
 
@@ -22,7 +23,7 @@ namespace Win_in.Sfs.Wms.Store.Application;
 [Route($"{StoreConsts.RootPath}injection-job")]
 public class InjectionJobAppService
     : SfsJobAppServiceBase<InjectionJob, InjectionJobDetail, InjectionJobDTO, SfsJobRequestInputBase, InjectionJobCheckInput, InjectionJobEditInput>,
-    IInjectionJobAppService
+    IInjectionJobAppService,ITransferLibCallback
 {
     private readonly IInjectionJobManager _injectionJobManager;
 
@@ -33,6 +34,16 @@ public class InjectionJobAppService
         _injectionJobManager = injectionJobManager;
     }
 
+    public override Task<List<InjectionJobDTO>> CreateManyAsync(List<InjectionJobEditInput> inputs)
+    {
+        return base.CreateManyAsync(inputs);
+    }
+
+    public override Task<InjectionJobDTO> CreateAsync(InjectionJobEditInput input)
+    {
+        return base.CreateAsync(input);
+    }
+
     /// <summary>
     /// 根据物品和库位 检查是否存在发料任务
     /// </summary>
@@ -42,7 +53,7 @@ public class InjectionJobAppService
     /// <exception cref="NotImplementedException"></exception>
     [Authorize]
     [HttpGet("check-job-exist")]
-    public virtual async Task<List<InjectionJobDTO>> CheckJobExistByItemCodeAndLocationCode(string itemCode,
+    public virtual async Task<List<InjectionJobDTO>> CheckJobExistByItemCodeAndLocationCodeAsync(string itemCode,
         string locationCode)
     {
         var entities = await _repository.GetListAsync(c =>
@@ -141,4 +152,10 @@ public class InjectionJobAppService
         var ret = ObjectMapper.Map<InjectionJob, InjectionJobDTO>(entity);
         return ret;
     }
+
+    [HttpPost("Do-Call-Back")]
+    public Tuple<bool?, string> DoTransferLibCallback(string businessType, string requestNum, string jobNum)
+    {
+        throw new NotImplementedException();
+    }
 }

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

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -6,7 +5,9 @@ using Volo.Abp.EventBus;
 using Volo.Abp.Uow;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 using Win_in.Sfs.Shared.Event;
+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;
@@ -16,16 +17,26 @@ namespace Win_in.Sfs.Wms.Store.Event.BusinessJob;
 public class InjectionJobEventHandler :
     StoreEventHandlerBase
     , ILocalEventHandler<SfsCompletedEntityEventData<InjectionJob>>
+    , ILocalEventHandler<SfsCreatedEntityEventData<InjectionJob>>
+    , ILocalEventHandler<SfsCreatedEntityEventData<List<InjectionJob>>>
 {
     private const EnumTransType TransType = EnumTransType.Issue;
 
     private readonly IInjectionNoteAppService _injectionNoteAppService;
+    private readonly IBalanceAppService _balanceAppService;
+    private readonly IExpectOutAppService _expectOutAppService;
     private readonly ILocationAppService _locationAppService;
+    private readonly ITransferLibRequestAppService _transferLibRequestAppService;
 
-    public InjectionJobEventHandler(IInjectionNoteAppService injectionNoteAppService, ILocationAppService locationAppService)
+    public InjectionJobEventHandler(IInjectionNoteAppService injectionNoteAppService,
+        IBalanceAppService balanceAppService, IExpectOutAppService expectOutAppService,
+        ILocationAppService locationAppService, ITransferLibRequestAppService transferLibRequestAppService)
     {
         _injectionNoteAppService = injectionNoteAppService;
+        _balanceAppService = balanceAppService;
+        _expectOutAppService = expectOutAppService;
         _locationAppService = locationAppService;
+        _transferLibRequestAppService = transferLibRequestAppService;
     }
 
     /// <summary>
@@ -41,8 +52,138 @@ public class InjectionJobEventHandler :
         await _injectionNoteAppService.CreateAsync(injectionNote).ConfigureAwait(false);
     }
 
+    /// <summary>
+    ///     创建后
+    /// </summary>
+    /// <param name="eventData"></param>
+    /// <returns></returns>
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<InjectionJob> eventData)
+    {
+        var entity = eventData.Entity;
+
+        await CreateExpectOutAsync(entity).ConfigureAwait(false);
+
+        await CreateTransferLibAsync(entity).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    ///     批量创建后
+    /// </summary>
+    /// <param name="eventData"></param>
+    /// <returns></returns>
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<InjectionJob>> eventData)
+    {
+        var entitys = eventData.Entity;
+
+        foreach (var entity in entitys)
+        {
+            await CreateExpectOutAsync(entity).ConfigureAwait(false);
+
+            await CreateTransferLibAsync(entity).ConfigureAwait(false);
+        }
+    }
+
     #region 私有
 
+    /// <summary>
+    ///     创建预计出
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    private async Task CreateExpectOutAsync(InjectionJob entity)
+    {
+        var expectOutEditInputs = new List<ExpectOutEditInput>();
+        foreach (var detail in entity.Details)
+        {
+            var balanceDto = await _balanceAppService
+                .GetRealQtyByPackingCodeAndItemCodeAndLocationCodeAndStatusAsync(detail.RecommendPackingCode,
+                    detail.ItemCode, detail.RecommendFromLocationCode, EnumInventoryStatus.OK).ConfigureAwait(false);
+
+            var inputoExpectOutEditInput = new ExpectOutEditInput();
+            inputoExpectOutEditInput.JobNumber = entity.Number;
+            inputoExpectOutEditInput.ItemCode = detail.ItemCode;
+            inputoExpectOutEditInput.Qty = balanceDto.Qty;
+            inputoExpectOutEditInput.LocationCode = balanceDto.LocationCode;
+            inputoExpectOutEditInput.ArriveDate = balanceDto.ArriveDate;
+            inputoExpectOutEditInput.ContainerCode = balanceDto.ContainerCode;
+            inputoExpectOutEditInput.ExpireDate = balanceDto.ExpireDate;
+            inputoExpectOutEditInput.ItemDesc1 = balanceDto.ItemDesc1;
+            inputoExpectOutEditInput.ItemDesc2 = balanceDto.ItemDesc2;
+            inputoExpectOutEditInput.ItemName = balanceDto.ItemName;
+            inputoExpectOutEditInput.LocationArea = balanceDto.LocationArea;
+            inputoExpectOutEditInput.LocationGroup = balanceDto.LocationGroup;
+            inputoExpectOutEditInput.LocationErpCode = balanceDto.LocationErpCode;
+            inputoExpectOutEditInput.PackingCode = balanceDto.PackingCode;
+            inputoExpectOutEditInput.Lot = balanceDto.Lot;
+            inputoExpectOutEditInput.ProduceDate = balanceDto.ProduceDate;
+            inputoExpectOutEditInput.Status = balanceDto.Status;
+            inputoExpectOutEditInput.Uom = balanceDto.Uom;
+            inputoExpectOutEditInput.SupplierBatch = balanceDto.SupplierBatch;
+            inputoExpectOutEditInput.WarehouseCode= balanceDto.WarehouseCode;
+
+            expectOutEditInputs.Add(inputoExpectOutEditInput);
+        }
+
+        await _expectOutAppService.AddManyAsync(expectOutEditInputs).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// 根据是否在 第一层 来创建 是否生成库移任务
+    /// </summary>
+    /// <returns></returns>
+    private async Task CreateTransferLibAsync(InjectionJob injectionJob)
+    {
+        foreach (var detail in injectionJob.Details)
+        {
+            var input = new TransferLibRequestEditInput();
+            input.CallBusinessType = nameof(IInjectionJobAppService);
+            input.CallJobNumber = injectionJob.Number;
+            input.CallRequestNumber = injectionJob.InjectionRequestNumber;
+            input.CallServerName = "Win_in.Sfs.Wms.Store.Application.InjectionJobAppService";
+            input.Type = "Transfer_Warehouse";
+            input.UseOnTheWayLocation = true;
+            var detailInput = new TransferLibRequestDetailInput();
+            detailInput.CallBusinessType = nameof(IInjectionJobAppService);
+            detailInput.CallRequestNumber = injectionJob.InjectionRequestNumber;
+            detailInput.CallServerName = "Win_in.Sfs.Wms.Store.Application.InjectionJobAppService";
+            detailInput.CallJobNumber = injectionJob.Number;
+
+            detailInput.JobStatus = EnumJobStatus.Open;
+            detailInput.ItemCode=detail.ItemCode;
+            detailInput.Qty = detail.RecommendQty;
+            detailInput.ArriveDate = detailInput.ArriveDate;
+            detailInput.ExpireDate=detailInput.ExpireDate;
+            detailInput.ProduceDate = detail.RecommendProduceDate;
+
+            detailInput.ToLocationCode = detail.ToLocationCode;
+            detailInput.ToWarehouseCode=detail.ToWarehouseCode;
+            detailInput.ToLocationErpCode=detail.ToLocationErpCode;
+            detailInput.ToLocationGroup=detail.ToLocationGroup;
+            detailInput.ToLocationArea= detail.ToLocationArea;
+
+            detailInput.FromLocationCode = detail.RecommendFromLocationCode;
+            detailInput.FromLocationArea = detail.RecommendFromLocationArea;
+            detailInput.FromLocationGroup=detail.RecommendFromLocationGroup;
+            detailInput.FromLocationErpCode= detail.RecommendFromLocationErpCode;
+            detailInput.FromWarehouseCode= detail.RecommendFromWarehouseCode;
+
+            detailInput.ToLocationCode = "YL1";
+            detailInput.ToLocationErpCode = "YL1";
+            detailInput.ToLocationGroup = "YL1";
+            detailInput.ToLocationArea = "YL1";
+
+            detailInput.FromLot = detail.RecommendLot;
+            detailInput.ToLot=detail.RecommendLot;
+            detailInput.Qty=detail.RecommendQty;
+            detailInput.StdPackQty = detail.StdPackQty;
+            detailInput.Uom=detail.Uom;
+            detailInput.SupplierBatch = detail.RecommendSupplierBatch;
+
+            await _transferLibRequestAppService.CreateAsync(input);
+        }
+        
+    }
+
     /// <summary>
     ///     创建补料记录实体
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/InjectionRequestEventHandler.cs

@@ -27,19 +27,17 @@ public class InjectionRequestEventHandler
 {
     private readonly IInjectionJobAppService _injectionJobAppService;
     private readonly IProductionLineAppService _productionLineAppService;
-    private readonly IInjectionRequestManager _injectionRequestManager;
     private readonly IProductionLineItemAppService _productionLineItemAppService;
     private readonly ILocationAppService _locationAppService;
     private readonly IBalanceAppService _balanceAppService;
 
     public InjectionRequestEventHandler(
         IInjectionJobAppService injectionJobAppService, IProductionLineAppService productionLineAppService,
-        IInjectionRequestManager injectionRequestManager, ILocationAppService locationAppService,
+        ILocationAppService locationAppService,
         IBalanceAppService balanceAppService, IProductionLineItemAppService productionLineItemAppService)
     {
         _injectionJobAppService = injectionJobAppService;
         _productionLineAppService = productionLineAppService;
-        _injectionRequestManager = injectionRequestManager;
         _locationAppService = locationAppService;
         _balanceAppService = balanceAppService;
         _productionLineItemAppService = productionLineItemAppService;
@@ -152,7 +150,8 @@ public class InjectionRequestEventHandler
             var job = jobs.FirstOrDefault(p => p.WorkGroupCode == fromLocation?.WorkGroupCode);
             if (job == null || job.Details.Any(p => p.ToLocationCode != injectionRequestDetail.ToLocationCode))
             {
-                job = await BuildInjectionJobCreateInputWithQtyTypeAsync(injectionRequest, fromLocation).ConfigureAwait(false);
+                job = await BuildInjectionJobCreateInputWithQtyTypeAsync(injectionRequest, fromLocation)
+                    .ConfigureAwait(false);
                 jobs.Add(job);
             }
 
@@ -201,7 +200,8 @@ public class InjectionRequestEventHandler
     /// <param name="injectionRequest"></param>
     /// <param name="fromLocation"></param>
     /// <returns></returns>
-    private async Task<InjectionJobEditInput> BuildInjectionJobCreateInputWithQtyTypeAsync(InjectionRequest injectionRequest,
+    private async Task<InjectionJobEditInput> BuildInjectionJobCreateInputWithQtyTypeAsync(
+        InjectionRequest injectionRequest,
         LocationDTO fromLocation)
     {
         InjectionJobEditInput job;
@@ -266,7 +266,9 @@ public class InjectionRequestEventHandler
             foreach (var recommend in recommendList)
             {
                 //拿走需求量
-                var detail = await BuildInjectionJobDetailWithQtyTypeAsync(injectionRequestDetail, recommend, toLocationGroupCode)
+                var detail =
+                    await BuildInjectionJobDetailWithQtyTypeAsync(injectionRequestDetail, recommend,
+                            toLocationGroupCode)
                         .ConfigureAwait(false);
                 if (injectionRequest.UseOnTheWayLocation)
                 {
@@ -347,6 +349,7 @@ public class InjectionRequestEventHandler
         (InjectionRequest injectionRequest)
     {
         var inputJobs = new List<InjectionJobEditInput>();
+        var inputExpectOutEditInput = new ExpectOutEditInput();
         //已用的库存的箱码集合
         var useBalanceList = new List<string>();
 
@@ -369,9 +372,9 @@ public class InjectionRequestEventHandler
                 throw new UserFriendlyException($"库位【{inputDetailTemplate.ToLocationCode}】没有对应的【生产线】");
             }
 
-            var productLineCodeAndItemCode = (await _productionLineItemAppService
+            var productLineCodeAndItemCode = await _productionLineItemAppService
                 .GetByProductLineCodeAndItemCodeAsync(productionLineDto.Code, inputDetailTemplate.ItemCode)
-                .ConfigureAwait(false));
+                .ConfigureAwait(false);
             if (productLineCodeAndItemCode == null)
             {
                 throw new UserFriendlyException(
@@ -387,16 +390,15 @@ public class InjectionRequestEventHandler
                 Locations = JsonSerializer.Deserialize<List<string>>(productLineCodeAndItemCode
                     .RawLocationCodeListJson)
             };
-
-            //所有可用库存
             var usableList = await _balanceAppService.GetUsableListAsync(input).ConfigureAwait(false);
             usableList = usableList.Where(p => !useBalanceList.Contains(p.PackingCode)).ToList();
+
+            for (var i = 0; i < sumBoxQty; i++)
+            {
                 var firstUsable = usableList.First();
                 useBalanceList.Add(firstUsable.PackingCode);
                 usableList.Remove(firstUsable);
 
-            for (int i = 0; i < sumBoxQty; i++)
-            {
                 var injectionJobEditInput =
                     await BuildInjectionJobCreateInputWithBoxQtyTypeAsync(injectionRequest, inputDetailTemplate,
                             firstUsable)
@@ -416,7 +418,8 @@ public class InjectionRequestEventHandler
     /// <param name="injectionRequestDetail"></param>
     /// <param name="balanceDtos"></param>
     /// <returns></returns>
-    private async Task<InjectionJobEditInput> BuildInjectionJobCreateInputWithBoxQtyTypeAsync(InjectionRequest injectionRequest,
+    private async Task<InjectionJobEditInput> BuildInjectionJobCreateInputWithBoxQtyTypeAsync(
+        InjectionRequest injectionRequest,
         InjectionRequestDetail injectionRequestDetail, BalanceDTO balanceDtos)
     {
         InjectionJobEditInput job;
@@ -429,7 +432,8 @@ public class InjectionRequestEventHandler
         job.Worker = injectionRequest.Worker;
         job.InjectionRequestNumber = injectionRequest.Number;
 
-        job.Details.Add(await BuildInjectionJobDetailWithBoxQtyTypeAsync(injectionRequestDetail, balanceDtos).ConfigureAwait(false));
+        job.Details.Add(await BuildInjectionJobDetailWithBoxQtyTypeAsync(injectionRequestDetail, balanceDtos)
+            .ConfigureAwait(false));
 
         await Task.CompletedTask.ConfigureAwait(false);
 
@@ -446,8 +450,6 @@ public class InjectionRequestEventHandler
     private async Task<InjectionJobDetailInput> BuildInjectionJobDetailWithBoxQtyTypeAsync(
         InjectionRequestDetail injectionRequestDetail, BalanceDTO balance)
     {
-        //ProductionLineDTO prodLine = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationGroupCode).ConfigureAwait(false);
-
         var detail = ObjectMapper.Map<BalanceDTO, InjectionJobDetailInput>(balance);
         detail.RequestLocationCode = injectionRequestDetail.ToLocationCode;
         detail.WorkStation = injectionRequestDetail.WorkStation;
@@ -475,8 +477,8 @@ public class InjectionRequestEventHandler
         detail.ToLocationErpCode = injectionRequestDetail.ToLocationErpCode;
         detail.ToLocationArea = injectionRequestDetail.ToLocationArea;
         detail.ToWarehouseCode = injectionRequestDetail.ToWarehouseCode;
+        detail.ToLocationGroup= injectionRequestDetail.ToLocationGroup;
 
-        //detail.ProdLine = prodLine == null ? toLocationGroupCode : prodLine.Code;
         detail.ProdLine = injectionRequestDetail.ToLocationCode;
         await Task.CompletedTask.ConfigureAwait(false);
         return detail;

build/src/docker/publish/conf/settings/appsettings.Development.json

@@ -114,8 +114,8 @@
       "BaseUrl": "http://dev.ccwin-in.com:60083/"
     },
     "BaseData": {
-      //"BaseUrl": "http://localhost:59094/"
-      "BaseUrl": "http://dev.ccwin-in.com:60084/"
+      "BaseUrl": "http://localhost:59094/"
+      //"BaseUrl": "http://dev.ccwin-in.com:60084/"
     },
     "Default": {
       "BaseUrl": "http://dev.ccwin-in.com:60083/"