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

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

@@ -52,15 +52,16 @@ public class UnplannedIssueJobController : AbpController
     /// <param name="isToday"></param>
     /// <returns></returns>
     [HttpGet("list")]
-    public virtual async Task<PagedResultDto<UnplannedIssueJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, EnumUnplannedIssueType enumUnplannedIssueType)
+    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 jsonWlgCodes = JsonSerializer.Serialize(wlgCodes);
 
         var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing };
         var jsonStatus = JsonSerializer.Serialize(status);
-        var issueType = new List<int>() { (int)enumUnplannedIssueType };
+        var ishaspage = new List<int>() { ishaspag};
-        var jsonIssueType = JsonSerializer.Serialize(issueType);
+        var ishaspagejson = JsonSerializer.Serialize(ishaspage);
+        //var jsonIssueType = JsonSerializer.Serialize(issueType);
         var request = new SfsJobRequestInputBase
         {
             MaxResultCount = pageSize,
@@ -70,7 +71,7 @@ public class UnplannedIssueJobController : AbpController
             {
                 Filters = new List<Filter>
                 {
-                    new(nameof(UnplannedIssueJobDTO.UnplannedIssueType),jsonIssueType,"In"),
+                    new(nameof(UnplannedIssueJobDTO.IsHasPackingCode),ishaspagejson,"In"),
                     new(nameof(UnplannedIssueJobDTO.JobStatus),jsonStatus,"In")
                 }
             }

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

@@ -51,15 +51,21 @@ public class UnplannedReceiptJobController : AbpController
     /// <param name="isToday"></param>
     /// <returns></returns>
     [HttpGet("list")]
-    public virtual async Task<PagedResultDto<UnplannedReceiptJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, EnumUnplannedReceiptType enumUnplannedReceiptType)
+    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 jsonWlgCodes = JsonSerializer.Serialize(wlgCodes);
 
         var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing };
-        var receiptType = new List<int>() { (int)enumUnplannedReceiptType };
+
+        var ishaspage = new List<int>() { (int)ishaspag };
+        var ishaspagejson = JsonSerializer.Serialize(ishaspage);
+
+
+
+        //var receiptType = new List<int>() { (int)enumUnplannedReceiptType };
         var jsonStatus = JsonSerializer.Serialize(status);
