Ver código fonte

service autoCache

LD 5 anos atrás
pai
commit
d31a881646
100 arquivos alterados com 198 adições e 102 exclusões
  1. 2 1
      app/Services/AllInventoryService.php
  2. 1 0
      app/Services/AuthorityService.php
  3. 2 1
      app/Services/BatchService.php
  4. 1 0
      app/Services/CacheService.php
  5. 2 1
      app/Services/CarTypeService.php
  6. 2 1
      app/Services/CarrierService.php
  7. 1 0
      app/Services/CheckActiveMenuService.php
  8. 2 1
      app/Services/CityService.php
  9. 2 1
      app/Services/CommodityBarcodeService.php
  10. 2 1
      app/Services/CommodityService.php
  11. 2 1
      app/Services/CustomerLogService.php
  12. 2 1
      app/Services/CustomerLogStatusService.php
  13. 2 1
      app/Services/CustomerService.php
  14. 2 1
      app/Services/DepositoryService.php
  15. 2 1
      app/Services/DocWaveHeaderService.php
  16. 2 1
      app/Services/FeatureService.php
  17. 1 0
      app/Services/ForeignHaiRoboticsService.php
  18. 2 1
      app/Services/InventoryAccountMissionService.php
  19. 1 0
      app/Services/InventoryAccountService.php
  20. 1 0
      app/Services/InventoryCompareService.php
  21. 2 1
      app/Services/InventoryDailyLogService.php
  22. 1 0
      app/Services/InventoryService.php
  23. 1 0
      app/Services/LaborReportService.php
  24. 1 0
      app/Services/LaborReportsCountingRecordService.php
  25. 1 0
      app/Services/LogService.php
  26. 2 1
      app/Services/LogisticService.php
  27. 2 1
      app/Services/LogisticTimingService.php
  28. 37 40
      app/Services/MaterialBoxService.php
  29. 1 0
      app/Services/NewOrderCountingRecordService.php
  30. 2 1
      app/Services/OracleActAllocationDetailService.php
  31. 2 1
      app/Services/OracleBasCustomerService.php
  32. 2 1
      app/Services/OracleBasSkuService.php
  33. 2 1
      app/Services/OracleDOCOrderHeaderService.php
  34. 2 1
      app/Services/OracleDocAsnDetailService.php
  35. 2 1
      app/Services/OracleDocAsnHerderService.php
  36. 1 0
      app/Services/OracleDocWaveDetailService.php
  37. 2 1
      app/Services/OrderCommodityAssignService.php
  38. 2 1
      app/Services/OrderCommodityService.php
  39. 3 2
      app/Services/OrderFreezeService.php
  40. 1 0
      app/Services/OrderIssuePerformanceService.php
  41. 1 0
      app/Services/OrderIssueProcessLogService.php
  42. 1 0
      app/Services/OrderIssueService.php
  43. 1 0
      app/Services/OrderIssueWorkLoadService.php
  44. 1 0
      app/Services/OrderPackageCommoditiesService.php
  45. 1 0
      app/Services/OrderPackageService.php
  46. 1 0
      app/Services/OrderService.php
  47. 1 0
      app/Services/OrderTrackingOwnerService.php
  48. 1 0
      app/Services/OrderTrackingService.php
  49. 2 1
      app/Services/OwnerAreaReportService.php
  50. 2 1
      app/Services/OwnerBillReportService.php
  51. 2 1
      app/Services/OwnerFeeDetailService.php
  52. 2 1
      app/Services/OwnerPriceDirectLogisticService.php
  53. 2 1
      app/Services/OwnerPriceExpressService.php
  54. 2 1
      app/Services/OwnerPriceLogisticService.php
  55. 2 1
      app/Services/OwnerPriceOperationItemService.php
  56. 2 1
      app/Services/OwnerPriceOperationService.php
  57. 2 1
      app/Services/OwnerReportService.php
  58. 2 1
      app/Services/OwnerService.php
  59. 2 1
      app/Services/OwnerStoragePriceModelService.php
  60. 2 1
      app/Services/PackageService.php
  61. 2 1
      app/Services/PackageStatisticsService.php
  62. 2 1
      app/Services/ProcessMethodService.php
  63. 2 1
      app/Services/ProcessService.php
  64. 2 1
      app/Services/ProcessStatisticService.php
  65. 2 1
      app/Services/ProcessesContentService.php
  66. 2 1
      app/Services/ProvinceService.php
  67. 2 1
      app/Services/QualityLabelService.php
  68. 1 0
      app/Services/RealtimePendingOrdersService.php
  69. 3 2
      app/Services/RegionService.php
  70. 2 1
      app/Services/RejectedBillItemService.php
  71. 2 1
      app/Services/RejectedBillService.php
  72. 1 0
      app/Services/RejectedService.php
  73. 1 0
      app/Services/ShopService.php
  74. 1 0
      app/Services/StationRuleBatchService.php
  75. 1 0
      app/Services/StationService.php
  76. 1 0
      app/Services/StationTaskBatchService.php
  77. 1 0
      app/Services/StationTaskBatchTypeService.php
  78. 1 0
      app/Services/StationTaskChildService.php
  79. 1 0
      app/Services/StationTaskCommodityService.php
  80. 1 0
      app/Services/StationTaskMaterialBoxService.php
  81. 1 0
      app/Services/StationTaskService.php
  82. 1 0
      app/Services/StationTypeService.php
  83. 2 1
      app/Services/StoreCheckingReceiveItemService.php
  84. 2 1
      app/Services/StoreCheckingReceiveService.php
  85. 2 1
      app/Services/StoreItemService.php
  86. 2 1
      app/Services/StoreService.php
  87. 1 0
      app/Services/TestService.php
  88. 2 1
      app/Services/UnitService.php
  89. 1 0
      app/Services/UserDutyCheckService.php
  90. 2 1
      app/Services/UserOwnerGroupService.php
  91. 1 0
      app/Services/UserService.php
  92. 2 1
      app/Services/WarehouseService.php
  93. 1 0
      app/Services/WaveService.php
  94. 2 1
      app/Services/WaybillFinancialService.php
  95. 2 1
      app/Services/WaybillPayoffService.php
  96. 2 1
      app/Services/WaybillPriceModelService.php
  97. 2 1
      app/Services/WaybillService.php
  98. 2 1
      app/Services/WeighExceptedService.php
  99. 1 0
      app/Services/common/BatchUpdateService.php
  100. 1 0
      app/Services/common/DataHandlerService.php

