更新版本

5 months ago · 93ba8bb273
11 changed files with 53 additions and 28 deletions
--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/AssembleIssueJobsController.cs
+++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/AssembleIssueJobsController.cs
@ -44,7 +44,7 @@ public class AssembleIssueJobsController : AbpController
        if (jobStatus == "ALL")
        {
            status.Add((int)EnumJobStatus.Open);
-           // status.Add((int)EnumJobStatus.Wait);
+            status.Add((int)EnumJobStatus.Wait);
            status.Add((int)EnumJobStatus.Doing);
            status.Add((int)EnumJobStatus.Partial);
        }
@ -52,10 +52,10 @@ public class AssembleIssueJobsController : AbpController
        {
            status.Add((int)EnumJobStatus.Open);
        }
-        //else if (jobStatus == "Wait")
-        //{
-        //    status.Add((int)EnumJobStatus.Wait);
-        //}
+        else if (jobStatus == "Wait")
+        {
+            status.Add((int)EnumJobStatus.Wait);
+        }
        else
        {
            status.Add((int)EnumJobStatus.Done);
@ -121,7 +121,7 @@ public class AssembleIssueJobsController : AbpController
        var status = new List<int>
        {
            (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing, (int)EnumJobStatus.Partial
-            //, (int)EnumJobStatus.Wait
+            , (int)EnumJobStatus.Wait
        };
        var jsonStatus = JsonSerializer.Serialize(status);

--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/CoatingIssueJobsController.cs
+++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/CoatingIssueJobsController.cs
@ -44,7 +44,7 @@ public class CoatingIssueJobsController : AbpController
        if (jobStatus == "ALL")
        {
            status.Add((int)EnumJobStatus.Open);
-            //status.Add((int)EnumJobStatus.Wait);
+            status.Add((int)EnumJobStatus.Wait);
            status.Add((int)EnumJobStatus.Doing);
            status.Add((int)EnumJobStatus.Partial);
        }
@ -52,10 +52,10 @@ public class CoatingIssueJobsController : AbpController
        {
            status.Add((int)EnumJobStatus.Open);
        }
-        //else if (jobStatus == "Wait")
-        //{
-        //    status.Add((int)EnumJobStatus.Wait);
-        //}
+        else if (jobStatus == "Wait")
+        {
+            status.Add((int)EnumJobStatus.Wait);
+        }
        else
        {
            status.Add((int)EnumJobStatus.Done);
--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/InjectionIssueJobsController.cs
+++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/InjectionIssueJobsController.cs
@ -44,7 +44,7 @@ public class InjectionIssueJobsController : AbpController
        if (jobStatus == "ALL")
        {
            status.Add((int)EnumJobStatus.Open);
-            //status.Add((int)EnumJobStatus.Wait);
+            status.Add((int)EnumJobStatus.Wait);
            status.Add((int)EnumJobStatus.Doing);
            status.Add((int)EnumJobStatus.Partial);
        }
@ -52,10 +52,10 @@ public class InjectionIssueJobsController : AbpController
        {
            status.Add((int)EnumJobStatus.Open);
        }
-        //else if (jobStatus == "Wait")
-        //{
-        //    status.Add((int)EnumJobStatus.Wait);
-        //}
+        else if (jobStatus == "Wait")
+        {
+            status.Add((int)EnumJobStatus.Wait);
+        }
        else
        {
            status.Add((int)EnumJobStatus.Done);
@ -121,7 +121,7 @@ public class InjectionIssueJobsController : AbpController
        var status = new List<int>
        {
            (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing, (int)EnumJobStatus.Partial
-            //, (int)EnumJobStatus.Wait
+            , (int)EnumJobStatus.Wait
        };
        var jsonStatus = JsonSerializer.Serialize(status);

--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/KittingIssueJobsController.cs
+++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/KittingIssueJobsController.cs
@ -44,7 +44,7 @@ public class KittingIssueJobsController : AbpController
        if (jobStatus=="ALL")
        {
            status.Add((int)EnumJobStatus.Open);
-            //status.Add((int)EnumJobStatus.Wait);
+            status.Add((int)EnumJobStatus.Wait);
            status.Add((int)EnumJobStatus.Doing);
            status.Add((int)EnumJobStatus.Partial);
        }
@ -52,10 +52,10 @@ public class KittingIssueJobsController : AbpController
        {
            status.Add((int)EnumJobStatus.Open);
        }
-        //else if(jobStatus == "Wait")
-        //{           
-        //    status.Add((int)EnumJobStatus.Wait);           
-        //}
+        else if (jobStatus == "Wait")
+        {
+            status.Add((int)EnumJobStatus.Wait);
+        }
        else
        {
            status.Add((int)EnumJobStatus.Done);
@ -120,8 +120,8 @@ public class KittingIssueJobsController : AbpController
    {
        var status = new List<int>
        {
-            (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing, (int)EnumJobStatus.Partial
-            //(int)EnumJobStatus.Wait
+            (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing, (int)EnumJobStatus.Partial,
+            (int)EnumJobStatus.Wait
        };
        var jsonStatus = JsonSerializer.Serialize(status);

--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/ITransferLibRequestAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/ITransferLibRequestAppService.cs
@ -20,4 +20,7 @@ public interface ITransferLibRequestAppService
    Task CompleteByJobAsync(string requestNumber);
    Task CancelByCallRequestNumberAsync(string callJobNumber);
    Task CompleteByCallRequestNumberAsync(string callRequestNumber);
+
+    Task CompleteByJobNumAsync(string jobNumber);
+  
 }
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs
@ -129,14 +129,13 @@ public class AssembleIssueJobAppService
        {
            throw new UserFriendlyException($"未找到ID为 {id} 的任务");
        }
-
        if (assembleJob.JobStatus == EnumJobStatus.Open ||
            assembleJob.JobStatus == EnumJobStatus.Partial ||
            assembleJob.JobStatus == EnumJobStatus.Wait ||
            assembleJob.JobStatus == EnumJobStatus.Doing)
        {
            await _expectOutAppService.RemoveByNumberAsync(assembleJob.Number).ConfigureAwait(false);
-            await _transferLibRequestAppService.CancelByCallRequestNumberAsync(assembleJob.AssembleRequestNumber)
+            await _transferLibRequestAppService.CancelByCallRequestNumberAsync(assembleJob.Number)
                .ConfigureAwait(false);

            assembleJob.JobStatus = EnumJobStatus.Cancelled;
@ -378,7 +377,7 @@ public class AssembleIssueJobAppService

        await AssembleIssueRequestAppService.UpdateStatusCompletedAsync(assembleIssueJob.AssembleRequestNumber)
            .ConfigureAwait(false);
-        await _transferLibRequestAppService.CancelByCallRequestNumberAsync(assembleIssueJob.AssembleRequestNumber)
+        await _transferLibRequestAppService.CancelByCallRequestNumberAsync(assembleIssueJob.Number)
            .ConfigureAwait(false);

        await _repository.UpdateAsync(assembleIssueJob).ConfigureAwait(false);
@ -400,7 +399,7 @@ public class AssembleIssueJobAppService
            assembleIssueJob.JobStatus = EnumJobStatus.Done;
            await _repository.UpdateAsync(assembleIssueJob).ConfigureAwait(false);
            await _expectOutAppService.RemoveByNumberAsync(assembleIssueJob.Number).ConfigureAwait(false);
-            await _transferLibRequestAppService.CancelByCallRequestNumberAsync(assembleIssueJob.AssembleRequestNumber)
+            await _transferLibRequestAppService.CancelByCallRequestNumberAsync(assembleIssueJob.Number)
                .ConfigureAwait(false);
        }
    }
@ -874,6 +873,11 @@ public class AssembleIssueJobAppService
        await AssembleIssueRequestAppService.UpdateStatusCompletedAsync(assembleIssueJob.AssembleRequestNumber)
            .ConfigureAwait(false);

+        await _transferLibRequestAppService.CompleteByCallRequestNumberAsync(assembleIssueJob.AssembleRequestNumber) .ConfigureAwait(false);
+
+
+
+
        await Task.CompletedTask.ConfigureAwait(false);
    }

--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs
@ -694,6 +694,7 @@ public class CoatingIssueJobAppService

        await CoatingIssueRequestAppService.UpdateStatusCompletedAsync(coatingIssueJob.CoatingRequestNumber)
            .ConfigureAwait(false);
+        await _transferLibRequestAppService.CompleteByCallRequestNumberAsync(coatingIssueJob.CoatingRequestNumber).ConfigureAwait(false);

        await Task.CompletedTask.ConfigureAwait(false);
    }
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs
@ -640,6 +640,7 @@ public class InjectionIssueJobAppService

        await InjectionIssueRequestAppService.UpdateStatusCompletedAsync(injectionIssueJob.InjectionRequestNumber)
            .ConfigureAwait(false);
+        await _transferLibRequestAppService.CompleteByCallRequestNumberAsync(injectionIssueJob.InjectionRequestNumber).ConfigureAwait(false);

        await Task.CompletedTask.ConfigureAwait(false);
    }
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
@ -652,6 +652,7 @@ public class KittingIssueJobAppService

        await KittingIssueRequestAppService.UpdateStatusCompletedAsync(kittingIssueJob.KittingRequestNumber,kittingIssueJob.Number)
            .ConfigureAwait(false);
+        await _transferLibRequestAppService.CompleteByCallRequestNumberAsync(kittingIssueJob.KittingRequestNumber).ConfigureAwait(false);

        await Task.CompletedTask.ConfigureAwait(false);
    }
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs
@ -406,6 +406,20 @@ public class TransferLibRequestAppService : SfsStoreRequestAppServiceBase
        }
    }

+
+    [HttpPost("Complete-By-JobNum")]
+    public async Task CompleteByJobNumAsync(string jobNumber)
+    {
+        var list = await _repository.GetListAsync(p => p.CallJobNumber == jobNumber).ConfigureAwait(false);
+        foreach (var request in list)
+        {
+            await CompleteAsync(request.Id).ConfigureAwait(false);
+        }
+    }
+
+
+
+
    /// <summary>
    ///     【创建】库移请求
    /// </summary>
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
@ -206,6 +206,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
            detail.Explain = first.Explain;
            detail.ExpireDate = DateTime.MaxValue;

+
            await SetDetailPropertiesAsync(detail).ConfigureAwait(false);
            detailList.Add(detail);
        }