-        var jsonreceiptType = JsonSerializer.Serialize(receiptType);
+        //var jsonreceiptType = JsonSerializer.Serialize(receiptType);
         var request = new SfsJobRequestInputBase
         {
             MaxResultCount = pageSize,
@@ -69,7 +75,7 @@ public class UnplannedReceiptJobController : AbpController
             {
                 Filters = new List<Filter>
                 {
-                    new(nameof(UnplannedReceiptJobDTO.UnplannedReceiptType),jsonreceiptType,"In"),
+                    new(nameof(UnplannedReceiptJobDTO.IsHasPackingCode),ishaspagejson,"In"),
                     new(nameof(UnplannedReceiptJobDTO.JobStatus),jsonStatus,"In")
                 }
             }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDTO.cs

@@ -93,7 +93,7 @@ public class UnplannedIssueJobDTO : SfsJobDTOBase<UnplannedIssueJobDetailDTO>
     [Display(Name = "数量")]
     public decimal Qty { get; set; }
 
-    public bool IsHasPackingCode { get; set; }
+    public int IsHasPackingCode { get; set; }
 
 
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobEditInput.cs

@@ -112,7 +112,7 @@ public class UnplannedIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCr
     [Display(Name = "数量")]
     public decimal Qty { get; set; }
 
-    public bool IsHasPackingCode { get; set; }
+    public int IsHasPackingCode { get; set; }
 
 
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.cs

@@ -117,5 +117,5 @@ public class UnplannedReceiptJobDTO : SfsJobDTOBase<UnplannedReceiptJobDetailDTO
     /// 是否有箱码
     /// </summary>
     [Display(Name = "是否有箱码")]
-    public bool IsHasPackingCode { get; set; }
+    public int IsHasPackingCode { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobEditInput.cs

@@ -143,5 +143,5 @@ public class UnplannedReceiptJobEditInput : SfsJobCreateUpdateInputBase,
     /// 是否有箱码
     /// </summary>
     [Display(Name = "是否有箱码")]
-    public bool IsHasPackingCode { get; set; }
+    public int IsHasPackingCode { get; set; }
 }

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

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

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs

@@ -361,40 +361,40 @@ public class UnplannedIssueJobAppService
                     switch (locationDto.Type)
                     {
                         case EnumLocationType.SEMI:
-                            job.IsHasPackingCode = false;
+                            job.IsHasPackingCode = 0;
                             job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
                             break;
                         case EnumLocationType.CUST:
-                            job.IsHasPackingCode = false;
+                            job.IsHasPackingCode = 0;
                             job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
                             break;
                         case EnumLocationType.FG:
-                            job.IsHasPackingCode = false;
+                            job.IsHasPackingCode = 0;
                             job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
                             break;
                         case EnumLocationType.RAW:
-                            job.IsHasPackingCode = true;
+                            job.IsHasPackingCode = 1;
                             job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
                             break;
                         case EnumLocationType.THIRDPARTY:
-                            job.IsHasPackingCode = false;
+                            job.IsHasPackingCode = 0;
                             job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
                             break;
                         case EnumLocationType.OUTSIDE:
-                            job.IsHasPackingCode = false;
+                            job.IsHasPackingCode = 0;
                             job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
                             break;
                         case EnumLocationType.DimensionalStorehouse:
                             job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
-                            job.IsHasPackingCode = false;
+                            job.IsHasPackingCode = 0;
                             break;
 
                         case EnumLocationType.KittingWip:
-                            job.IsHasPackingCode = false;
+                            job.IsHasPackingCode = 0;
                             job.UnplannedIssueType = EnumUnplannedIssueType.Wip;
                             break;
                         case EnumLocationType.WIP:
-                            job.IsHasPackingCode = false;
+                            job.IsHasPackingCode = 0;
                             job.UnplannedIssueType = EnumUnplannedIssueType.Wip;
                             break;
                     }
@@ -488,40 +488,40 @@ public class UnplannedIssueJobAppService
                 switch (locationDto.Type)
                 {
                     case EnumLocationType.SEMI:
-                        job.IsHasPackingCode = false;
+                        job.IsHasPackingCode = 0;
                         job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
                         break;
                     case EnumLocationType.CUST:
-                        job.IsHasPackingCode = false;
+                        job.IsHasPackingCode = 0;
                         job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
                         break;
                     case EnumLocationType.FG:
-                        job.IsHasPackingCode = false;
+                        job.IsHasPackingCode = 0;
                         job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
                         break;
                     case EnumLocationType.RAW:
-                        job.IsHasPackingCode = true;
+                        job.IsHasPackingCode = 1;
                         job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
                         break;
                     case EnumLocationType.THIRDPARTY:
-                        job.IsHasPackingCode = false;
+                        job.IsHasPackingCode = 0;
                         job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
                         break;
                     case EnumLocationType.OUTSIDE:
-                        job.IsHasPackingCode = false;
+                        job.IsHasPackingCode = 0;
                         job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
                         break;
                     case EnumLocationType.DimensionalStorehouse:
                         job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
-                        job.IsHasPackingCode = false;
+                        job.IsHasPackingCode = 0;
                         break;
 
                     case EnumLocationType.KittingWip:
-                        job.IsHasPackingCode = false;
+                        job.IsHasPackingCode = 0;
                         job.UnplannedIssueType = EnumUnplannedIssueType.Wip;
                         break;
                     case EnumLocationType.WIP:
-                        job.IsHasPackingCode = false;
+                        job.IsHasPackingCode = 0;
                         job.UnplannedIssueType = EnumUnplannedIssueType.Wip;
                         break;
                 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs

@@ -220,40 +220,40 @@ public class UnplannedReceiptJobAppService
             switch(locationDtos.First().Type)
             {
                 case EnumLocationType.SEMI:
-                    job.IsHasPackingCode = false;
+                    job.IsHasPackingCode = 0;
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
                     break;
                 case EnumLocationType.CUST:
-                    job.IsHasPackingCode = false;
+                    job.IsHasPackingCode = 0;
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
                     break;
                 case EnumLocationType.FG:
-                    job.IsHasPackingCode = false;
+                    job.IsHasPackingCode = 0;
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
                     break;
                 case EnumLocationType.RAW:
-                    job.IsHasPackingCode = true;
+                    job.IsHasPackingCode = 1;
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
                     break;
                 case EnumLocationType.THIRDPARTY:
-                    job.IsHasPackingCode = false;
+                    job.IsHasPackingCode = 0;
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
                     break;
                 case EnumLocationType.OUTSIDE:
-                    job.IsHasPackingCode = false;
+                    job.IsHasPackingCode = 0;
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
                     break;
                 case EnumLocationType.DimensionalStorehouse:
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
-                    job.IsHasPackingCode = false;
+                    job.IsHasPackingCode = 0;
                     break;
 
                 case EnumLocationType.KittingWip:
-                    job.IsHasPackingCode = false;
+                    job.IsHasPackingCode = 0;
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Wip;
                     break;
                 case EnumLocationType.WIP:
-                    job.IsHasPackingCode = false;
+                    job.IsHasPackingCode = 0;
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Wip;
                     break;
             }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJob.cs

@@ -99,7 +99,7 @@ public class UnplannedIssueJob : SfsJobAggregateRootBase<UnplannedIssueJobDetail
     [Display(Name = "数量")]
     public decimal Qty { get; set; }
 
-    public bool IsHasPackingCode { get; set; }
+    public int IsHasPackingCode { get; set; }
 
     /// <summary>
     /// 设置任务明细的实际库位和实际数量

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs

@@ -122,7 +122,7 @@ public class UnplannedReceiptJob : SfsJobAggregateRootBase<UnplannedReceiptJobDe
     /// 是否有箱码
     /// </summary>
     [Display(Name = "是否有箱码")]
-    public bool IsHasPackingCode { get; set; }
+    public int IsHasPackingCode { get; set; }
 
     /// <summary>
     ///     设置任务明细的实际库位和实际数量

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 = "数量")]
     public decimal Qty { get; set; }
 
-    public bool IsHasPackingCode { get; set; }
+   
 
 
 

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)
     {
         var createInput = ObjectMapper.Map<UnplannedIssueJob, UnplannedIssueNoteEditInput>(entity);
+
+    
         createInput.BuildDate=DateTime.Now;
         createInput.ActiveDate=DateTime.Now;
         createInput.Details.RemoveAll(p => p.Qty == 0);