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.MesAgent/Incoming/MesIncomingBackgroundWorker.cs

@@ -60,58 +60,58 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
             await TransferNoteConverter.ConvertAsync(mesOutsFromExternalList_TransferNote).ConfigureAwait(false);
         }
 
-        //Logger.LogInformation($"Read Scrap");//报废
-        //var scrapReader = workerContext.ServiceProvider.GetRequiredService<ScrapReader>();
-        //var scrapConverter = workerContext.ServiceProvider.GetRequiredService<ScrapConverter>();
-        ////读取并保存Scrap
-        //var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false);
-        ////转换Scrap
-        //await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false);
-
-
-        //Logger.LogInformation($"Read BackFlush");//耗用单
-        //var BackFlushReader = workerContext.ServiceProvider.GetRequiredService<BackFluReader>();
-        //var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService<BackFluConverter>();
-        ////读取并保存BackFlush
-        //var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false);
-        ////转换BackFlush
-        //await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false);
-
-
-        //Logger.LogInformation($"Read TransferNote");//储位调拨
-        //var TransferNoteReader = workerContext.ServiceProvider.GetRequiredService<QtyrfeReader>();
-        //// var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService<QtyrfeConverter>();
-        ////读取并保存TransferNote
-        //var transferNoteFromExternalList = await TransferNoteReader.ReadAsync().ConfigureAwait(false);
-        ////转换TransferNote
-        //await TransferNoteConverter.ConvertAsync(transferNoteFromExternalList).ConfigureAwait(false);
-
-        //Logger.LogInformation($"Read Frozen");//冻结解冻
-        //var FrozenReader = workerContext.ServiceProvider.GetRequiredService<FrozenReader>();
-        //var FrozenConverter = workerContext.ServiceProvider.GetRequiredService<FrozenConverter>();
-        ////读取并保存Frozen
-        //var mesNoteFromExternalList = await FrozenReader.ReadAsync().ConfigureAwait(false);
-        ////转换Frozen
-        //await FrozenConverter.ConvertAsync(mesNoteFromExternalList).ConfigureAwait(false);
-
-
-        //Logger.LogInformation($"Read Delivery");//成品发运
-        //var DeliveryReader = workerContext.ServiceProvider.GetRequiredService<DeliveryReader>();
-        //var DeliveryConverter = workerContext.ServiceProvider.GetRequiredService<DeliveryConverter>();
-        ////读取并保存Delivery
-        //var deliveryNoteFromExternalList = await DeliveryReader.ReadAsync().ConfigureAwait(false);
-        ////转换Delivery
-        //await DeliveryConverter.ConvertAsync(deliveryNoteFromExternalList).ConfigureAwait(false);
-
-
-
-        //Logger.LogInformation($"Read CallMtl");//自动叫料
-        //var CallMtlReader = workerContext.ServiceProvider.GetRequiredService<CallMtlReader>();
-        //var CallMtlConverter = workerContext.ServiceProvider.GetRequiredService<CallMtlConverter>();
-        ////读取并保存Delivery
-        //var callMtlFromExternalList = await CallMtlReader.ReadAsync().ConfigureAwait(false);
-        ////转换Delivery
-        //await CallMtlConverter.ConvertAsync(callMtlFromExternalList).ConfigureAwait(false);
+        Logger.LogInformation($"Read Scrap");//报废
+        var scrapReader = workerContext.ServiceProvider.GetRequiredService<ScrapReader>();
+        var scrapConverter = workerContext.ServiceProvider.GetRequiredService<ScrapConverter>();
+        //读取并保存Scrap
+        var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false);
+        //转换Scrap
+        await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false);
+
+
+        Logger.LogInformation($"Read BackFlush");//耗用单
+        var BackFlushReader = workerContext.ServiceProvider.GetRequiredService<BackFluReader>();
+        var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService<BackFluConverter>();
+        //读取并保存BackFlush
+        var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false);
+        //转换BackFlush
+        await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false);
+
+
+        Logger.LogInformation($"Read TransferNote");//储位调拨
+        var TransferNoteReader = workerContext.ServiceProvider.GetRequiredService<QtyrfeReader>();
+        // var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService<QtyrfeConverter>();
+        //读取并保存TransferNote
+        var transferNoteFromExternalList = await TransferNoteReader.ReadAsync().ConfigureAwait(false);
+        //转换TransferNote
+        await TransferNoteConverter.ConvertAsync(transferNoteFromExternalList).ConfigureAwait(false);
+
+        Logger.LogInformation($"Read Frozen");//冻结解冻
+        var FrozenReader = workerContext.ServiceProvider.GetRequiredService<FrozenReader>();
+        var FrozenConverter = workerContext.ServiceProvider.GetRequiredService<FrozenConverter>();
+        //读取并保存Frozen
+        var mesNoteFromExternalList = await FrozenReader.ReadAsync().ConfigureAwait(false);
+        //转换Frozen
+        await FrozenConverter.ConvertAsync(mesNoteFromExternalList).ConfigureAwait(false);
+
+
+        Logger.LogInformation($"Read Delivery");//成品发运
+        var DeliveryReader = workerContext.ServiceProvider.GetRequiredService<DeliveryReader>();
+        var DeliveryConverter = workerContext.ServiceProvider.GetRequiredService<DeliveryConverter>();
+        //读取并保存Delivery
+        var deliveryNoteFromExternalList = await DeliveryReader.ReadAsync().ConfigureAwait(false);
+        //转换Delivery
+        await DeliveryConverter.ConvertAsync(deliveryNoteFromExternalList).ConfigureAwait(false);
+
+
+
+        Logger.LogInformation($"Read CallMtl");//自动叫料
+        var CallMtlReader = workerContext.ServiceProvider.GetRequiredService<CallMtlReader>();
+        var CallMtlConverter = workerContext.ServiceProvider.GetRequiredService<CallMtlConverter>();
+        //读取并保存Delivery
+        var callMtlFromExternalList = await CallMtlReader.ReadAsync().ConfigureAwait(false);
+        //转换Delivery
+        await CallMtlConverter.ConvertAsync(callMtlFromExternalList).ConfigureAwait(false);
 
         Logger.LogInformation($"Completed: Handling {Incoming}");
 

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

