zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

dev_DY_CC
郑勃旭 6 months ago
parent
903576e647 09d8914e0d
commit
288a85cf3c
7 changed files with 49 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/AssembleIssueJobsController.cs
  2. 13
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/CoatingIssueJobsController.cs
  3. 13
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/InjectionIssueJobsController.cs
  4. 13
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/KittingIssueJobsController.cs
  5. 4
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/SparePartIssueJobsController.cs
  6. 20
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs
  7. 6
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/AssembleIssueJobEventHandler.cs

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

@ -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);
@ -120,7 +120,8 @@ public class AssembleIssueJobsController : 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);

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

@ -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);
@ -120,7 +120,8 @@ public class CoatingIssueJobsController : 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);

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

@ -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);
@ -120,7 +120,8 @@ public class InjectionIssueJobsController : 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);

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

@ -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,7 +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);

4
be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/SparePartIssueJobsController.cs
View File

@ -120,7 +120,9 @@ public class SparePartIssueJobsController : 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);

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

@ -161,7 +161,7 @@ public class AssembleIssueJobAppService
}
/// <summary>
/// 库移回调
/// 库移回调
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
@ -181,6 +181,7 @@ public class AssembleIssueJobAppService
job.JobStatus = EnumJobStatus.Open;
jobDetail.TransferLibFromArriveDate = transferLibNoteDetail.HandledFromArriveDate;
jobDetail.TransferLibFromContainerCode = transferLibNoteDetail.HandledFromContainerCode;
jobDetail.TransferLibFromExpireDate = transferLibNoteDetail.HandledFromExpireDate;
@ -570,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)}不存在!");
@ -579,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");

6
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/AssembleIssueJobEventHandler.cs
View File

@ -112,6 +112,9 @@ public class AssembleIssueJobEventHandler :
inputoExpectOutEditInput.SupplierBatch = detail.RecommendFromSupplierBatch;
inputoExpectOutEditInput.WarehouseCode = detail.RecommendFromWarehouseCode;
expectOutEditInputs.Add(inputoExpectOutEditInput);
}
@ -126,6 +129,9 @@ public class AssembleIssueJobEventHandler :
/// <returns></returns>
private async Task CreateTransferLibAsync(AssembleIssueJob assembleIssueJob)
{
foreach (var detail in assembleIssueJob.Details)
{
var locationDto = await _locationAppService.GetByCodeAsync(detail.RecommendFromLocationCode)

Write Preview
Loading…
Cancel
Save