UP

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

@@ -907,27 +907,21 @@ public class AssembleIssueJobAppService
 	[HttpPost("call-back-agv")]
     public async Task<AgvResultObject> CallBackAgvIssueAsync(AgvRequestDto request)
     {
-        List<string> errors = new List<string>();
+     
         if(request.Data.Count==0)
         {
-            return new AgvResultObject
-            {
-                Code = "-1",
-                Message = "请求明细数量不能为0",
-                ReqCode = "",
-            };
+            return ReturnMessage("-1", "请求Data明细数量不能为0");
         }
-
         var entity=await _repository.FindAsync(p => p.Number == request.Data.First().OrderNum).ConfigureAwait(false);
+
+        if (entity == null)
+        {
+            return ReturnMessage("-1", $"{entity.Number}任务单据不存在!");
+        }
         var dto=ObjectMapper.Map<AssembleIssueJob, AssembleIssueJobDTO>(entity);
         if (entity.JobStatus == EnumJobStatus.Done)
         {
-            return new AgvResultObject
-            {
-                Code = "-1",
-                Message = $"{entity.Number}任务已结束",
-                ReqCode = "",
-            };
+            return ReturnMessage("-1", $"{entity.Number}任务单据已结束!");
         }
 
         foreach (var detail in entity.Details)
@@ -988,14 +982,28 @@ public class AssembleIssueJobAppService
             await ExecuteDetailExtAsync(entity.Id, entity.Details.First().Id, detailDto).ConfigureAwait(false);
         }
 
-        return new AgvResultObject
+        return ReturnMessage("0", "OK");
+    }
+
+    /// <summary>
+    /// 返回信息
+    /// </summary>
+    /// <param name="Code">0成功其他失败</param>
+    /// <param name="Message">OK成功其他错误信息</param>
+    /// <returns></returns>
+    private AgvResultObject ReturnMessage(string code, string message)
+    {
+        return new AgvResultObject()
         {
-            Code = "0",
-            Message = "OK",
-            ReqCode = "",
+            Code = code,
+            Message = message,
+            ReqCode = ""
         };
     }
 
+
+
+
     /// <summary>
     /// Agv 回库 接口
     /// </summary>

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

@@ -929,8 +929,21 @@ public class CoatingIssueJobAppService
     [HttpPost("call-back-agv")]
     public async Task<AgvResultObject> CallBackAgvIssueAsync(AgvRequestDto request)
     {
+        if (request.Data.Count == 0)
+        {
+            return ReturnMessage("-1", "请求Data明细数量不能为0");
+        }
         var entity = await _repository.FindAsync(p => p.Number == request.Data.First().OrderNum).ConfigureAwait(false);
+
+        if (entity == null)
+        {
+            return ReturnMessage("-1", $"{entity.Number}任务单据不存在!");
+        }
         var dto = ObjectMapper.Map<CoatingIssueJob, CoatingIssueJobDTO>(entity);
+        if (entity.JobStatus == EnumJobStatus.Done)
+        {
+            return ReturnMessage("-1", $"{entity.Number}任务单据已结束!");
+        }
 
         foreach (var detail in entity.Details)
         {
@@ -990,11 +1003,21 @@ public class CoatingIssueJobAppService
             await ExecuteDetailExtAsync(entity.Id, entity.Details.First().Id, detailDto).ConfigureAwait(false);
         }
 
-        return new AgvResultObject
+        return ReturnMessage("0", "OK");
+    }
+    /// <summary>
+    /// 返回信息
+    /// </summary>
+    /// <param name="Code">0成功其他失败</param>
+    /// <param name="Message">OK成功其他错误信息</param>
+    /// <returns></returns>
+    private AgvResultObject ReturnMessage(string code, string message)
+    {
+        return new AgvResultObject()
         {
-            Code = "0",
-            Message = "OK",
-            ReqCode = "",
+            Code = code,
+            Message = message,
+            ReqCode = ""
         };
     }
 

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