@@ -200,10 +200,11 @@ public class AssembleIssueRequestEventHandler
     private async Task<AssembleIssueJobEditInput> BuildAssembleIssueJobCreateInputWithQtyTypeAsync(
         AssembleIssueRequest assembleIssueRequest, AssembleIssueRequestDetail requestDetailInput)
     {
+        var location = await _locationAppService.GetByCodeAsync(requestDetailInput.ToLocationCode).ConfigureAwait(false);
         var job = ObjectMapper.Map<AssembleIssueRequest, AssembleIssueJobEditInput>(assembleIssueRequest);
         job.JobType = EnumJobType.IssueJob;
         job.JobStatus = EnumJobStatus.Open;
-        job.WorkGroupCode = requestDetailInput.ToLocationGroup;
+        job.WorkGroupCode = location?.WorkGroupCode;
         job.WarehouseCode = requestDetailInput.ToWarehouseCode;
         job.Worker = assembleIssueRequest.Worker;
         job.AssembleRequestNumber = assembleIssueRequest.Number;
@@ -406,10 +407,11 @@ public class AssembleIssueRequestEventHandler
         AssembleIssueRequest assembleIssueRequest,
         AssembleIssueRequestDetail assembleIssueRequestDetail, BalanceDTO balanceDtos)
     {
+        var location = await _locationAppService.GetByCodeAsync(assembleIssueRequestDetail.ToLocationCode).ConfigureAwait(false);
         var job = ObjectMapper.Map<AssembleIssueRequest, AssembleIssueJobEditInput>(assembleIssueRequest);
         job.JobType = EnumJobType.IssueJob;
         job.JobStatus = EnumJobStatus.Open;
-        job.WorkGroupCode = assembleIssueRequestDetail.ToLocationGroup;
+        job.WorkGroupCode = location?.WorkGroupCode;
         job.WarehouseCode = assembleIssueRequestDetail.ToWarehouseCode;
         job.Worker = assembleIssueRequest.Worker;
         job.AssembleRequestNumber = assembleIssueRequest.Number;

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

@@ -200,10 +200,11 @@ public class CoatingIssueRequestEventHandler
     private async Task<CoatingIssueJobEditInput> BuildCoatingIssueJobCreateInputWithQtyTypeAsync(
         CoatingIssueRequest CoatingIssueRequest, CoatingIssueRequestDetail requestDetailInput)
     {
+        var location = await _locationAppService.GetByCodeAsync(requestDetailInput.ToLocationCode).ConfigureAwait(false);
         var job = ObjectMapper.Map<CoatingIssueRequest, CoatingIssueJobEditInput>(CoatingIssueRequest);
         job.JobType = EnumJobType.IssueJob;
         job.JobStatus = EnumJobStatus.Open;
-        job.WorkGroupCode = requestDetailInput.ToLocationGroup;
+        job.WorkGroupCode = location?.WorkGroupCode;
         job.WarehouseCode = requestDetailInput.ToWarehouseCode;
         job.Worker = CoatingIssueRequest.Worker;
         job.CoatingRequestNumber = CoatingIssueRequest.Number;
@@ -406,10 +407,11 @@ public class CoatingIssueRequestEventHandler
         CoatingIssueRequest CoatingIssueRequest,
         CoatingIssueRequestDetail CoatingIssueRequestDetail, BalanceDTO balanceDtos)
     {
+        var location = await _locationAppService.GetByCodeAsync(CoatingIssueRequestDetail.ToLocationCode).ConfigureAwait(false);
         var job = ObjectMapper.Map<CoatingIssueRequest, CoatingIssueJobEditInput>(CoatingIssueRequest);
         job.JobType = EnumJobType.IssueJob;
         job.JobStatus = EnumJobStatus.Open;
-        job.WorkGroupCode = CoatingIssueRequestDetail.ToLocationGroup;
+        job.WorkGroupCode = location?.WorkGroupCode;
         job.WarehouseCode = CoatingIssueRequestDetail.ToWarehouseCode;
         job.Worker = CoatingIssueRequest.Worker;
         job.CoatingRequestNumber = CoatingIssueRequest.Number;

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

@@ -200,10 +200,11 @@ public class InjectionIssueRequestEventHandler
     private async Task<InjectionIssueJobEditInput> BuildInjectionIssueJobCreateInputWithQtyTypeAsync(
         InjectionIssueRequest InjectionIssueRequest, InjectionIssueRequestDetail requestDetailInput)
     {
+       var location=  await _locationAppService.GetByCodeAsync(requestDetailInput.ToLocationCode).ConfigureAwait(false);
         var job = ObjectMapper.Map<InjectionIssueRequest, InjectionIssueJobEditInput>(InjectionIssueRequest);
         job.JobType = EnumJobType.IssueJob;
         job.JobStatus = EnumJobStatus.Open;
-        job.WorkGroupCode = requestDetailInput.ToLocationGroup;
+        job.WorkGroupCode = location?.WorkGroupCode;
         job.WarehouseCode = requestDetailInput.ToWarehouseCode;
         job.Worker = InjectionIssueRequest.Worker;
         job.InjectionRequestNumber = InjectionIssueRequest.Number;
@@ -406,10 +407,11 @@ public class InjectionIssueRequestEventHandler
         InjectionIssueRequest InjectionIssueRequest,
         InjectionIssueRequestDetail InjectionIssueRequestDetail, BalanceDTO balanceDtos)
     {
+        var location = await _locationAppService.GetByCodeAsync(InjectionIssueRequestDetail.ToLocationCode).ConfigureAwait(false);
         var job = ObjectMapper.Map<InjectionIssueRequest, InjectionIssueJobEditInput>(InjectionIssueRequest);
         job.JobType = EnumJobType.IssueJob;
         job.JobStatus = EnumJobStatus.Open;
-        job.WorkGroupCode = InjectionIssueRequestDetail.ToLocationGroup;
+        job.WorkGroupCode = location?.WorkGroupCode;
         job.WarehouseCode = InjectionIssueRequestDetail.ToWarehouseCode;
         job.Worker = InjectionIssueRequest.Worker;
         job.InjectionRequestNumber = InjectionIssueRequest.Number;

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

@@ -200,10 +200,11 @@ public class KittingIssueRequestEventHandler
     private async Task<KittingIssueJobEditInput> BuildKittingIssueJobCreateInputWithQtyTypeAsync(
         KittingIssueRequest KittingIssueRequest, KittingIssueRequestDetail requestDetailInput)
     {
+        var location = await _locationAppService.GetByCodeAsync(requestDetailInput.ToLocationCode).ConfigureAwait(false);
         var job = ObjectMapper.Map<KittingIssueRequest, KittingIssueJobEditInput>(KittingIssueRequest);
         job.JobType = EnumJobType.IssueJob;
         job.JobStatus = EnumJobStatus.Open;
-        job.WorkGroupCode = requestDetailInput.ToLocationGroup;
+        job.WorkGroupCode = location?.WorkGroupCode;
         job.WarehouseCode = requestDetailInput.ToWarehouseCode;
         job.Worker = KittingIssueRequest.Worker;
         job.KittingRequestNumber = KittingIssueRequest.Number;
@@ -406,10 +407,11 @@ public class KittingIssueRequestEventHandler
         KittingIssueRequest KittingIssueRequest,
         KittingIssueRequestDetail KittingIssueRequestDetail, BalanceDTO balanceDtos)
     {
+        var location = await _locationAppService.GetByCodeAsync(KittingIssueRequestDetail.ToLocationCode).ConfigureAwait(false);
         var job = ObjectMapper.Map<KittingIssueRequest, KittingIssueJobEditInput>(KittingIssueRequest);
         job.JobType = EnumJobType.IssueJob;
         job.JobStatus = EnumJobStatus.Open;
-        job.WorkGroupCode = KittingIssueRequestDetail.ToLocationGroup;
+        job.WorkGroupCode = location?.WorkGroupCode;
         job.WarehouseCode = KittingIssueRequestDetail.ToWarehouseCode;
         job.Worker = KittingIssueRequest.Worker;
         job.KittingRequestNumber = KittingIssueRequest.Number;

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

@@ -200,10 +200,11 @@ public class SparePartIssueRequestEventHandler
     private async Task<SparePartIssueJobEditInput> BuildSparePartIssueJobCreateInputWithQtyTypeAsync(
         SparePartIssueRequest SparePartIssueRequest, SparePartIssueRequestDetail requestDetailInput)
     {
+        var location = await _locationAppService.GetByCodeAsync(requestDetailInput.ToLocationCode).ConfigureAwait(false);
         var job = ObjectMapper.Map<SparePartIssueRequest, SparePartIssueJobEditInput>(SparePartIssueRequest);
         job.JobType = EnumJobType.IssueJob;
         job.JobStatus = EnumJobStatus.Open;
-        job.WorkGroupCode = requestDetailInput.ToLocationGroup;
+        job.WorkGroupCode = location?.WorkGroupCode;
         job.WarehouseCode = requestDetailInput.ToWarehouseCode;
         job.Worker = SparePartIssueRequest.Worker;
         job.SparePartRequestNumber = SparePartIssueRequest.Number;
@@ -406,10 +407,11 @@ public class SparePartIssueRequestEventHandler
         SparePartIssueRequest SparePartIssueRequest,
         SparePartIssueRequestDetail SparePartIssueRequestDetail, BalanceDTO balanceDtos)
     {
+        var location = await _locationAppService.GetByCodeAsync(SparePartIssueRequestDetail.ToLocationCode).ConfigureAwait(false);
         var job = ObjectMapper.Map<SparePartIssueRequest, SparePartIssueJobEditInput>(SparePartIssueRequest);
         job.JobType = EnumJobType.IssueJob;
         job.JobStatus = EnumJobStatus.Open;
-        job.WorkGroupCode = SparePartIssueRequestDetail.ToLocationGroup;
+        job.WorkGroupCode = location?.WorkGroupCode;
         job.WarehouseCode = SparePartIssueRequestDetail.ToWarehouseCode;
         job.Worker = SparePartIssueRequest.Worker;
         job.SparePartRequestNumber = SparePartIssueRequest.Number;