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/JobController.cs

@@ -355,7 +355,7 @@ public class JobController : AbpController
         }).ConfigureAwait(false);
         list.Add(new JobCountDto { JobType = EnumJobType.SparePartIssueJob, Count = sparePartIssueJob });
 
-        //非生产领料       
+        //非生产领料 线边
         var unplannedIssueJobAppService = await _unplannedIssueJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
         {
             Condition = new Condition
@@ -363,13 +363,29 @@ public class JobController : AbpController
                 Filters = new List<Filter>
                 {
                     new(nameof(ProductionReturnJobDTO.WorkGroupCode),jsonCodes,"In"),
-                    new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In")
+                    new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In"),
+                    new(nameof(UnplannedIssueJobDTO.IsHasPackingCode),"0","In"),
                 }
             }
         }).ConfigureAwait(false);
-        list.Add(new JobCountDto { JobType = EnumJobType.SparePartIssueJob, Count = sparePartIssueJob });
+        list.Add(new JobCountDto { JobType = EnumJobType.UnplannedIssueJobNoPacking, Count = unplannedIssueJobAppService });
+
+        //非生产领料 原料
+        var unplannedIssueJobAppService2 = await _unplannedIssueJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
+        {
+            Condition = new Condition
+            {
+                Filters = new List<Filter>
+                {
+                    new(nameof(ProductionReturnJobDTO.WorkGroupCode),jsonCodes,"In"),
+                    new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In"),
+                    new(nameof(UnplannedIssueJobDTO.IsHasPackingCode),"1","In"),
+                }
+            }
+        }).ConfigureAwait(false);
+        list.Add(new JobCountDto { JobType = EnumJobType.UnplannedIssueJobHasPacking, Count = unplannedIssueJobAppService2 });
 
-        //非生产退料       
+        //非生产退料 线边 
         var unplannedreceiptJobAppService = await _unplannedReceiptJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
         {
             Condition = new Condition
@@ -377,11 +393,27 @@ public class JobController : AbpController
                 Filters = new List<Filter>
                 {
                     new(nameof(ProductionReturnJobDTO.WorkGroupCode),jsonCodes,"In"),
-                    new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In")
+                    new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In"),
+                    new(nameof(UnplannedIssueJobDTO.IsHasPackingCode),"0","In"),
                 }
             }
         }).ConfigureAwait(false);
-        list.Add(new JobCountDto { JobType = EnumJobType.SparePartIssueJob, Count = sparePartIssueJob });
+        list.Add(new JobCountDto { JobType = EnumJobType.UnplannedReceiptJobHasPacking, Count = unplannedreceiptJobAppService });
+
+        //非生产退料 原料
+        var unplannedreceiptJobAppService2 = await _unplannedReceiptJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
+        {
+            Condition = new Condition
+            {
+                Filters = new List<Filter>
+                {
+                    new(nameof(ProductionReturnJobDTO.WorkGroupCode),jsonCodes,"In"),
+                    new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In"),
+                    new(nameof(UnplannedIssueJobDTO.IsHasPackingCode),"1","In"),
+                }
+            }
+        }).ConfigureAwait(false);
+        list.Add(new JobCountDto { JobType = EnumJobType.UnplannedReceiptJobNoPacking, Count = unplannedreceiptJobAppService2 });
 
 
         return new ListResultDto<JobCountDto>(list);

be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Job/EnumJobType.cs

@@ -143,4 +143,13 @@ public enum EnumJobType
     /// </summary>
     [Display(Name = "盘点任务")]
     CountJob = 24,
+    [Display(Name = "非生产领料 原料")]
+    UnplannedIssueJobHasPacking = 96,
+    [Display(Name = "非生产领料 线边")]
+    UnplannedIssueJobNoPacking = 97,
+    [Display(Name = "非生产退料 原料")]
+    UnplannedReceiptJobHasPacking = 98,
+    [Display(Name = "非生产退料 线边")]
+    UnplannedReceiptJobNoPacking = 99
+    
 }