@@ -878,8 +878,21 @@ public class InjectionIssueJobAppService
     [HttpPost("call-back-agv")]
     public async Task<AgvResultObject> CallBackAgvIssueAsync(AgvRequestDto request)
     {
+        if (request.Data.Count == 0)
+        {
+            return ReturnMessage("-1", "请求Data明细数量不能为0");
+        }
         var entity = await _repository.FindAsync(p => p.Number == request.Data.First().OrderNum).ConfigureAwait(false);
+
+        if (entity == null)
+        {
+            return ReturnMessage("-1", $"{entity.Number}任务单据不存在!");
+        }
         var dto = ObjectMapper.Map<InjectionIssueJob, InjectionIssueJobDTO>(entity);
+        if (entity.JobStatus == EnumJobStatus.Done)
+        {
+            return ReturnMessage("-1", $"{entity.Number}任务单据已结束!");
+        }
 
         foreach (var detail in entity.Details)
         {
@@ -939,11 +952,21 @@ public class InjectionIssueJobAppService
             await ExecuteDetailExtAsync(entity.Id, entity.Details.First().Id, detailDto).ConfigureAwait(false);
         }
 
-        return new AgvResultObject
+        return ReturnMessage("0", "OK");
+    }
+    /// <summary>
+    /// 返回信息
+    /// </summary>
+    /// <param name="Code">0成功其他失败</param>
+    /// <param name="Message">OK成功其他错误信息</param>
+    /// <returns></returns>
+    private AgvResultObject ReturnMessage(string code, string message)
+    {
+        return new AgvResultObject()
         {
-            Code = "0",
-            Message = "OK",
-            ReqCode = "",
+            Code = code,
+            Message = message,
+            ReqCode = ""
         };
     }
 

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

@@ -893,8 +893,21 @@ public class KittingIssueJobAppService
     [HttpPost("call-back-agv")]
     public async Task<AgvResultObject> CallBackAgvIssueAsync(AgvRequestDto request)
     {
+        if (request.Data.Count == 0)
+        {
+            return ReturnMessage("-1", "请求Data明细数量不能为0");
+        }
         var entity = await _repository.FindAsync(p => p.Number == request.Data.First().OrderNum).ConfigureAwait(false);
+
+        if (entity == null)
+        {
+            return ReturnMessage("-1", $"{entity.Number}任务单据不存在!");
+        }
         var dto = ObjectMapper.Map<KittingIssueJob, KittingIssueJobDTO>(entity);
+        if (entity.JobStatus == EnumJobStatus.Done)
+        {
+            return ReturnMessage("-1", $"{entity.Number}任务单据已结束!");
+        }
 
         foreach (var detail in entity.Details)
         {
@@ -950,15 +963,23 @@ public class KittingIssueJobAppService
                 detailDto.HandledFromLot = detail.RecommendToLot;
                 detailDto.HandledFromPackingCode = detail.RecommendToPackingCode;
             }
-
             await ExecuteDetailExtAsync(entity.Id, entity.Details.First().Id, detailDto).ConfigureAwait(false);
         }
-
-        return new AgvResultObject
+        return ReturnMessage("0", "OK");
+    }
+    /// <summary>
+    /// 返回信息
+    /// </summary>
+    /// <param name="Code">0成功其他失败</param>
+    /// <param name="Message">OK成功其他错误信息</param>
+    /// <returns></returns>
+    private AgvResultObject ReturnMessage(string code, string message)
+    {
+        return new AgvResultObject()
         {
-            Code = "0",
-            Message = "OK",
-            ReqCode = "",
+            Code = code,
+            Message = message,
+            ReqCode = ""
         };
     }
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs

@@ -904,9 +904,21 @@ public class SparePartIssueJobAppService
     [HttpPost("call-back-agv")]
     public async Task<AgvResultObject> CallBackAgvIssueAsync(AgvRequestDto request)
     {
+        if (request.Data.Count == 0)
+        {
+            return ReturnMessage("-1", "请求Data明细数量不能为0");
+        }
         var entity = await _repository.FindAsync(p => p.Number == request.Data.First().OrderNum).ConfigureAwait(false);
-        var dto = ObjectMapper.Map<SparePartIssueJob, SparePartIssueJobDTO>(entity);
 
+        if (entity == null)
+        {
+            return ReturnMessage("-1", $"{entity.Number}任务单据不存在!");
+        }
+        var dto = ObjectMapper.Map<SparePartIssueJob, SparePartIssueJobDTO>(entity);
+        if (entity.JobStatus == EnumJobStatus.Done)
+        {
+            return ReturnMessage("-1", $"{entity.Number}任务单据已结束!");
+        }
         foreach (var detail in entity.Details)
         {
             var detailDto = new SparePartIssueJobDetailDTO();
@@ -972,6 +984,21 @@ public class SparePartIssueJobAppService
             ReqCode = "",
         };
     }
+    /// <summary>
+    /// 返回信息
+    /// </summary>
+    /// <param name="Code">0成功其他失败</param>
+    /// <param name="Message">OK成功其他错误信息</param>
+    /// <returns></returns>
+    private AgvResultObject ReturnMessage(string code, string message)
+    {
+        return new AgvResultObject()
+        {
+            Code = code,
+            Message = message,
+            ReqCode = ""
+        };
+    }
 
     /// <summary>
     /// Agv 回库 接口