Browse Source

更新版本

dev_DY_CC
赵新宇 6 months ago
parent
commit
22bc9e47f6
  1. 6
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs
  2. 6
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs
  3. 3
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs
  4. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs
  5. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/UnplannedIssueJobEventHandler.cs

6
be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs

@ -52,15 +52,15 @@ public class UnplannedIssueJobController : AbpController
/// <param name="isToday"></param> /// <param name="isToday"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("list")] [HttpGet("list")]
public virtual async Task<PagedResultDto<UnplannedIssueJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, bool ishaspag) public virtual async Task<PagedResultDto<UnplannedIssueJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, int ishaspag)
{ {
//var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
//var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes); //var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes);
var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing }; var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing };
var jsonStatus = JsonSerializer.Serialize(status); var jsonStatus = JsonSerializer.Serialize(status);
var ishaspage = new List<bool>() { ishaspag}; var ishaspage = new List<int>() { ishaspag};
var ishaspagejson = JsonSerializer.Serialize(status); var ishaspagejson = JsonSerializer.Serialize(ishaspage);
//var jsonIssueType = JsonSerializer.Serialize(issueType); //var jsonIssueType = JsonSerializer.Serialize(issueType);
var request = new SfsJobRequestInputBase var request = new SfsJobRequestInputBase
{ {

6
be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs

@ -51,15 +51,15 @@ public class UnplannedReceiptJobController : AbpController
/// <param name="isToday"></param> /// <param name="isToday"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("list")] [HttpGet("list")]
public virtual async Task<PagedResultDto<UnplannedReceiptJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, bool ishaspag) public virtual async Task<PagedResultDto<UnplannedReceiptJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, int ishaspag)
{ {
//var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
//var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes); //var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes);
var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing }; var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing };
var ishaspage = new List<bool>() { ishaspag }; var ishaspage = new List<int>() { (int)ishaspag };
var ishaspagejson = JsonSerializer.Serialize(status); var ishaspagejson = JsonSerializer.Serialize(ishaspage);

3
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs

@ -104,4 +104,7 @@ public class UnplannedIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase
} }

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs

@ -92,7 +92,7 @@ public class UnplannedIssueNote : SfsStoreAggregateRootBase<UnplannedIssueNoteDe
[Display(Name = "数量")] [Display(Name = "数量")]
public decimal Qty { get; set; } public decimal Qty { get; set; }
public bool IsHasPackingCode { get; set; }

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/UnplannedIssueJobEventHandler.cs

@ -80,6 +80,8 @@ public class UnplannedIssueJobEventHandler :
private UnplannedIssueNoteEditInput BuildUnplannedIssueNoteCreateInput(UnplannedIssueJob entity) private UnplannedIssueNoteEditInput BuildUnplannedIssueNoteCreateInput(UnplannedIssueJob entity)
{ {
var createInput = ObjectMapper.Map<UnplannedIssueJob, UnplannedIssueNoteEditInput>(entity); var createInput = ObjectMapper.Map<UnplannedIssueJob, UnplannedIssueNoteEditInput>(entity);
createInput.BuildDate=DateTime.Now; createInput.BuildDate=DateTime.Now;
createInput.ActiveDate=DateTime.Now; createInput.ActiveDate=DateTime.Now;
createInput.Details.RemoveAll(p => p.Qty == 0); createInput.Details.RemoveAll(p => p.Qty == 0);

Loading…
Cancel
Save