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

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

@@ -155,17 +155,18 @@ public class AssembleIssueJobsController : AbpController
     [HttpGet("by-number/{jobNumber}")]
     public virtual async Task<ActionResult<AssembleIssueJobDTO>> GetByNumberAsync(string jobNumber)
     {
-        var jobDto = await _assembleIssueJobAppService.GetByNumberAsync(jobNumber).ConfigureAwait(false);
+        //var jobDto = await _assembleIssueJobAppService.GetByNumberAsync(jobNumber).ConfigureAwait(false);
+        var jobDto = await _assembleIssueJobAppService.GetByNumber2Async(jobNumber).ConfigureAwait(false);
         if (jobDto == null)
         {
             throw new UserFriendlyException($"未找到编号为 {jobNumber} 的任务");
         }
 
-        var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
-        if (!wlgCodes.Contains(jobDto.WorkGroupCode))
-        {
-            return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
-        }
+        //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
+        //if (!wlgCodes.Contains(jobDto.WorkGroupCode))
+        //{
+        //    return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
+        //}
 
         if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.AcceptUserId != CurrentUser.Id)
         {

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

@@ -155,17 +155,18 @@ public class CoatingIssueJobsController : AbpController
     [HttpGet("by-number/{jobNumber}")]
     public virtual async Task<ActionResult<CoatingIssueJobDTO>> GetByNumberAsync(string jobNumber)
     {
-        var jobDto = await _coatingIssueJobAppService.GetByNumberAsync(jobNumber).ConfigureAwait(false);
+        //var jobDto = await _coatingIssueJobAppService.GetByNumberAsync(jobNumber).ConfigureAwait(false);
+        var jobDto = await _coatingIssueJobAppService.GetByNumber2Async(jobNumber).ConfigureAwait(false);
         if (jobDto == null)
         {
             throw new UserFriendlyException($"未找到编号为 {jobNumber} 的任务");
         }
 
-        var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
-        if (!wlgCodes.Contains(jobDto.WorkGroupCode))
-        {
-            return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
-        }
+        //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
+        //if (!wlgCodes.Contains(jobDto.WorkGroupCode))
+        //{
+        //    return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
+        //}
 
         if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.AcceptUserId != CurrentUser.Id)
         {

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

@@ -155,17 +155,18 @@ public class InjectionIssueJobsController : AbpController
     [HttpGet("by-number/{jobNumber}")]
     public virtual async Task<ActionResult<InjectionIssueJobDTO>> GetByNumberAsync(string jobNumber)
     {
-        var jobDto = await _injectionIssueJobAppService.GetByNumberAsync(jobNumber).ConfigureAwait(false);
+        //var jobDto = await _injectionIssueJobAppService.GetByNumberAsync(jobNumber).ConfigureAwait(false);
+        var jobDto = await _injectionIssueJobAppService.GetByNumber2Async(jobNumber).ConfigureAwait(false);
         if (jobDto == null)
         {
             throw new UserFriendlyException($"未找到编号为 {jobNumber} 的任务");
         }
 
-        var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
-        if (!wlgCodes.Contains(jobDto.WorkGroupCode))
-        {
-            return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
-        }
+        //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
+        //if (!wlgCodes.Contains(jobDto.WorkGroupCode))
+        //{
+        //    return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
+        //}
 
         if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.AcceptUserId != CurrentUser.Id)
         {

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

@@ -155,17 +155,18 @@ public class KittingIssueJobsController : AbpController
     [HttpGet("by-number/{jobNumber}")]
     public virtual async Task<ActionResult<KittingIssueJobDTO>> GetByNumberAsync(string jobNumber)
     {
-        var jobDto = await _kittingIssueJobAppService.GetByNumberAsync(jobNumber).ConfigureAwait(false);
+        //var jobDto = await _kittingIssueJobAppService.GetByNumberAsync(jobNumber).ConfigureAwait(false);
+        var jobDto = await _kittingIssueJobAppService.GetByNumber2Async(jobNumber).ConfigureAwait(false);
         if (jobDto == null)
         {
             throw new UserFriendlyException($"未找到编号为 {jobNumber} 的任务");
         }
 
-        var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
-        if (!wlgCodes.Contains(jobDto.WorkGroupCode))
-        {
-            return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
-        }
+        //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
+        //if (!wlgCodes.Contains(jobDto.WorkGroupCode))
+        //{
+        //    return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
+        //}
 
         if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.AcceptUserId != CurrentUser.Id)
         {

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

@@ -25,4 +25,6 @@ public interface IAssembleIssueJobAppService
     /// <param name="requestNumber"></param>
     /// <returns></returns>
     Task CompleteByRequestNumberAsync(string requestNumber);
+
+    Task<AssembleIssueJobDTO> GetByNumber2Async(string number);
 }

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

@@ -25,4 +25,6 @@ public interface ICoatingIssueJobAppService
     /// <param name="requestNumber"></param>
     /// <returns></returns>
     Task CompleteByRequestNumberAsync(string requestNumber);
+
+    Task<CoatingIssueJobDTO> GetByNumber2Async(string number);
 }

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

@@ -24,4 +24,6 @@ public interface IInjectionIssueJobAppService
     /// <param name="requestNumber"></param>
     /// <returns></returns>
     Task CompleteByRequestNumberAsync(string requestNumber);
+
+    Task<InjectionIssueJobDTO> GetByNumber2Async(string number);
 }

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

@@ -24,4 +24,6 @@ public interface IKittingIssueJobAppService
     /// <param name="requestNumber"></param>
     /// <returns></returns>
     Task CompleteByRequestNumberAsync(string requestNumber);
+
+    Task<KittingIssueJobDTO> GetByNumber2Async(string number);
 }

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

