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

@@ -39,6 +39,8 @@ public class JobController : AbpController
     private readonly IAssembleIssueJobAppService _assembleIssueJobAppService;
     private readonly IKittingIssueJobAppService _kittingIssueJobAppService;
     private readonly ISparePartIssueJobAppService _sparePartIssueJobAppService;
+    private readonly IUnplannedIssueJobAppService _unplannedIssueJobAppService;
+    private readonly IUnplannedReceiptJobAppService _unplannedReceiptJobAppService;
 
     /// <summary>
     ///
@@ -70,7 +72,9 @@ public class JobController : AbpController
         ICoatingIssueJobAppService coatingIssueJobAppService,
         IAssembleIssueJobAppService assembleIssueJobAppService,
         IKittingIssueJobAppService kittingIssueJobAppService,
-        ISparePartIssueJobAppService sparePartIssueJobAppService)
+        ISparePartIssueJobAppService sparePartIssueJobAppService,
+        IUnplannedIssueJobAppService unplannedIssueJobAppService,
+        IUnplannedReceiptJobAppService unplannedReceiptJobAppService)
     {
         _userWorkGroupAppService = userWorkGroupAppService;
         _countJobAppService = countJobAppService;
@@ -90,6 +94,8 @@ public class JobController : AbpController
         _assembleIssueJobAppService = assembleIssueJobAppService;
         _kittingIssueJobAppService = kittingIssueJobAppService;
         _sparePartIssueJobAppService = sparePartIssueJobAppService;
+        _unplannedIssueJobAppService = unplannedIssueJobAppService;
+        _unplannedReceiptJobAppService = unplannedReceiptJobAppService;
     }
 
     /// <summary>
@@ -348,6 +354,36 @@ 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
+            {
+                Filters = new List<Filter>
+                {
+                    new(nameof(ProductionReturnJobDTO.WorkGroupCode),jsonCodes,"In"),
+                    new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In")
+                }
+            }
+        }).ConfigureAwait(false);
+        list.Add(new JobCountDto { JobType = EnumJobType.SparePartIssueJob, Count = sparePartIssueJob });
+
+        //非生产退料       
+        var unplannedreceiptJobAppService = await _unplannedReceiptJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
+        {
+            Condition = new Condition
+            {
+                Filters = new List<Filter>
+                {
+                    new(nameof(ProductionReturnJobDTO.WorkGroupCode),jsonCodes,"In"),
+                    new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In")
+                }
+            }
+        }).ConfigureAwait(false);
+        list.Add(new JobCountDto { JobType = EnumJobType.SparePartIssueJob, Count = sparePartIssueJob });
+
+
         return new ListResultDto<JobCountDto>(list);
     }
 }

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

@@ -360,10 +360,6 @@ public class UnplannedIssueJobAppService
 
                     switch (locationDto.Type)
                     {
-                        case EnumLocationType.SEMI:
-                            job.IsHasPackingCode = 0;
-                            job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
-                            break;
                         case EnumLocationType.CUST:
                             job.IsHasPackingCode = 0;
                             job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
@@ -384,11 +380,7 @@ public class UnplannedIssueJobAppService
                             job.IsHasPackingCode = 0;
                             job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
                             break;
-                        case EnumLocationType.DimensionalStorehouse:
-                            job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
-                            job.IsHasPackingCode = 0;
-                            break;
-
+                        //------------------
                         case EnumLocationType.KittingWip:
                             job.IsHasPackingCode = 0;
                             job.UnplannedIssueType = EnumUnplannedIssueType.Wip;
@@ -397,10 +389,16 @@ public class UnplannedIssueJobAppService
                             job.IsHasPackingCode = 0;
                             job.UnplannedIssueType = EnumUnplannedIssueType.Wip;
                             break;
+                        case EnumLocationType.SEMI:
+                            job.IsHasPackingCode = 0;
+                            job.UnplannedIssueType = EnumUnplannedIssueType.Wip;
+                            break;
+                        case EnumLocationType.DimensionalStorehouse:
+                            job.UnplannedIssueType = EnumUnplannedIssueType.Wip;
+                            job.IsHasPackingCode = 0;
+                            break;
                     }
 
-
-
                     job.ItemCode = requestDtoDetail.ItemCode;
                     job.ItemName = requestDtoDetail.ItemName;
                     job.ItemDesc1 = requestDtoDetail.ItemDesc1;

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

@@ -219,10 +219,6 @@ public class UnplannedReceiptJobAppService
 
             switch(locationDtos.First().Type)
             {
-                case EnumLocationType.SEMI:
-                    job.IsHasPackingCode = 0;
-                    job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
-                    break;
                 case EnumLocationType.CUST:
                     job.IsHasPackingCode = 0;
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
@@ -243,11 +239,7 @@ public class UnplannedReceiptJobAppService
                     job.IsHasPackingCode = 0;
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
                     break;
-                case EnumLocationType.DimensionalStorehouse:
-                    job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
-                    job.IsHasPackingCode = 0;
-                    break;
-
+                //--------------
                 case EnumLocationType.KittingWip:
                     job.IsHasPackingCode = 0;
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Wip;
@@ -256,6 +248,14 @@ public class UnplannedReceiptJobAppService
                     job.IsHasPackingCode = 0;
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Wip;
                     break;
+                case EnumLocationType.SEMI:
+                    job.IsHasPackingCode = 0;
+                    job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
+                    break;
+                case EnumLocationType.DimensionalStorehouse:
+                    job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
+                    job.IsHasPackingCode = 0;
+                    break;
             }
 
             jobs.Add(job);