Browse Source

更新版本

dev_DY_CC
赵新宇 5 months ago
parent
commit
09d8914e0d
  1. 8
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/CoatingIssueJobsController.cs
  2. 8
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/InjectionIssueJobsController.cs
  3. 8
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/KittingIssueJobsController.cs
  4. 17
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs

8
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);

8
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);

8
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);

17
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");

Loading…
Cancel
Save