@@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using MyNamespace;
 using Volo.Abp;
+using Volo.Abp.ObjectMapping;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
@@ -60,6 +61,14 @@ public class AssembleIssueJobAppService
         _transferLibRequestAppService = transferLibRequestAppService;
     }
 
+    [HttpPost("get-by-number-2")]
+    public async Task<AssembleIssueJobDTO> GetByNumber2Async(string number)
+    {
+        var entity = await _repository.FindAsync(p => p.Number == number).ConfigureAwait(false);
+
+        return ObjectMapper.Map<AssembleIssueJob, AssembleIssueJobDTO>(entity);
+    }
+
     [HttpPost("add-many")]
     public override async Task<List<AssembleIssueJobDTO>> CreateManyAsync(List<AssembleIssueJobEditInput> inputs)
     {

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

@@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using MyNamespace;
 using Volo.Abp;
+using Volo.Abp.ObjectMapping;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
@@ -60,6 +61,14 @@ public class CoatingIssueJobAppService
         _transferLibRequestAppService = transferLibRequestAppService;
     }
 
+    [HttpPost("get-by-number-2")]
+    public async Task<CoatingIssueJobDTO> GetByNumber2Async(string number)
+    {
+        var entity = await _repository.FindAsync(p => p.Number == number).ConfigureAwait(false);
+
+        return ObjectMapper.Map<CoatingIssueJob, CoatingIssueJobDTO>(entity);
+    }
+
     [HttpPost("add-many")]
     public override async Task<List<CoatingIssueJobDTO>> CreateManyAsync(List<CoatingIssueJobEditInput> inputs)
     {
@@ -190,8 +199,22 @@ public class CoatingIssueJobAppService
     {
         var coatingIssueJob = await _repository.GetAsync(masterId).ConfigureAwait(false);
         coatingIssueJob.JobStatus = EnumJobStatus.Doing;
-
+        
         var coatingIssueJobDto = ObjectMapper.Map<CoatingIssueJob, CoatingIssueJobDTO>(coatingIssueJob);
+
+        var fromLocationDto=await _locationAppService.GetByCodeAsync(issueJobDetailDto.HandledFromLocationCode).ConfigureAwait(false);
+        var toLocationDto = await _locationAppService.GetByCodeAsync(issueJobDetailDto.HandledToLocationCode).ConfigureAwait(false);
+
+        issueJobDetailDto.HandledFromLocationArea = fromLocationDto.AreaCode;
+        issueJobDetailDto.HandledFromLocationGroup = fromLocationDto.LocationGroupCode;
+        issueJobDetailDto.HandledFromLocationErpCode = fromLocationDto.ErpLocationCode;
+        issueJobDetailDto.HandledFromWarehouseCode = fromLocationDto.WarehouseCode;
+
+        issueJobDetailDto.HandledToLocationArea = toLocationDto.AreaCode;
+        issueJobDetailDto.HandledToLocationGroup = toLocationDto.LocationGroupCode;
+        issueJobDetailDto.HandledToLocationErpCode = toLocationDto.ErpLocationCode;
+        issueJobDetailDto.HandledToWarehouseCode = toLocationDto.WarehouseCode;
+
         coatingIssueJobDto.Details = new List<CoatingIssueJobDetailDTO> { issueJobDetailDto };
         var coatingIssueNoteEditInput = await BuildCoatingIssueNoteAsync(coatingIssueJobDto).ConfigureAwait(false);
         await _coatingIssueNoteAppService.CreateAsync(coatingIssueNoteEditInput).ConfigureAwait(false);

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

@@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using MyNamespace;
 using Volo.Abp;
+using Volo.Abp.ObjectMapping;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
@@ -59,6 +60,13 @@ public class InjectionIssueJobAppService
         _options = options;
         _transferLibRequestAppService = transferLibRequestAppService;
     }
+    [HttpPost("get-by-number-2")]
+    public async Task<InjectionIssueJobDTO> GetByNumber2Async(string number)
+    {
+        var entity = await _repository.FindAsync(p => p.Number == number).ConfigureAwait(false);
+
+        return ObjectMapper.Map<InjectionIssueJob, InjectionIssueJobDTO>(entity);
+    }
 
     [HttpPost("add-many")]
     public override async Task<List<InjectionIssueJobDTO>> CreateManyAsync(List<InjectionIssueJobEditInput> inputs)

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

@@ -60,6 +60,14 @@ public class KittingIssueJobAppService
         _transferLibRequestAppService = transferLibRequestAppService;
     }
 
+    [HttpPost("get-by-number-2")]
+    public async Task<KittingIssueJobDTO> GetByNumber2Async(string number)
+    {
+        var entity = await _repository.FindAsync(p => p.Number == number).ConfigureAwait(false);
+
+        return ObjectMapper.Map<KittingIssueJob, KittingIssueJobDTO>(entity);
+    }
+
     [HttpPost("add-many")]
     public override async Task<List<KittingIssueJobDTO>> CreateManyAsync(List<KittingIssueJobEditInput> inputs)
     {

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

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