From 09d8914e0dd62d6fdbc8cab96339306ff63bf61b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Tue, 19 Nov 2024 11:41:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IssueJobs/CoatingIssueJobsController.cs     |  8 ++++----
 .../IssueJobs/InjectionIssueJobsController.cs   |  8 ++++----
 .../IssueJobs/KittingIssueJobsController.cs     |  8 ++++----
 .../AssembleIssueJobAppService.cs               | 17 ++++++++++-------
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git 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
index 79acaebce..e8eebd2c8 100644
--- 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
@@ -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);
diff --git 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
index 91c8327f7..4806e2192 100644
--- 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
@@ -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);
diff --git 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
index d6d2d6737..7dca7ee99 100644
--- 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
@@ -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);
diff --git 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
index 2ba6653df..8f19e2425 100644
--- 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
@@ -571,8 +571,17 @@ public class AssembleIssueJobAppService
                 var query = _repository.WithDetails()
                     .Where(p => numbers.Contains(p.Number) && p.JobStatus != EnumJobStatus.Done);
 
-
                 var entities = query.ToList();
+                if (entities.Count > 0)
+                {
+                    var efs=entities.Where(p => p.JobStatus == EnumJobStatus.Wait);
+                    if (efs!=null && efs.ToList().Count > 0)
+                    {
+                        var task=efs.FirstOrDefault();
+                        errors.Add($"立体库任务{task.Number}当前状态为库移状态!");
+                    }
+                }
+
                 if (entities.Count == 0)
                 {
                     errors.Add($"任务号{string.Join(",", numbers)}不存在!");
@@ -580,12 +589,6 @@ public class AssembleIssueJobAppService
 
                 var dtos = ObjectMapper.Map<List<AssembleIssueJob>, List<AssembleIssueJobDTO>>(entities);
 
-
-
-
-
-
-
                 if (input.Jobs.Count != entities.Count)
                 {
                     errors.Add("立体库提交出库任务和WMS任务不符,请核对! \n");