+ 2 - 1
app/Services/AllInventoryService.php

@@ -7,9 +7,10 @@ use Illuminate\Support\Facades\DB;
 use App\Traits\ServiceAppAop;
 
 
-Class AllInventoryService
+class AllInventoryService
 {
     use ServiceAppAop;
+    protected $modelClass=AllInventory::class;
     public function getSql(array $params, $page=null, $paginate=null){
         $ownerCodes=Owner::filterAuthorities()->select('code')->get();
         $date_start=$params['date_start'] ?? null;

+ 1 - 0
app/Services/AuthorityService.php

@@ -14,6 +14,7 @@ use App\Traits\ServiceAppAop;
 class AuthorityService
 {
     use ServiceAppAop;
+    protected $modelClass=Authority::class;
 //    /**
 //     * @return Authority[]
 //     */

+ 2 - 1
app/Services/BatchService.php

@@ -13,9 +13,10 @@ use Illuminate\Support\Facades\Http;
 use App\Traits\ServiceAppAop;
 
 
-Class BatchService
+class BatchService
 {
     use ServiceAppAop;
+    protected $modelClass=Batch::class;
     /** @var StationTaskBatchService $stationTaskBatchService */
     private $stationTaskBatchService;
     /** @var StationRuleBatchService $stationRuleBatchService */

+ 1 - 0
app/Services/CacheService.php

@@ -11,6 +11,7 @@ use App\Traits\ServiceAppAop;
 class CacheService
 {
     use ServiceAppAop;
+    protected $modelClass=Cache::class;
     function getOrExecute(String $key, $func, $expiration=-1){
         if($expiration === -1) $expiration=config('cache.expirations.default');
         return Cache::remember($key, $expiration, $func);

+ 2 - 1
app/Services/CarTypeService.php

@@ -6,9 +6,10 @@ use App\CarType;
 use App\Traits\ServiceAppAop;
 
 
-Class CarTypeService
+class CarTypeService
 {
     use ServiceAppAop;
+    protected $modelClass=CarType::class;
     /*
      * array | string $column
      * 默认一些select字段,可传递string 或 array来指定select字段

+ 2 - 1
app/Services/CarrierService.php

@@ -6,9 +6,10 @@ use App\Carrier;
 use App\Traits\ServiceAppAop;
 
 
-Class CarrierService
+class CarrierService
 {
     use ServiceAppAop;
+    protected $modelClass=Carrier::class;
     public function getSelection(){
         return Carrier::query()->select('id','name')->get();
     }

+ 1 - 0
app/Services/CheckActiveMenuService.php

@@ -19,6 +19,7 @@ use App\Traits\ServiceAppAop;
 class CheckActiveMenuService
 {
     use ServiceAppAop;
+    protected $modelClass=CheckActiveMenu::class;
     /**
      *同步数据到数据库并且将L1转移到L2
      */

+ 2 - 1
app/Services/CityService.php

@@ -7,9 +7,10 @@ use Illuminate\Support\Str;
 use App\Traits\ServiceAppAop;
 
 
-Class CityService
+class CityService
 {
     use ServiceAppAop;
+    protected $modelClass=City::class;
     public static $cities = ['汕头','汕尾'];
 
     /*

+ 2 - 1
app/Services/CommodityBarcodeService.php

@@ -10,9 +10,10 @@ use Illuminate\Support\Facades\Cache;
 use App\Traits\ServiceAppAop;
 
 
-Class CommodityBarcodeService
+class CommodityBarcodeService
 {
     use ServiceAppAop;
+    protected $modelClass=CommodityBarcode::class;
     public function getCommodities(array $codes, $owner_id){
         return CommodityBarcode::query()->whereHas('commodity',function ($query)use($owner_id){
             $query->where('owner_id',$owner_id);

+ 2 - 1
app/Services/CommodityService.php

@@ -17,9 +17,10 @@ use Illuminate\Support\Facades\Cache;
 use App\Traits\ServiceAppAop;
 
 
-Class CommodityService
+class CommodityService
 {
     use ServiceAppAop;
+    protected $modelClass=Commodity::class;
 
     /**
      * @var CacheService $cacheService

+ 2 - 1
app/Services/CustomerLogService.php

@@ -6,9 +6,10 @@ use App\CustomerLog;
 use App\Traits\ServiceAppAop;
 
 
-Class CustomerLogService
+class CustomerLogService
 {
     use ServiceAppAop;
+    protected $modelClass=CustomerLog::class;
     public function get(array $params, array $withs=[])
     {
         $query = CustomerLog::query()->with($withs)->orderByDesc('id');

+ 2 - 1
app/Services/CustomerLogStatusService.php

@@ -6,9 +6,10 @@ use App\CustomerLogStatus;
 use App\Traits\ServiceAppAop;
 
 
-Class CustomerLogStatusService
+class CustomerLogStatusService
 {
     use ServiceAppAop;
+    protected $modelClass=CustomerLogStatus::class;
     public function update(array $params, array $values)
     {
         $query = CustomerLogStatus::query();

+ 2 - 1
app/Services/CustomerService.php

@@ -8,9 +8,10 @@ use Illuminate\Database\Eloquent\Builder;
 use App\Traits\ServiceAppAop;
 
 
-Class CustomerService
+class CustomerService
 {
     use ServiceAppAop;
+    protected $modelClass=Customer::class;
     public function getSelection($column = ['id', 'name'])
     {
         return Customer::query()->select($column)->get();

+ 2 - 1
app/Services/DepositoryService.php

@@ -6,9 +6,10 @@ use App\Depository;
 use App\Traits\ServiceAppAop;
 
 
-Class DepositoryService
+class DepositoryService
 {
     use ServiceAppAop;
+    protected $modelClass=Depository::class;
     public function firstOrCreate(array $params, array $values = null){
         if (!$values) $values = $params;
         return Depository::query()->firstOrCreate($params, $values);

+ 2 - 1
app/Services/DocWaveHeaderService.php

@@ -10,9 +10,10 @@ use Yajra\Oci8\Query\OracleBuilder;
 use App\Traits\ServiceAppAop;
 
 
-Class DocWaveHeaderService
+class DocWaveHeaderService
 {
     use ServiceAppAop;
+    protected $modelClass=DocWaveHeader::class;
 
     public function get(array $params, $rule = [])
     {

+ 2 - 1
app/Services/FeatureService.php

@@ -6,9 +6,10 @@ use App\Feature;
 use App\Traits\ServiceAppAop;
 
 
-Class FeatureService
+class FeatureService
 {
     use ServiceAppAop;
+    protected $modelClass=Feature::class;
     public function getMapArray()
     {
         $features = Feature::query()->get();

+ 1 - 0
app/Services/ForeignHaiRoboticsService.php

@@ -18,6 +18,7 @@ use App\Traits\ServiceAppAop;
 class ForeignHaiRoboticsService
 {
     use ServiceAppAop;
+    protected $modelClass=ForeignHaiRobotics::class;
 
     /** @var  $stationTaskMaterialBoxService StationTaskMaterialBoxService */
     private $stationTaskMaterialBoxService;

+ 2 - 1
app/Services/InventoryAccountMissionService.php

@@ -6,9 +6,10 @@ use App\Services\common\BatchUpdateService;
 use App\Traits\ServiceAppAop;
 
 
-Class InventoryAccountMissionService
+class InventoryAccountMissionService
 {
     use ServiceAppAop;
+    protected $modelClass=InventoryAccountMission::class;
 
     public function batchUpdateItself($column, array $params)
     {

+ 1 - 0
app/Services/InventoryAccountService.php

@@ -26,6 +26,7 @@ use App\Traits\ServiceAppAop;
 class InventoryAccountService
 {
     use ServiceAppAop;
+    protected $modelClass=InventoryAccount::class;
     private function conditionQueryInventoryAccountMission(array $params){
         $inventoryAccountMissions=InventoryAccountMission::with(['commodity.barcodes','stockInventoryPersons'])->orderBy('difference_amount','desc');
         $columnQueryRules=[];

+ 1 - 0
app/Services/InventoryCompareService.php

@@ -21,6 +21,7 @@ use App\Traits\ServiceAppAop;
 class InventoryCompareService
 {
     use ServiceAppAop;
+    protected $modelClass=InventoryCompare::class;
     static private $missionCode;
     public function getCreatingMissionCode($ownerName=''){
         if(self::$missionCode)return self::$missionCode;

+ 2 - 1
app/Services/InventoryDailyLogService.php

@@ -9,9 +9,10 @@ use App\Services\common\QueryService;
 use App\Traits\ServiceAppAop;
 
 
-Class InventoryDailyLogService
+class InventoryDailyLogService
 {
     use ServiceAppAop;
+    protected $modelClass=InventoryDailyLog::class;
     //库存体积条件
     function conditionQuery(array $param){
         $inventoryDailyLogs = InventoryDailyLog::query()->with(['depository','owner','commodity'=>function($query){

+ 1 - 0
app/Services/InventoryService.php

@@ -14,6 +14,7 @@ use App\Traits\ServiceAppAop;
 class InventoryService
 {
     use ServiceAppAop;
+    protected $modelClass=Inventory::class;
     public function getSql(array $params,$page=null,$paginate=null){
         $ownerCodes=Owner::filterAuthorities()->select('code')->get();
         $date_start=$params['date_start'] ?? null;

+ 1 - 0
app/Services/LaborReportService.php

@@ -28,6 +28,7 @@ use App\Traits\ServiceAppAop;
 class LaborReportService
 {
     use ServiceAppAop;
+    protected $modelClass=LaborReport::class;
     private function conditionQuery(array $params){
         $user=Auth::user();
         $laborReports=LaborReport::query()

+ 1 - 0
app/Services/LaborReportsCountingRecordService.php

@@ -17,6 +17,7 @@ use App\Traits\ServiceAppAop;
 class LaborReportsCountingRecordService
 {
     use ServiceAppAop;
+    protected $modelClass=LaborReportsCountingRecord::class;
     public function __construct(LaborReport $laborReport)
     {
         $laborReport::$withoutAppends = false;

+ 1 - 0
app/Services/LogService.php

@@ -13,6 +13,7 @@ use App\Traits\ServiceAppAop;
 class LogService
 {
     use ServiceAppAop;
+    protected $modelClass=Log::class;
     static public function log($class, $method, $description, $id_user = null,$type='log')
     {
         if (!$id_user) {

+ 2 - 1
app/Services/LogisticService.php

@@ -13,9 +13,10 @@ use Illuminate\Support\Str;
 use App\Traits\ServiceAppAop;
 
 
-Class LogisticService
+class LogisticService
 {
     use ServiceAppAop;
+    protected $modelClass=Logistic::class;
     /** @var CacheService $cacheService */
     private $cacheService;
     function __construct(){

+ 2 - 1
app/Services/LogisticTimingService.php

@@ -8,9 +8,10 @@ use App\Province;
 use App\Traits\ServiceAppAop;
 
 
-Class LogisticTimingService
+class LogisticTimingService
 {
     use ServiceAppAop;
+    protected $modelClass=LogisticTiming::class;
 
     public function findByParams($cityName,$provinceName,$logisticId)
     {

+ 37 - 40
app/Services/MaterialBoxService.php

@@ -13,44 +13,41 @@ use App\Traits\ServiceAppAop;
 class MaterialBoxService
 {
     use ServiceAppAop;
-    function getModelClass(): string
-    {
-        return MaterialBox::class;
-    }
-
-    function get(array $kvPairs):?Collection{
-        return Cache::remember($this->cachingKey($kvPairs), config('cache.expirations.rarelyChange'), function ()use($kvPairs) {
-            $query = MaterialBox::query();
-            foreach ($kvPairs as $column => $value){
-                if (is_array($value))$query->whereIn($column,$value);
-                else $query->where($column,$value);
-            }
-            return $query->get();
-        });
-    }
-
-    protected function cachingKey(array $kvPairs){
-        ksort($kvPairs);
-        return 'MaterialBox_'.md5(json_encode($kvPairs));
-    }
-
-    protected function clearCache(array $kvPairs){
-        Cache::forget($this->cachingKey($kvPairs));
-    }
-
-    function create(array $kvPairs){
-        $materialBox=$this->get($kvPairs);
-        if($materialBox->isNotEmpty())
-            return $materialBox->first();
-        $this->clearCache($kvPairs);
-        return MaterialBox::query()->create($kvPairs);
-    }
-
-    function firstOrCreate(array $kvPairs){
-        $materialBox=$this->get($kvPairs);
-        if($materialBox->isNotEmpty())
-            return $materialBox->first();
-        $this->clearCache($kvPairs);
-        return $this->create($kvPairs);
-    }
+    protected $modelClass=MaterialBox::class;
+
+//    function get(array $kvPairs):?Collection{
+//        return Cache::remember($this->cachingKey($kvPairs), config('cache.expirations.rarelyChange'), function ()use($kvPairs) {
+//            $query = MaterialBox::query();
+//            foreach ($kvPairs as $column => $value){
+//                if (is_array($value))$query->whereIn($column,$value);
+//                else $query->where($column,$value);
+//            }
+//            return $query->get();
+//        });
+//    }
+//
+//    protected function cachingKey(array $kvPairs){
+//        ksort($kvPairs);
+//        return 'MaterialBox_'.md5(json_encode($kvPairs));
+//    }
+//
+//    protected function clearCache(array $kvPairs){
+//        Cache::forget($this->cachingKey($kvPairs));
+//    }
+//
+//    function create(array $kvPairs){
+//        $materialBox=$this->get($kvPairs);
+//        if($materialBox->isNotEmpty())
+//            return $materialBox->first();
+//        $this->clearCache($kvPairs);
+//        return MaterialBox::query()->create($kvPairs);
+//    }
+//
+//    function firstOrCreate(array $kvPairs){
+//        $materialBox=$this->get($kvPairs);
+//        if($materialBox->isNotEmpty())
+//            return $materialBox->first();
+//        $this->clearCache($kvPairs);
+//        return $this->create($kvPairs);
+//    }
 }

+ 1 - 0
app/Services/NewOrderCountingRecordService.php

@@ -18,6 +18,7 @@ use App\Traits\ServiceAppAop;
 class NewOrderCountingRecordService
 {
     use ServiceAppAop;
+    protected $modelClass=NewOrderCountingRecord::class;
     public function orderCountingRecordsFromCache($start, $end, $unit, $ownerIds)
     {
         $dataList = collect();

+ 2 - 1
app/Services/OracleActAllocationDetailService.php

@@ -11,9 +11,10 @@ use Illuminate\Support\Facades\DB;
  */use App\Traits\ServiceAppAop;
 
 
-Class OracleActAllocationDetailService
+class OracleActAllocationDetailService
 {
     use ServiceAppAop;
+    protected $modelClass=OracleActAllocationDetail::class;
     private function query($sql, array $params){
         if ($params['checktime_start'] ?? false){
             $sql .= " AND checktime >= '".$params['checktime_start'].":00'";

+ 2 - 1
app/Services/OracleBasCustomerService.php

@@ -6,9 +6,10 @@ use App\OracleBasCustomer;
 use App\Traits\ServiceAppAop;
 
 
-Class OracleBasCustomerService
+class OracleBasCustomerService
 {
     use ServiceAppAop;
+    protected $modelClass=OracleBasCustomer::class;
     /** @var CacheService $cacheService */
     private $cacheService;
 

+ 2 - 1
app/Services/OracleBasSkuService.php

@@ -7,9 +7,10 @@ use Illuminate\Support\Facades\DB;
 use App\Traits\ServiceAppAop;
 
 
-Class OracleBasSkuService
+class OracleBasSkuService
 {
     use ServiceAppAop;
+    protected $modelClass=OracleBasSku::class;
     public function getOwnerCommodities(array $params){
         $query = OracleBasSKU::query();
         if ($params['code'] ?? false){

+ 2 - 1
app/Services/OracleDOCOrderHeaderService.php

@@ -11,9 +11,10 @@ use App\Owner;
 use App\Traits\ServiceAppAop;
 
 
-Class OracleDOCOrderHeaderService
+class OracleDOCOrderHeaderService
 {
     use ServiceAppAop;
+    protected $modelClass=OracleDOCOrderHeader::class;
 
     static $columns =[
         'DOC_Order_Header.OrderNo','DOC_Order_Header.CustomerID','DOC_Order_Header.OrderTime',

+ 2 - 1
app/Services/OracleDocAsnDetailService.php

@@ -6,9 +6,10 @@ use App\OracleDOCASNDetail;
 use App\Traits\ServiceAppAop;
 
 
-Class OracleDocAsnDetailService
+class OracleDocAsnDetailService
 {
     use ServiceAppAop;
+    protected $modelClass=OracleDocAsnDetail::class;
     const TABLE = "DOC_ASN_DETAILS";
     public function getLeftJoinBasSku(array $params){
         $query = OracleDOCASNDetail::query();

+ 2 - 1
app/Services/OracleDocAsnHerderService.php

@@ -6,9 +6,10 @@ use App\OracleDOCASNHeader;
 use App\Traits\ServiceAppAop;
 
 
-Class OracleDocAsnHerderService
+class OracleDocAsnHerderService
 {
     use ServiceAppAop;
+    protected $modelClass=OracleDocAsnHerder::class;
     public function getWmsAsnOnStartDateCreate($startDate)
     {
         if (!$startDate) return null;

+ 1 - 0
app/Services/OracleDocWaveDetailService.php

@@ -14,6 +14,7 @@ use App\Traits\ServiceAppAop;
 class OracleDocWaveDetailService
 {
     use ServiceAppAop;
+    protected $modelClass=OracleDocWaveDetail::class;
     public function clearCancelledOrder($orderHeaders)
     {
         if (!$orderHeaders) return;

+ 2 - 1
app/Services/OrderCommodityAssignService.php

@@ -6,9 +6,10 @@ use App\OrderCommodityAssign;
 use App\Traits\ServiceAppAop;
 
 
-Class OrderCommodityAssignService
+class OrderCommodityAssignService
 {
     use ServiceAppAop;
+    protected $modelClass=OrderCommodityAssign::class;
 
     public function paginate(array $params = null)
     {

+ 2 - 1
app/Services/OrderCommodityService.php

@@ -10,9 +10,10 @@ use Carbon\Carbon;
 use App\Traits\ServiceAppAop;
 
 
-Class OrderCommodityService
+class OrderCommodityService
 {
     use ServiceAppAop;
+    protected $modelClass=OrderCommodity::class;
 
     public function insert($innerParams){
         if(!$innerParams)return false;

+ 3 - 2
app/Services/OrderFreezeService.php

@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 namespace App\Services;
 
@@ -8,6 +8,7 @@ use Illuminate\Support\Facades\Cache;
 class OrderFreezeService
 {
     use ServiceAppAop;
+    protected $modelClass=OrderFreeze::class;
 
 
     /**
@@ -47,4 +48,4 @@ class OrderFreezeService
                 unset($freeze->logistic,$freeze->province,$freeze->city,$freeze->district,$freeze->town,$freeze->street);
             })->toArray();
     }
-}
+}

+ 1 - 0
app/Services/OrderIssuePerformanceService.php

@@ -20,6 +20,7 @@ use App\Traits\ServiceAppAop;
 class OrderIssuePerformanceService
 {
     use ServiceAppAop;
+    protected $modelClass=OrderIssuePerformance::class;
     public function paginate(array $params)
     {
         $paginate = $params['paginate'] ?? 50;

+ 1 - 0
app/Services/OrderIssueProcessLogService.php

@@ -11,6 +11,7 @@ use App\Traits\ServiceAppAop;
 class OrderIssueProcessLogService
 {
     use ServiceAppAop;
+    protected $modelClass=OrderIssueProcessLog::class;
 
     public function batchStoreAndReturnLogs($params)
     {

+ 1 - 0
app/Services/OrderIssueService.php

@@ -24,6 +24,7 @@ use App\Traits\ServiceAppAop;
 class OrderIssueService
 {
     use ServiceAppAop;
+    protected $modelClass=OrderIssue::class;
 
     public function insert($params)
     {

+ 1 - 0
app/Services/OrderIssueWorkLoadService.php

@@ -16,6 +16,7 @@ use App\Traits\ServiceAppAop;
 class OrderIssueWorkLoadService
 {
     use ServiceAppAop;
+    protected $modelClass=OrderIssueWorkLoad::class;
     public function getQuery(array $queryParam)
     {
         $user = Auth::user();

+ 1 - 0
app/Services/OrderPackageCommoditiesService.php

@@ -20,6 +20,7 @@ use App\Traits\ServiceAppAop;
 class OrderPackageCommoditiesService
 {
     use ServiceAppAop;
+    protected $modelClass=OrderPackageCommodities::class;
     public function insert(array $params){
         return OrderPackageCommodities::query()->insert($params);
     }

+ 1 - 0
app/Services/OrderPackageService.php

@@ -18,6 +18,7 @@ use App\Traits\ServiceAppAop;
 class OrderPackageService
 {
     use ServiceAppAop;
+    protected $modelClass=OrderPackage::class;
     public function batchUpdate(array $params){
         return app(BatchUpdateService::class)->batchUpdate('order_packages',$params);
     }

+ 1 - 0
app/Services/OrderService.php

@@ -30,6 +30,7 @@ use App\Traits\ServiceAppAop;
 class OrderService
 {
     use ServiceAppAop;
+    protected $modelClass=Order::class;
     /**
      * @var OracleDOCOrderHeaderService $oracleDOCOrderHeaderService
      * @var OrderPackageService $packageService

+ 1 - 0
app/Services/OrderTrackingOwnerService.php

@@ -9,6 +9,7 @@ use App\Traits\ServiceAppAop;
 class OrderTrackingOwnerService
 {
     use ServiceAppAop;
+    protected $modelClass=OrderTrackingOwner::class;
 
     public function getTrackingOrderOwner()
     {

+ 1 - 0
app/Services/OrderTrackingService.php

@@ -19,6 +19,7 @@ use App\Traits\ServiceAppAop;
 class OrderTrackingService
 {
     use ServiceAppAop;
+    protected $modelClass=OrderTracking::class;
     public function insert($params){
         return OrderTracking::query()->insert($params);
     }

+ 2 - 1
app/Services/OwnerAreaReportService.php

@@ -10,9 +10,10 @@ use Illuminate\Support\Facades\DB;
 use App\Traits\ServiceAppAop;
 
 
-Class OwnerAreaReportService
+class OwnerAreaReportService
 {
     use ServiceAppAop;
+    protected $modelClass=OwnerAreaReport::class;
     /**
      * @param Builder $builder
      * @param array $params

+ 2 - 1
app/Services/OwnerBillReportService.php

@@ -8,9 +8,10 @@ use Illuminate\Database\Eloquent\Builder;
 use App\Traits\ServiceAppAop;
 
 
-Class OwnerBillReportService
+class OwnerBillReportService
 {
     use ServiceAppAop;
+    protected $modelClass=OwnerBillReport::class;
 
     /**
      * @param Builder $builder

+ 2 - 1
app/Services/OwnerFeeDetailService.php

@@ -8,9 +8,10 @@ use Illuminate\Database\Eloquent\Builder;
 use App\Traits\ServiceAppAop;
 
 
-Class OwnerFeeDetailService
+class OwnerFeeDetailService
 {
     use ServiceAppAop;
+    protected $modelClass=OwnerFeeDetail::class;
     /**
      * @param Builder $builder
      * @param array $params

+ 2 - 1
app/Services/OwnerPriceDirectLogisticService.php

@@ -10,9 +10,10 @@ use Illuminate\Support\Facades\DB;
 use App\Traits\ServiceAppAop;
 
 
-Class OwnerPriceDirectLogisticService
+class OwnerPriceDirectLogisticService
 {
     use ServiceAppAop;
+    protected $modelClass=OwnerPriceDirectLogistic::class;
     public function paginate($id = null)
     {
         $query = OwnerPriceDirectLogistic::query()->with("owners");

+ 2 - 1
app/Services/OwnerPriceExpressService.php

@@ -11,9 +11,10 @@ use Illuminate\Support\Facades\DB;
 use App\Traits\ServiceAppAop;
 
 
-Class OwnerPriceExpressService
+class OwnerPriceExpressService
 {
     use ServiceAppAop;
+    protected $modelClass=OwnerPriceExpress::class;
 
     public function paginate($id = null)
     {

+ 2 - 1
app/Services/OwnerPriceLogisticService.php

@@ -8,9 +8,10 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\DB;
 use App\Traits\ServiceAppAop;
 
-Class OwnerPriceLogisticService
+class OwnerPriceLogisticService
 {
     use ServiceAppAop;
+    protected $modelClass=OwnerPriceLogistic::class;
     public function paginate($id = null)
     {
         $query = OwnerPriceLogistic::query()->with(["owners","logistics","unit","otherUnit"]);

+ 2 - 1
app/Services/OwnerPriceOperationItemService.php

@@ -6,9 +6,10 @@ use App\OwnerPriceOperationItem;
 use App\Traits\ServiceAppAop;
 
 
-Class OwnerPriceOperationItemService
+class OwnerPriceOperationItemService
 {
     use ServiceAppAop;
+    protected $modelClass=OwnerPriceOperationItem::class;
     public function get(array $params, array $withs = [], $isTranslateFeature = false, array $translateColumn = [])
     {
         if ($isTranslateFeature){

+ 2 - 1
app/Services/OwnerPriceOperationService.php

@@ -14,9 +14,10 @@ use Illuminate\Support\Facades\DB;
 use App\Traits\ServiceAppAop;
 
 
-Class OwnerPriceOperationService
+class OwnerPriceOperationService
 {
     use ServiceAppAop;
+    protected $modelClass=OwnerPriceOperation::class;
     /**
      * @param Builder $builder
      * @param array $params

+ 2 - 1
app/Services/OwnerReportService.php

@@ -8,9 +8,10 @@ use Illuminate\Database\Eloquent\Builder;
 use App\Traits\ServiceAppAop;
 
 
-Class OwnerReportService
+class OwnerReportService
 {
     use ServiceAppAop;
+    protected $modelClass=OwnerReport::class;
     /**
      * @param Builder $builder
      * @param array $params

+ 2 - 1
app/Services/OwnerService.php

@@ -15,9 +15,10 @@ use Illuminate\Support\Facades\DB;
 use App\Traits\ServiceAppAop;
 
 
-Class OwnerService
+class OwnerService
 {
     use ServiceAppAop;
+    protected $modelClass=Owner::class;
     /** @var CacheService $cacheService */
     private $cacheService;
     function __construct(){

+ 2 - 1
app/Services/OwnerStoragePriceModelService.php

@@ -9,9 +9,10 @@ use Illuminate\Support\Facades\DB;
 use App\Traits\ServiceAppAop;
 
 
-Class OwnerStoragePriceModelService
+class OwnerStoragePriceModelService
 {
     use ServiceAppAop;
+    protected $modelClass=OwnerStoragePriceModel::class;
     public function getSelection(array $columns = ["counting_type","using_type"], array $withs = [])
     {
         return OwnerStoragePriceModel::query()->select($columns)->with($withs)->get();

+ 2 - 1
app/Services/PackageService.php

@@ -12,9 +12,10 @@ const TABLE = "order_packages.";
 use App\Traits\ServiceAppAop;
 
 
-Class PackageService
+class PackageService
 {
     use ServiceAppAop;
+    protected $modelClass=Package::class;
     private function conditionQuery($params){
         $ownerIds=app('UserService')->getPermittingOwnerIds(Auth::user());
         $packages = OrderPackage::query()->with(['order'=>function($query){

+ 2 - 1
app/Services/PackageStatisticsService.php

@@ -10,9 +10,10 @@ use Illuminate\Support\Facades\DB;
 use App\Traits\ServiceAppAop;
 
 
-Class PackageStatisticsService
+class PackageStatisticsService
 {
     use ServiceAppAop;
+    protected $modelClass=PackageStatistics::class;
     /**
      * @param array $params
      * @return Builder

+ 2 - 1
app/Services/ProcessMethodService.php

@@ -7,9 +7,10 @@ use App\ProcessMethod;
 use App\Traits\ServiceAppAop;
 
 
-Class ProcessMethodService
+class ProcessMethodService
 {
     use ServiceAppAop;
+    protected $modelClass=ProcessMethod::class;
     public function getSelection($column = ['id','name']){
         return ProcessMethod::query()->select($column)->get();
     }

+ 2 - 1
app/Services/ProcessService.php

@@ -9,9 +9,10 @@ use Illuminate\Support\Facades\DB;
 use App\Traits\ServiceAppAop;
 
 
-Class ProcessService
+class ProcessService
 {
     use ServiceAppAop;
+    protected $modelClass=Process::class;
     /**
      * @param array $params
      * @return Builder

+ 2 - 1
app/Services/ProcessStatisticService.php

@@ -8,9 +8,10 @@ use Illuminate\Database\Eloquent\Builder;
 use App\Traits\ServiceAppAop;
 
 
-Class ProcessStatisticService
+class ProcessStatisticService
 {
     use ServiceAppAop;
+    protected $modelClass=ProcessStatistic::class;
     private function conditionQuery(array $params){
         $query = ProcessStatistic::with(['process'/*,'operatorLogSubmit'*/])->orderBy('process_statistics.process_id','DESC')
             ->has('process');

+ 2 - 1
app/Services/ProcessesContentService.php

@@ -6,9 +6,10 @@ use App\Services\common\BatchUpdateService;
 use App\Traits\ServiceAppAop;
 
 
-Class ProcessesContentService
+class ProcessesContentService
 {
     use ServiceAppAop;
+    protected $modelClass=ProcessesContent::class;
 
     public function batchUpdateItself($column, array $params)
     {

+ 2 - 1
app/Services/ProvinceService.php

@@ -7,9 +7,10 @@ use Illuminate\Support\Str;
 use App\Traits\ServiceAppAop;
 
 
-Class ProvinceService
+class ProvinceService
 {
     use ServiceAppAop;
+    protected $modelClass=Province::class;
     public static $provinces = ['青海','新疆','内蒙古','广西','西藏','宁夏','北京','上海','重庆','天津'];
 
 

+ 2 - 1
app/Services/QualityLabelService.php

@@ -6,9 +6,10 @@ use App\QualityLabel;
 use App\Traits\ServiceAppAop;
 
 
-Class QualityLabelService
+class QualityLabelService
 {
     use ServiceAppAop;
+    protected $modelClass=QualityLabel::class;
     /** @var CacheService $cacheService */
     private $cacheService;
     function __construct(){

+ 1 - 0
app/Services/RealtimePendingOrdersService.php

@@ -15,6 +15,7 @@ use App\Traits\ServiceAppAop;
 class RealtimePendingOrdersService
 {
     use ServiceAppAop;
+    protected $modelClass=RealtimePendingOrders::class;
     /**
      * 获取实时待处理订单
      * @param null $start

+ 3 - 2
app/Services/RegionService.php

@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 namespace App\Services;
 
@@ -8,6 +8,7 @@ use App\Traits\ServiceAppAop;
 class RegionService
 {
     use ServiceAppAop;
+    protected $modelClass=Region::class;
 
 
     /**
@@ -127,4 +128,4 @@ class RegionService
         }
         return $name;
     }
-}
+}

+ 2 - 1
app/Services/RejectedBillItemService.php

@@ -6,9 +6,10 @@ use App\RejectedBillItem;
 use App\Traits\ServiceAppAop;
 
 
-Class RejectedBillItemService
+class RejectedBillItemService
 {
     use ServiceAppAop;
+    protected $modelClass=RejectedBillItem::class;
     public function insert(array $params){
         return RejectedBillItem::query()->insert($params);
     }

+ 2 - 1
app/Services/RejectedBillService.php

@@ -20,9 +20,10 @@ use Illuminate\Database\Query\Builder;
 use function Symfony\Component\String\s;
 
 
-Class RejectedBillService
+class RejectedBillService
 {
     use ServiceAppAop;
+    protected $modelClass=RejectedBill::class;
     private function conditionQuery(array $params)
     {
         $query = RejectedBill::query();

+ 1 - 0
app/Services/RejectedService.php

@@ -16,6 +16,7 @@ use App\Traits\ServiceAppAop;
 class RejectedService
 {
     use ServiceAppAop;
+    protected $modelClass=Rejected::class;
     /** @var CacheService $cacheService */
     private $cacheService;
     function __construct(){

+ 1 - 0
app/Services/ShopService.php

@@ -14,6 +14,7 @@ use App\Traits\ServiceAppAop;
 class ShopService
 {
     use ServiceAppAop;
+    protected $modelClass=Shop::class;
     /** @var CacheService $cacheService */
     private $cacheService;
     function __construct(){

+ 1 - 0
app/Services/StationRuleBatchService.php

@@ -15,6 +15,7 @@ use App\Traits\ServiceAppAop;
 class StationRuleBatchService
 {
     use ServiceAppAop;
+    protected $modelClass=StationRuleBatch::class;
     function getByBatch(Batch $batch): ?StationRuleBatch
     {
         $batchType = $batch['type'] ?? 'null';

+ 1 - 0
app/Services/StationService.php

@@ -16,6 +16,7 @@ use App\Traits\ServiceAppAop;
 class StationService
 {
     use ServiceAppAop;
+    protected $modelClass=Station::class;
     /**
      * @param string $typeName
      * @return Station

+ 1 - 0
app/Services/StationTaskBatchService.php

@@ -15,6 +15,7 @@ use App\Traits\ServiceAppAop;
 class StationTaskBatchService
 {
     use ServiceAppAop;
+    protected $modelClass=StationTaskBatch::class;
     /** @var StationService $stationService */
     private $stationService;
     /** @var StationTaskBatchTypeService $stationTaskBatchTypeService */

+ 1 - 0
app/Services/StationTaskBatchTypeService.php

@@ -13,6 +13,7 @@ use App\Traits\ServiceAppAop;
 class StationTaskBatchTypeService
 {
     use ServiceAppAop;
+    protected $modelClass=StationTaskBatchType::class;
     /**
      * @param string $key
      * @param string $value

+ 1 - 0
app/Services/StationTaskChildService.php

@@ -13,6 +13,7 @@ use App\Traits\ServiceAppAop;
 class StationTaskChildService
 {
     use ServiceAppAop;
+    protected $modelClass=StationTaskChild::class;
 
     function get(array $kvPairs){
         ksort($kvPairs);

+ 1 - 0
app/Services/StationTaskCommodityService.php

@@ -17,6 +17,7 @@ use App\Traits\ServiceAppAop;
 class StationTaskCommodityService
 {
     use ServiceAppAop;
+    protected $modelClass=StationTaskCommodity::class;
     /** @var StationService $stationService */
     private $stationService;
     /** @var StationTypeService $stationTypeService */

+ 1 - 0
app/Services/StationTaskMaterialBoxService.php

@@ -18,6 +18,7 @@ use App\Traits\ServiceAppAop;
 class StationTaskMaterialBoxService
 {
     use ServiceAppAop;
+    protected $modelClass=StationTaskMaterialBox::class;
     /** @var StationService $stationService */
     private $stationService;
     /** @var StationTypeService $stationTypeService */

+ 1 - 0
app/Services/StationTaskService.php

@@ -16,6 +16,7 @@ use App\Traits\ServiceAppAop;
 class StationTaskService
 {
     use ServiceAppAop;
+    protected $modelClass=StationTask::class;
     /** @var StationTaskChildService $stationTaskChildService  */
     private $stationTaskChildService;
     public function __construct()

+ 1 - 0
app/Services/StationTypeService.php

@@ -13,6 +13,7 @@ use App\Traits\ServiceAppAop;
 class StationTypeService
 {
     use ServiceAppAop;
+    protected $modelClass=StationType::class;
     /** @var StationRuleBatchService $stationRuleBatchService */
     private $stationRuleBatchService;
     public function __construct()

+ 2 - 1
app/Services/StoreCheckingReceiveItemService.php

@@ -7,9 +7,10 @@ use App\StoreCheckingReceiveItem;
 use App\Traits\ServiceAppAop;
 
 
-Class StoreCheckingReceiveItemService
+class StoreCheckingReceiveItemService
 {
     use ServiceAppAop;
+    protected $modelClass=StoreCheckingReceiveItem::class;
     public function insert(array $params){
         return StoreCheckingReceiveItem::query()->insert($params);
     }

+ 2 - 1
app/Services/StoreCheckingReceiveService.php

@@ -8,9 +8,10 @@ use Illuminate\Database\Eloquent\Builder;
 use App\Traits\ServiceAppAop;
 
 
-Class StoreCheckingReceiveService
+class StoreCheckingReceiveService
 {
     use ServiceAppAop;
+    protected $modelClass=StoreCheckingReceive::class;
     /**
      * @param Builder $query
      * @param array $params

+ 2 - 1
app/Services/StoreItemService.php

@@ -11,9 +11,10 @@ use App\StoreItems;
 use App\Traits\ServiceAppAop;
 
 
-Class StoreItemService
+class StoreItemService
 {
     use ServiceAppAop;
+    protected $modelClass=StoreItem::class;
     public function insert(array $params)
     {
         return StoreItems::query()->insert($params);

+ 2 - 1
app/Services/StoreService.php

@@ -17,9 +17,10 @@ use Illuminate\Support\Facades\Cache;
 use App\Traits\ServiceAppAop;
 
 
-Class StoreService
+class StoreService
 {
     use ServiceAppAop;
+    protected $modelClass=Store::class;
     private function conditionQuery(array $params)
     {
         $stores = Store::query()->with(['storeItems.store', 'warehouse', 'owner'])->where('is_fast_stored', '无')->orderBy('id', 'DESC');

+ 1 - 0
app/Services/TestService.php

@@ -9,6 +9,7 @@ use App\Traits\ServiceAppAop;
 class TestService
 {
     use ServiceAppAop;
+    protected $modelClass=Test::class;
     public function __construct()
     {
         dd(323333);

+ 2 - 1
app/Services/UnitService.php

@@ -6,9 +6,10 @@ use App\Unit;
 use App\Traits\ServiceAppAop;
 
 
-Class UnitService
+class UnitService
 {
     use ServiceAppAop;
+    protected $modelClass=Unit::class;
     /*
      * array | string $column
      * 默认一些select字段,可传递string 或 array来指定select字段

+ 1 - 0
app/Services/UserDutyCheckService.php

@@ -7,5 +7,6 @@ namespace App\Services;use App\Traits\ServiceAppAop;
 class UserDutyCheckService
 {
     use ServiceAppAop;
+    protected $modelClass=UserDutyCheck::class;
 
 }

+ 2 - 1
app/Services/UserOwnerGroupService.php

@@ -7,9 +7,10 @@ use App\UserOwnerGroup;
 use App\Traits\ServiceAppAop;
 
 
-Class UserOwnerGroupService
+class UserOwnerGroupService
 {
     use ServiceAppAop;
+    protected $modelClass=UserOwnerGroup::class;
     public function getSelection($column = ['id', 'name'])
     {
         return UserOwnerGroup::query()->select($column)->get();

+ 1 - 0
app/Services/UserService.php

@@ -15,6 +15,7 @@ use App\Traits\ServiceAppAop;
 class UserService
 {
     use ServiceAppAop;
+    protected $modelClass=User::class;
     /** @var CacheService $cacheService */
     private $cacheService;
     function __construct(){

+ 2 - 1
app/Services/WarehouseService.php

@@ -11,9 +11,10 @@ use Illuminate\Support\Facades\Cache;
 use App\Traits\ServiceAppAop;
 
 
-Class WarehouseService
+class WarehouseService
 {
     use ServiceAppAop;
+    protected $modelClass=Warehouse::class;
     /** @var CacheService $cacheService */
     private $cacheService;
     function __construct(){

+ 1 - 0
app/Services/WaveService.php

@@ -13,6 +13,7 @@ use App\Traits\ServiceAppAop;
 class WaveService
 {
     use ServiceAppAop;
+    protected $modelClass=Wave::class;
     public function queryWave(Request $request)
     {
         $sql = $this->createSqlByCondition($request);

+ 2 - 1
app/Services/WaybillFinancialService.php

@@ -7,9 +7,10 @@ use App\WaybillFinancialSnapshot;
 use App\Traits\ServiceAppAop;
 
 
-Class WaybillFinancialService
+class WaybillFinancialService
 {
     use ServiceAppAop;
+    protected $modelClass=WaybillFinancial::class;
     public function conditionQuery(array $param){
         $waybillFinancialSnapshots=WaybillFinancialSnapshot::query();
         $columnQueryRules=[

+ 2 - 1
app/Services/WaybillPayoffService.php

@@ -6,9 +6,10 @@ use App\WaybillPayoff;
 use App\Traits\ServiceAppAop;
 
 
-Class WaybillPayoffService
+class WaybillPayoffService
 {
     use ServiceAppAop;
+    protected $modelClass=WaybillPayoff::class;
     public function updateOrCreate(array $waybillPayoffParam){
         return WaybillPayoff::query()->updateOrCreate(['waybill_id' => $waybillPayoffParam['waybill_id']],$waybillPayoffParam);
     }

+ 2 - 1
app/Services/WaybillPriceModelService.php

@@ -6,9 +6,10 @@ use App\WaybillPriceModel;
 use App\Traits\ServiceAppAop;
 
 
-Class WaybillPriceModelService
+class WaybillPriceModelService
 {
     use ServiceAppAop;
+    protected $modelClass=WaybillPriceModel::class;
     public function find($id){
         return WaybillPriceModel::query()->find($id);
     }

+ 2 - 1
app/Services/WaybillService.php

@@ -12,9 +12,10 @@ use Ramsey\Uuid\Uuid;
 use App\Traits\ServiceAppAop;
 
 
-Class WaybillService
+class WaybillService
 {
     use ServiceAppAop;
+    protected $modelClass=Waybill::class;
     /**
      * @param array $param
      * @return Builder

+ 2 - 1
app/Services/WeighExceptedService.php

@@ -9,9 +9,10 @@ use Illuminate\Database\Eloquent\Builder;
 const TABLE = "order_packages.";use App\Traits\ServiceAppAop;
 
 
-Class WeighExceptedService
+class WeighExceptedService
 {
     use ServiceAppAop;
+    protected $modelClass=WeighExcepted::class;
     /**
      * @param array $params
      * @return Builder

+ 1 - 0
app/Services/common/BatchUpdateService.php

@@ -12,6 +12,7 @@ use App\Traits\ServiceAppAop;
 class BatchUpdateService
 {
     use ServiceAppAop;
+    protected $modelClass=BatchUpdate::class;
     public function batchUpdate($tableName = '', $multipleData = array(), $connection = 'mysql')
     {
         if (count($multipleData) == 1) {

+ 1 - 0
app/Services/common/DataHandlerService.php

@@ -9,6 +9,7 @@ use App\Traits\ServiceAppAop;
 class DataHandlerService
 {
     use ServiceAppAop;
+    protected $modelClass=DataHandler::class;
     public function dataHeader(array $mapKeys= [], $resultData =[]){
         $handlerData = [];
         $handlerData['mapkey'] = $mapKeys;

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff