Service用app()注册，改为大写开头

app/Console/Commands/InventoryDailyLoggingOwner.php

@@ -126,7 +126,7 @@ class InventoryDailyLoggingOwner extends Command
 
             $depository = null;
             if ($inventoryDailyLog['depository_code']){
-                $depository = app('depositoryService')->firstOrCreate(["code"=>$inventoryDailyLog['depository_code']],[
+                $depository = app('DepositoryService')->firstOrCreate(["code"=>$inventoryDailyLog['depository_code']],[
                     "name"=>$inventoryDailyLog['depository_code'],
                     "code"=>$inventoryDailyLog['depository_code'],
                 ]);

app/Console/Commands/WASSyncWMSOrderInformation.php

@@ -48,7 +48,7 @@ class WASSyncWMSOrderInformation extends Command
     public function WasSyncWmsOrder(){
 
         /** @var OrderTrackingService $orderTrackingService */
-        $orderTrackingService  = app('orderTrackingService');
+        $orderTrackingService  = app('OrderTrackingService');
 
         $dataInterval = intval(data_get(config('sync'), 'order_tracking_import.interval')) * 60 + 5;
 

app/Http/Controllers/CommodityController.php

@@ -184,7 +184,7 @@ class CommodityController extends Controller
         if ($barcode) $params['alternate_sku1'] = $barcode;
 
         /** @var OracleBasSkuService $oracleBasSkuService */
-        $oracleBasSkuService = app('oracleBasSkuService');
+        $oracleBasSkuService = app('OracleBasSkuService');
         $amount = 1000;
         $sum = $oracleBasSkuService->count($params);
         $number = ceil($sum/$amount);
@@ -210,9 +210,9 @@ class CommodityController extends Controller
             }
         }
         /** @var CommodityService $commodityService */
-        $commodityService = app('commodityService');
+        $commodityService = app('CommodityService');
         /** @var CommodityBarcodeService $commodityBarcodeService */
-        $commodityBarcodeService = app('commodityBarcodeService');
+        $commodityBarcodeService = app('CommodityBarcodeService');
 
         $commodities = $commodityService->getOwnerCommodities(['owner_id' => $owner_id, 'sku'=>$skus]);
         $updateCommodities = [];

app/Http/Controllers/InventoryController.php

@@ -18,7 +18,7 @@ class InventoryController extends Controller
     public function __construct()
     {
         app()->singleton('inventoryService',InventoryService::class);
-        app()->singleton('allInventoryService',AllInventoryService::class);
+        app()->singleton('AllInventoryService',AllInventoryService::class);
 
     }
     //动库报表
@@ -37,7 +37,7 @@ class InventoryController extends Controller
         if(!Gate::allows("库存管理-库存")){ return redirect(url('/'));  }
 
         /** @var AllInventoryService $service */
-        $service = app('allInventoryService');
+        $service = app('AllInventoryService');
         $oracleActTransactingLogs= $service->paginate($request->input());
         $oracleActTransactingLogs=json_encode($oracleActTransactingLogs);
 //        $owners=OracleBasCustomer::query()->select('customerid','descr_c')->where('customer_type','OW')->where('active_flag','Y')->get();
@@ -69,7 +69,7 @@ class InventoryController extends Controller
         if ($request->checkAllSign){
             $params = $request->input();
             unset($params['checkAllSign']);
-            $sql=app('allInventoryService')->getSql($request->input());
+            $sql=app('AllInventoryService')->getSql($request->input());
             $post = Http::post(config('go.export.url'),['type'=>'allInventory','sql'=>$sql]);
         }else{
             $post = Http::post(config('go.export.url'),['type'=>'allInventory','data'=>$request->data]);
@@ -89,7 +89,7 @@ class InventoryController extends Controller
     function dailyLog(Request $request,OwnerService $ownerService){
         if (!Gate::allows('库存管理-库存体积')){return redirect(url('/')); }
         /** @var InventoryDailyLogService*/
-        $inventoryDailyLogs = app('inventoryDailyLogService')->paginate($request->input());
+        $inventoryDailyLogs = app('InventoryDailyLogService')->paginate($request->input());
         $owners = $ownerService->getSelection();
         $param = $request->input();
         return view('inventory.statement.dailyLog',compact('inventoryDailyLogs','owners','param'));
@@ -97,7 +97,7 @@ class InventoryController extends Controller
 
     //获取记录监听货主
     function getLoggingOwner(){
-        $loggingOwners = app('inventoryDailyLogService')->getInventoryDailyLoggingOwner('owner_id');
+        $loggingOwners = app('InventoryDailyLogService')->getInventoryDailyLoggingOwner('owner_id');
         return array_column($loggingOwners->toArray(),'owner_id');
     }
     //添加记录监听货主
@@ -105,7 +105,7 @@ class InventoryController extends Controller
         if (!Gate::allows('库存管理-库存体积-管理监听货主')){return redirect(url('/')); }
         $owner_id = $request->owner_id;
         if (!$owner_id || !is_numeric($owner_id))return ['success'=>false,'data'=>'传递参数错误！'];
-        $loggingOwner = app('inventoryDailyLogService')->firstOrCreate(['owner_id'=>$owner_id]);
+        $loggingOwner = app('InventoryDailyLogService')->firstOrCreate(['owner_id'=>$owner_id]);
         if (!$loggingOwner)return ['success'=>false,'data'=>'录入失败！'];
         return ['success'=>true,'data'=>$loggingOwner->owner_id];
     }
@@ -115,9 +115,9 @@ class InventoryController extends Controller
         if ($request->checkAllSign){
             $params = $request->input();
             unset($params['checkAllSign']);
-            $sql=app('inventoryDailyLogService')->getSql($params);
+            $sql=app('InventoryDailyLogService')->getSql($params);
 
-        }else $sql=app('inventoryDailyLogService')->getSql(['id'=>$request->data]);
+        }else $sql=app('InventoryDailyLogService')->getSql(['id'=>$request->data]);
 
         $row = ["货主","日期","商品名称","商品编码","商品条码","属性仓","在库数量","长","宽","高","体积","总占用体积","总毛重"];
         $column = ["owner_name", "created_at", "commodity_name", "commodity_sku", "commodity_barcode_code","depository_name",

app/Http/Controllers/OrderController.php

@@ -22,9 +22,9 @@ class OrderController extends Controller
     public function delivering(Request $request){
         if(!Gate::allows('订单管理-查询')){ return view('order/index');  }
         /** @var OrderService $orderService */
-        $orderService = app('orderService');
+        $orderService = app('OrderService');
         $request = $request->input();
-        $owners = app('ownerService')->getSelection(['id','code']);
+        $owners = app('OwnerService')->getSelection(['id','code']);
         $codes = array_column($owners->toArray(),'code');
         if ($request['customerid'] ?? false){
             $arr = explode(',',$request['customerid']);
@@ -55,7 +55,7 @@ class OrderController extends Controller
     public function export(Request $request){
         $is_merge = $request->is_merge ?? false;
         /** @var OrderService $orderService */
-        $orderService = app('orderService');
+        $orderService = app('OrderService');
         $req = ['type'=>'order'];
         if ($is_merge && $is_merge == 'true')$req["createFormat"] = "merge";
         if ($request->data){
@@ -76,14 +76,14 @@ class OrderController extends Controller
     public function createRejectedBill(Request $request){
         if(!Gate::allows('订单管理-订单-生成退货单')){ return ['success'=>false,'data'=>'您无权操作！'];  }
         /** @var OrderService $orderService */
-        $orderService = app('orderService');
+        $orderService = app('OrderService');
         $result = $orderService->get(['data' => $request->data]);
 
         /** @var RejectedBillService $rejectedBillService */
-        $rejectedBillService = app('rejectedBillService');
+        $rejectedBillService = app('RejectedBillService');
 
         /** @var RejectedBillItemService $rejectedBillItemService */
-        $rejectedBillItemService = app('rejectedBillItemService');
+        $rejectedBillItemService = app('RejectedBillItemService');
 
         $commodities = $result['commodities'];
         $rejectedBillItems = [];
@@ -93,9 +93,9 @@ class OrderController extends Controller
             //不存在时将当前快递单号视为分箱号
             if (!($picktotraceids[$order->orderno] ?? false))$picktotraceids[$order->orderno] = [$order->soreference5];
             //获取货主与快递方
-            $owner = app('ownerService')->firstOrCreate(['name' => $order->customer_descr_c],
+            $owner = app('OwnerService')->firstOrCreate(['name' => $order->customer_descr_c],
                 ['name' => $order->customer_descr_c, 'code' => $order->customer_descr_c]);
-            $logistic = app('logisticService')->firstOrCreate(['name' => $order->carriername],
+            $logistic = app('LogisticService')->firstOrCreate(['name' => $order->carriername],
                 ['name' => $order->carriername, 'code' => $order->carriername]);
             foreach ($picktotraceids[$order->orderno] as $orderno){
                 $rejectedBill = $rejectedBillService->create([
@@ -133,7 +133,7 @@ class OrderController extends Controller
     public function isRejectedBillExist(Request $request){
         if(!Gate::allows('订单管理-订单-生成退货单')){ return redirect(url('/'));  }
         /** @var RejectedBillService $rejectedBillService */
-        $rejectedBillService = app('rejectedBillService');
+        $rejectedBillService = app('RejectedBillService');
         $rejectedBills = $rejectedBillService->get(['order_number' => $request->data]);
         if (count($rejectedBills) == 0)return ['success'=>true];
         return ['success'=>false, 'data'=>json_encode(array_column($rejectedBills->toArray(),'order_number'))];

app/Http/Controllers/OrderIssueController.php

@@ -39,7 +39,7 @@ class OrderIssueController extends Controller
             return redirect(url('/'));
         }
         /** @var OrderIssueService $orderIssueService */
-        $orderIssueService = app('orderIssueService');
+        $orderIssueService = app('OrderIssueService');
         $owners = app(OwnerService::class)->getAuthorizedOwners();
         $orderIssues = $orderIssueService->paginate($request->all());
         $orderIssueType = OrderIssueType::all();
@@ -67,7 +67,7 @@ class OrderIssueController extends Controller
         if (!Gate::allows('订单管理-订单问题件生成')) {
             return redirect(url('/'));
         }
-        $orderIssueService = app('orderIssueService');
+        $orderIssueService = app('OrderIssueService');
         $orderIssueService->validatorCreate($request)->validate();
         $orderIssue = null;
         if ($request->filled('logistic_number_return')) {
@@ -133,9 +133,9 @@ class OrderIssueController extends Controller
         if ($request->checkAllSign){
             $params = $request->input();
             unset($params['checkAllSign']);
-            $sqlList = app('orderIssueService')->getSqlList($params);
+            $sqlList = app('OrderIssueService')->getSqlList($params);
         }else{
-            $sqlList = app('orderIssueService')->getSqlList(['id'=>$request->data]);
+            $sqlList = app('OrderIssueService')->getSqlList(['id'=>$request->data]);
         }
         $post = Http::post(config('go.export.url'),['type'=>'orderIssue','sqlList'=>json_encode($sqlList),'createFormat'=>'merge']);
         if ($post->status() == 500){
@@ -271,7 +271,7 @@ class OrderIssueController extends Controller
         if (!$request->filled('clientCode')) {
             return ['success' => false, 'fail_info' => '缺少对应的参数或条件'];
         }
-        $orderService = app('orderService');
+        $orderService = app('OrderService');
         $clientCode = $request->input('clientCode');
         $order = Order::query()->where('client_code', $clientCode)->first();
         if ($order) {
@@ -305,7 +305,7 @@ class OrderIssueController extends Controller
             if ($orderIssue) {
                 return ['success' => false, 'fail_info' => '该退回单号已有对应的问题件'];
             } else {
-                $orderService = app('orderService');
+                $orderService = app('OrderService');
                 $order = $orderService->findOrCreteByLogisticNumberReturn($logisticNumberReturn);
                 return ['success' => true, 'order' => $order, 'rejectedBill' => $rejectedBill];
             }

app/Http/Controllers/OrderIssuePerformanceController.php

@@ -14,7 +14,7 @@ class OrderIssuePerformanceController extends Controller
 
     public function __construct()
     {
-        app()->singleton('orderIssueWorkLoadService', OrderIssueWorkLoadService::class);
+        app()->singleton('OrderIssueWorkLoadService', OrderIssueWorkLoadService::class);
         app()->singleton('service', OrderIssuePerformanceService::class);
     }
 
@@ -24,7 +24,7 @@ class OrderIssuePerformanceController extends Controller
             return redirect(url('/'));
         }
         /** @var OrderIssuePerformanceService $service */
-        $service = app('orderIssuePerformanceService');
+        $service = app('OrderIssuePerformanceService');
         $performance = $service->paginate($request->all());
         $options = ['timeFrame' => $request->input('timeFrame'), 'create_start' => $request->input('create_start') ?? '', 'create_end' => $request->input('create_end') ?? ''];
         return view('order.issue.performance', compact('performance', 'options'));
@@ -54,7 +54,7 @@ class OrderIssuePerformanceController extends Controller
             return redirect(url('/'));
         }
         /** @var OrderIssueWorkLoadService $workLoadService */
-        $workLoadService = app('orderIssueWorkLoadService');
+        $workLoadService = app('OrderIssueWorkLoadService');
         $workLoads = $workLoadService->paginate($request->all());
         $users = $workLoadService->getUsers();
         $owners = $workLoadService->getOwners();
@@ -64,7 +64,7 @@ class OrderIssuePerformanceController extends Controller
 
     public function exportWorkLoad(Request $request)
     {
-        $workLoadService = app('orderIssueWorkLoadService');
+        $workLoadService = app('OrderIssueWorkLoadService');
         return $workLoadService->exportWorkLoad($request->all());
     }
 }

app/Http/Controllers/OrderTrackingController.php

@@ -20,7 +20,7 @@ class OrderTrackingController extends Controller
             return redirect(url('/'));
 
         $owners =  app(OwnerService::class)->getAuthorizedOwners();
-        $service = app('orderTrackingService');
+        $service = app('OrderTrackingService');
         $trackOrders = $service->paginate($request->input());
         $logistics = Logistic::all();
         return view('order.tracking.index', compact('owners', 'trackOrders','logistics'));

app/Http/Controllers/OwnerController.php

@@ -92,7 +92,7 @@ class OwnerController extends Controller
 
     public function getOwners()
     {
-        $owners = app('ownerService')->getSelection(['id', 'code', 'name']);
+        $owners = app('OwnerService')->getSelection(['id', 'code', 'name']);
         return $owners;
     }
 

app/Http/Controllers/PackageController.php

@@ -123,7 +123,7 @@ class PackageController extends Controller
 //            event(new WeighedEvent($package));
         }else{
             /** @var OrderPackageService */
-            $package = app('orderPackageService')->firstOrCreate($logistic_number,[
+            $package = app('OrderPackageService')->firstOrCreate($logistic_number,[
                 'weight'=>$weight,
                 'weighed_at'=>Carbon::now(),
                 'status'=>"已上传",
@@ -154,9 +154,9 @@ class PackageController extends Controller
      * @var OwnerService
      */
     public function statistics(Request $request){
-        $packages = app('packageStatisticsService')->get($request->input());
-        $owners=app('ownerService')->getSelection();
-        $logistics=app('logisticService')->getSelection();
+        $packages = app('PackageStatisticsService')->get($request->input());
+        $owners=app('OwnerService')->getSelection();
+        $logistics=app('LogisticService')->getSelection();
         $ownerTemp = [];
         foreach ($owners as $owner){
             $ownerTemp[$owner->id] = $owner->name;
@@ -238,7 +238,7 @@ class PackageController extends Controller
     public function statisticsExport(Request $request){
         if(!Gate::allows('称重管理-查询')){ return '没有权限';  }
         /** @var PackageStatisticsService $service */
-        $service = app('packageStatisticsService');
+        $service = app('PackageStatisticsService');
 
         if ($request->checkAllSign){
             $params = $request->input();
@@ -249,7 +249,7 @@ class PackageController extends Controller
             $data = $service->get(['owner_id'=>$request->data]);
         }
 
-        $owners=app('ownerService')->getSelection();
+        $owners=app('OwnerService')->getSelection();
         $ownerTemp = [];
         foreach ($owners as $owner){
             $ownerTemp[$owner->id] = $owner->name;
@@ -276,7 +276,7 @@ class PackageController extends Controller
         $column = ["货主","总计"];
 
         $columnMap = [];
-        $logistics=app('logisticService')->getSelection();
+        $logistics=app('LogisticService')->getSelection();
         foreach ($logistics as $index => $logistic){
             if (!($logisticsTemp[$logistic->id] ?? false))unset($logistics[$index]);
             else {

app/Http/Controllers/ProcessController.php

@@ -40,7 +40,7 @@ class ProcessController extends Controller
     {
         if(!Gate::allows('二次加工管理-查询')){ return redirect(url('/'));  }
         $paginateParams = $request->input();
-        $processes = app('processService')->paginate($paginateParams);
+        $processes = app('ProcessService')->paginate($paginateParams);
         $owners=$ownerService->getSelection();
         return view('process.index',['processes'=>$processes,'owners'=>$owners,'paginateParams'=>$paginateParams]);
     }
@@ -1069,8 +1069,8 @@ class ProcessController extends Controller
         if ($request->checkAllSign){
             $params = $request->input();
             unset($params['checkAllSign']);
-            $sql = app('processService')->getSql($params);
-        }else $sql = app('processService')->getSql(["id"=>$request->data]);
+            $sql = app('ProcessService')->getSql($params);
+        }else $sql = app('ProcessService')->getSql(["id"=>$request->data]);
         $post = Http::post(config('go.export.url'),['type'=>'process','sql'=>$sql]);
         if ($post->status() == 500){
             throw new Exception($post->header("Msg"));

app/Http/Controllers/ProcessStatisticController.php

@@ -25,8 +25,8 @@ class ProcessStatisticController extends Controller
         if ($request->checkAllSign){
             $params = $request->input();
             unset($params['checkAllSign']);
-            $sql = app('processStatisticService')->getSql($params);
-        }else $sql = app('processStatisticService')->getSql(["process_id"=>$request->data]);
+            $sql = app('ProcessStatisticService')->getSql($params);
+        }else $sql = app('ProcessStatisticService')->getSql(["process_id"=>$request->data]);
 
         $row = ["任务号", "货主", "开始日期", "完成日期","创建日期", "单价", "预期数量", "完成数量", "收入合计",
             "完成时间(天)'", "总工时", "加工类型", "最高日产能", "最低日产能", "日均产能", "合计成本", "毛利润",

app/Http/Controllers/RejectedBillController.php

@@ -30,7 +30,7 @@ class RejectedBillController extends Controller
     function __construct()
     {
 
-//        app()->bind('orderPackageCommoditiesService',OrderPackageCommoditiesService::class);
+//        app()->bind('OrderPackageCommoditiesService',OrderPackageCommoditiesService::class);
     }
 
     /**

app/Http/Controllers/RejectedBillItemController.php

@@ -77,7 +77,7 @@ class RejectedBillItemController extends Controller
         if (!$rejectedBillItem->rejectedBill || !$rejectedBillItem->rejectedBill->owner)return ['success'=>'false','failure_info'=>'退货单或货主不存在'];
 
         /** @var CommodityService $commodityService */
-        $commodityService = app('commodityService');
+        $commodityService = app('CommodityService');
         $commodity = $commodityService->ownerBarcodeSeekCommodityFirst(['name'=>$rejectedBillItem->rejectedBill->owner->name],$rejectedBillItem->barcode_goods);
         if (!$commodity){
             $commodity = $commodityService->ownerAndBarcodeFirstOrCreate($rejectedBillItem->rejectedBill->owner,$rejectedBillItem->barcode_goods);
@@ -86,7 +86,7 @@ class RejectedBillItemController extends Controller
                     "name" => $rejectedBillItem->name_goods,
                     "owner_id" => $rejectedBillItem->rejectedBill->owner->id,
                 ]);
-                app('commodityBarcodeService')->first([
+                app('CommodityBarcodeService')->first([
                     'commodity_id' => $commodity->id,
                     'code' => $rejectedBillItem->barcode_goods,
                 ]);

app/Http/Controllers/RejectedController.php

@@ -33,7 +33,7 @@ class RejectedController extends Controller
 {
     public function __construct()
     {
-        app()->singleton('rejectedService',RejectedService::class);
+        app()->singleton('RejectedService',RejectedService::class);
     }
 
     /**
@@ -50,7 +50,7 @@ class RejectedController extends Controller
         if(!Gate::allows('退货管理-查询')){ return redirect(url('/login'));  }
         $paginateParams = $request->input();
         /** @var RejectedService $application */
-        $application = app('rejectedService');
+        $application = app('RejectedService');
         $rejectedBills= $application->paginate($request);
         $issueIds = $application->返回有问题件的ID($request);
         $owners = $ownerService->getSelection();
@@ -404,7 +404,7 @@ class RejectedController extends Controller
         }else{
             $param = ["id"=>$request->data];
         }
-        $sql = app('rejectedService')->getSql($param);
+        $sql = app('RejectedService')->getSql($param);
         $post = Http::post(config('go.export.url'),['type'=>'rejected','sql'=>$sql]);
         if ($post->status() == 500){
             throw new Exception($post->header("Msg"));

app/Http/Controllers/StoreCheckingReceiveController.php

@@ -20,11 +20,11 @@ class StoreCheckingReceiveController extends Controller
     public function mission(Request $request){
         if(!Gate::allows('入库管理-盘收一体-盘收-查看')){ return view('store/index');  }
         /** @var StoreCheckingReceiveService $service */
-        $service = app('storeCheckingReceiveService');
+        $service = app('StoreCheckingReceiveService');
 
         $params = $request->input();
         $storeCheckingReceives = $service->paginate($params);
-        $owners = app('ownerService')->getSelection();
+        $owners = app('OwnerService')->getSelection();
         return view('store.checkingReceive.mission',compact('storeCheckingReceives','params','owners'));
     }
 
@@ -46,7 +46,7 @@ class StoreCheckingReceiveController extends Controller
     public function show($id,Request $request){
         if(!Gate::allows('入库管理-盘收一体-盘收-查看')){ return redirect(url('/'));  }
         /** @var StoreCheckingReceiveService $service */
-        $service = app('storeCheckingReceiveService');
+        $service = app('StoreCheckingReceiveService');
         $withs = ['owner','storeCheckingReceiveItems'=>function($query){
                     $query->with(['commodity'=>function($builder) {
                         $builder->with('barcodes');
@@ -78,7 +78,7 @@ class StoreCheckingReceiveController extends Controller
                 $builder->with('barcodes');
             }]);
         }];
-        $storeCheckingReceive = app('storeCheckingReceiveService')->find($mission_id,$withs);
+        $storeCheckingReceive = app('StoreCheckingReceiveService')->find($mission_id,$withs);
         if (!$storeCheckingReceive)return ['success'=>false, 'data'=>'盘收任务不存在'];
         if ($storeCheckingReceive->status == '已收货')return ['success'=>false, 'data'=>'盘收任务已结束'];
 
@@ -117,12 +117,12 @@ class StoreCheckingReceiveController extends Controller
 
             if (isset($params['imported_diff_amount']) && $params['imported_diff_amount'] > 0)$is_receive_diff = "是";
             if (isset($params['asn_diff_amount']) && $params['asn_diff_amount'] > 0)$is_asn_diff = "是";
-            $item = app('storeCheckingReceiveItemService')->updateFind($storeCheckingReceiveItem,$params);
+            $item = app('StoreCheckingReceiveItemService')->updateFind($storeCheckingReceiveItem,$params);
             LogService::log(__METHOD__,"清点数量",json_encode($item,JSON_UNESCAPED_UNICODE));
 
             switch ($storeCheckingReceive->status){
                 case '已导入':
-                    $SCR = app('storeCheckingReceiveService')->updateFind($storeCheckingReceive,['status'=>'清点中']);
+                    $SCR = app('StoreCheckingReceiveService')->updateFind($storeCheckingReceive,['status'=>'清点中']);
                     LogService::log(__METHOD__,"修改盘收任务状态为清点中",json_encode($SCR,JSON_UNESCAPED_UNICODE));
                     break;
                 case '清点中':
@@ -138,19 +138,19 @@ class StoreCheckingReceiveController extends Controller
                         || (!$storeCheckingReceive->is_asn_diff && isset($params['asn_diff_amount'])))
                         $res['is_receive_diff'] = $is_receive_diff;
                     if (count($res) > 0){
-                        $SCR = app('storeCheckingReceiveService')->updateFind($storeCheckingReceive,$res);
+                        $SCR = app('StoreCheckingReceiveService')->updateFind($storeCheckingReceive,$res);
                         LogService::log(__METHOD__,"修改盘收任务",json_encode($SCR,JSON_UNESCAPED_UNICODE));
                     }
                     break;
             }
             return ['success'=>true, 'type'=>"update", 'data'=>$item];
         }
-        $commodity = app('commodityService')->ownerBarcodeSeekCommodityFirst(['id'=>$storeCheckingReceive->owner_id], $goods['barcode']);
+        $commodity = app('CommodityService')->ownerBarcodeSeekCommodityFirst(['id'=>$storeCheckingReceive->owner_id], $goods['barcode']);
         if (!$commodity) {
             if (!$storeCheckingReceive->owner) return ['success'=>false, 'data'=>'未找到货主'];
-            $basSku = app('oracleBasSkuService')->first(['customerid'=>$storeCheckingReceive->owner->code, "barcode"=>$goods['barcode']]);
+            $basSku = app('OracleBasSkuService')->first(['customerid'=>$storeCheckingReceive->owner->code, "barcode"=>$goods['barcode']]);
             if ($basSku){
-                $commodity = app('commodityService')->firstOrCreate(['owner_id'=>$storeCheckingReceive->owner_id, 'sku'=>$basSku->sku],[
+                $commodity = app('CommodityService')->firstOrCreate(['owner_id'=>$storeCheckingReceive->owner_id, 'sku'=>$basSku->sku],[
                     "name"=>$basSku->descr_c,
                     "sku"=>$basSku->sku,
                     "owner_id"=>$storeCheckingReceive->owner_id,
@@ -159,19 +159,19 @@ class StoreCheckingReceiveController extends Controller
                     'height' => $basSku->skuhigh,
                     'volumn' => $basSku->cube
                 ]);
-                if ($commodity) app('commodityBarcodeService')->firstOrCreate(['commodity_id'=>$commodity->id, 'code'=>$goods['barcode']]);
+                if ($commodity) app('CommodityBarcodeService')->firstOrCreate(['commodity_id'=>$commodity->id, 'code'=>$goods['barcode']]);
             }else{
-                $commodity = app('commodityService')->createTemporaryCommodity([
+                $commodity = app('CommodityService')->createTemporaryCommodity([
                     "sku"=>$goods['barcode'],
                     "owner_id"=>$storeCheckingReceive->owner_id,
                 ]);
-                app('commodityBarcodeService')->create([
+                app('CommodityBarcodeService')->create([
                     "commodity_id"=>$commodity->id,
                     "code" => $goods['barcode'],
                 ]);
             }
         };
-        $item = app('storeCheckingReceiveItemService')->create([
+        $item = app('StoreCheckingReceiveItemService')->create([
             'store_checking_receive_id' => $mission_id,
             'bin_number' => $goods['bin_number'],
             'commodity_id' => $commodity->id,
@@ -188,7 +188,7 @@ class StoreCheckingReceiveController extends Controller
         }]);
         switch ($storeCheckingReceive->status){
             case '已导入':
-                $SCR = app('storeCheckingReceiveService')->updateFind($storeCheckingReceive,['status'=>'清点中']);
+                $SCR = app('StoreCheckingReceiveService')->updateFind($storeCheckingReceive,['status'=>'清点中']);
                 LogService::log(__METHOD__,"修改盘收任务状态为清点中",json_encode($SCR,JSON_UNESCAPED_UNICODE));
                 break;
             case '清点中':
@@ -203,7 +203,7 @@ class StoreCheckingReceiveController extends Controller
                 if ($storeCheckingReceive->is_asn_diff && ($storeCheckingReceive->is_asn_diff != $is_asn_diff))
                     $res['is_receive_diff'] = $is_receive_diff;
                 if (count($res) > 0){
-                    $SCR = app('storeCheckingReceiveService')->updateFind($storeCheckingReceive,$res);
+                    $SCR = app('StoreCheckingReceiveService')->updateFind($storeCheckingReceive,$res);
                     LogService::log(__METHOD__,"修改盘收任务",json_encode($SCR,JSON_UNESCAPED_UNICODE));
                 }
                 break;
@@ -219,7 +219,7 @@ class StoreCheckingReceiveController extends Controller
                 $builder->with('barcodes');
             }]);
         }];
-        $storeCheckingReceive = app('storeCheckingReceiveService')->find($id,$withs);
+        $storeCheckingReceive = app('StoreCheckingReceiveService')->find($id,$withs);
 
         if (!$storeCheckingReceive) new \Exception('盘收任务不存在');
 
@@ -263,7 +263,7 @@ class StoreCheckingReceiveController extends Controller
         $id = $request->mission_id ?? false;
         if (!$id) return ['success'=>false, 'data'=>'盘收任务不存在'];
 
-        app('storeCheckingReceiveItemService')->update(['store_checking_receive_id'=>$id],[
+        app('StoreCheckingReceiveItemService')->update(['store_checking_receive_id'=>$id],[
             'counted_amount'=>0,
             'imported_diff_amount'=>null,
             'asn_diff_amount'=>null,
@@ -283,12 +283,12 @@ class StoreCheckingReceiveController extends Controller
                 $builder->with('barcodes');
             }]);
         }];
-        $storeCheckingReceive = app('storeCheckingReceiveService')->find($id,$withs);
+        $storeCheckingReceive = app('StoreCheckingReceiveService')->find($id,$withs);
         if (!$storeCheckingReceive) return ['success'=>false, 'data'=>'未找到此盘点任务!'];
         if ($storeCheckingReceive->status == '已收货')return ['success'=>false, 'data'=>'盘收任务已结束'];
 
         /** @var OracleDocAsnDetailService $oracleDocAsnDetailService */
-        $oracleDocAsnDetailService = app('oracleDocAsnDetailService');
+        $oracleDocAsnDetailService = app('OracleDocAsnDetailService');
         $docAsnDetails = $oracleDocAsnDetailService->get([
             'asnno'=>$asn,
             'customerid'=>$storeCheckingReceive->owner ? $storeCheckingReceive->owner->code : null],[
@@ -325,12 +325,12 @@ class StoreCheckingReceiveController extends Controller
             $diffAmount += $item->asn_diff_amount;
         }
         if (count($updateItems) > 0){
-            app('storeCheckingReceiveItemService')->batchUpdate($updateItems);
+            app('StoreCheckingReceiveItemService')->batchUpdate($updateItems);
             LogService::log(__METHOD__,"匹配ASN-批量更新ASN数量",json_encode($updateItems));
         }
 
         if (count($deleteItems) > 0){
-            app('storeCheckingReceiveItemService')->destroy($deleteItems);
+            app('StoreCheckingReceiveItemService')->destroy($deleteItems);
             LogService::log(__METHOD__,"重新匹配ASN-删除原有ASN生成数据",json_encode($updateItems));
         }
 
@@ -338,7 +338,7 @@ class StoreCheckingReceiveController extends Controller
         if (count($skus) > 0){
             $skuArr = array_keys($skus);
             /** @var CommodityService $commodityService */
-            $commodityService = app('commodityService');
+            $commodityService = app('CommodityService');
             $commodities = $commodityService->get(['owner_id'=>$storeCheckingReceive->owner ? $storeCheckingReceive->owner->id : null,'sku'=>$skuArr]);
             $createItems = [];
             foreach ($commodities as $commodity){
@@ -354,9 +354,9 @@ class StoreCheckingReceiveController extends Controller
                 $diffAmount += $skus[$commodity->sku];
             }
 
-            if (count($createItems) > 0)app('storeCheckingReceiveItemService')->insert($createItems);
+            if (count($createItems) > 0)app('StoreCheckingReceiveItemService')->insert($createItems);
         }
-        $data = app('storeCheckingReceiveService')->updateFind($storeCheckingReceive,[
+        $data = app('StoreCheckingReceiveService')->updateFind($storeCheckingReceive,[
             'asn'=>$asn,'is_asn_diff'=>$diffAmount==0 ? "否" : "是",'status'=>'已ASN入库'
         ]);
         LogService::log(__METHOD__,"修改盘收任务",json_encode($data,JSON_UNESCAPED_UNICODE));
@@ -368,7 +368,7 @@ class StoreCheckingReceiveController extends Controller
         $id = $request->id ?? false;
 
         /** @var StoreCheckingReceiveService $storeCheckingReceiveService */
-        $storeCheckingReceiveService = app('storeCheckingReceiveService');
+        $storeCheckingReceiveService = app('StoreCheckingReceiveService');
         /** @var StoreCheckingReceive $storeCheckingReceive */
         $storeCheckingReceive = $storeCheckingReceiveService->find($id);
         if (!$storeCheckingReceive)return ['success'=>false, 'data'=>'盘收任务不存在'];
@@ -390,7 +390,7 @@ class StoreCheckingReceiveController extends Controller
         $id = $request->id ?? null;
         $counted_amount = $request->counted_amount ?? null;
         if (!$id || !$counted_amount)return ['success'=>false, 'data'=>'参数传递错误！'];
-        $item = app('storeCheckingReceiveItemService')->find($id);
+        $item = app('StoreCheckingReceiveItemService')->find($id);
         if (!$item)return ['success'=>false, 'data'=>'被盘项不存在'];
         $params = ["counted_amount"=>$counted_amount];
         $data = [];
@@ -405,10 +405,10 @@ class StoreCheckingReceiveController extends Controller
         //修改差异状态
         if ($item->imported_amount || $item->asn_amount){
             $withs = ['storeCheckingReceiveItems'];
-            $storeCheckingReceive = app('storeCheckingReceiveService')->find($item->store_checking_receive_id,$withs);
+            $storeCheckingReceive = app('StoreCheckingReceiveService')->find($item->store_checking_receive_id,$withs);
             if ($storeCheckingReceive)$this->updateDiffStatus($storeCheckingReceive);
         }
-        app('storeCheckingReceiveItemService')->updateFind($item,$params);
+        app('StoreCheckingReceiveItemService')->updateFind($item,$params);
         LogService::log(__METHOD__,"盘点修改实盘数",'item：'.json_encode($item)."update：",$counted_amount);
         return ['success'=>true,"data"=>$data];
     }

app/Http/Controllers/StoreController.php

@@ -197,7 +197,7 @@ class StoreController extends Controller
                 return ['success' => false, 'data' => $detail->asnlineno.'收货失败,错误代码：'.$result];
             }
             if (!isset($depositories[$detail->lotatt05]) && $detail->lotatt05){
-                $depository = app('depositoryService')->firstOrCreate(["code"=>$detail->lotatt05],["code"=>$detail->lotatt05,"name"=>$detail->lotatt05]);
+                $depository = app('DepositoryService')->firstOrCreate(["code"=>$detail->lotatt05],["code"=>$detail->lotatt05,"name"=>$detail->lotatt05]);
                 $depositories[$detail->lotatt05] = $depository->id;
             }
             $item = [
@@ -214,9 +214,9 @@ class StoreController extends Controller
             $items[] = $item;
         }
         oci_close($conn);
-        $warehouse = app('warehouseService')->firstOrCreate(["code"=>$asn->warehouseid],["code"=>$asn->warehouseid,"name"=>$asn->warehouseid]);
-        $owner = app('ownerService')->firstOrCreate(['code'=>$asn->customerid],['code'=>$asn->customerid,"name"=>$asn->customerid]);
-        $store = app('storeService')->create([
+        $warehouse = app('WarehouseService')->firstOrCreate(["code"=>$asn->warehouseid],["code"=>$asn->warehouseid,"name"=>$asn->warehouseid]);
+        $owner = app('OwnerService')->firstOrCreate(['code'=>$asn->customerid],['code'=>$asn->customerid,"name"=>$asn->customerid]);
+        $store = app('StoreService')->create([
             'asn_code'=>$asnno,
             'warehouse_id'=>$warehouse->id,
             'owner_id'=>$owner->id,
@@ -228,7 +228,7 @@ class StoreController extends Controller
         foreach ($items as $item){
             $item["store_id"] = $store->id;
         }
-        app('storeItemService')->insert($items);
+        app('StoreItemService')->insert($items);
         return ['success'=>true,"data"=>"已成功将“".$asnno."”入库"];
     }
 

app/Http/Controllers/TestController.php

@@ -37,6 +37,7 @@ use App\ProcessStatistic;
 use App\Province;
 use App\RejectedBill;
 use App\RejectedBillItem;
+use App\Services\CacheService;
 use App\Services\CityService;
 use App\Services\CommodityService;
 use App\Services\common\BatchUpdateService;
@@ -160,7 +161,7 @@ class TestController extends Controller
     function issues()
     {
         /** @var OrderPackageService $orderPackageService */
-        $orderPackageService = app('orderPackageService');
+        $orderPackageService = app('OrderPackageService');
         $ids = [741, 739, 738, 736, 735, 733, 732, 731, 730, 729, 728, 725, 724, 723, 721, 720, 719, 718, 717, 715, 714, 713, 712, 711, 710, 705, 703, 702, 701, 700, 699, 698, 696, 694, 693, 692, 691, 690];
         $orderIssues = OrderIssue::query()->whereIn('id', $ids)->get();
         $order_ids = data_get($orderIssues, '*.order_id');
@@ -304,7 +305,7 @@ class TestController extends Controller
             $error = [];
             foreach ($packages as $package) {
                 /** @var $service OrderPackageService */
-                $service = app('orderPackageService');
+                $service = app('OrderPackageService');
                 $orderPackage = $service->firstOrCreate($package->logistic_number,
                     ['batch_number' => $package->batch_number,
                         'batch_rule' => $package->batch_rule,
@@ -411,7 +412,7 @@ class TestController extends Controller
         foreach ($ids as $id) {
             $package = Package::query()->find($id);
             /** @var OrderPackageService */
-            $orderPackage = app('orderPackageService')->firstOrCreate($package->logistic_number,
+            $orderPackage = app('OrderPackageService')->firstOrCreate($package->logistic_number,
                 ['batch_number' => $package->batch_number,
                     'batch_rule' => $package->batch_rule,
                     'bulk' => $package->bulk,
@@ -532,12 +533,12 @@ class TestController extends Controller
             LogService::log(__METHOD__,'清理商品',json_encode($logs,JSON_UNESCAPED_UNICODE));
             LogService::log(__METHOD__,'重新分配商品',json_encode($commodityTag,JSON_UNESCAPED_UNICODE));
 
-            app('inventoryAccountMissionService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新库存盘点任务
+            app('InventoryAccountMissionService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新库存盘点任务
             app('inventoryCompareService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新库存对比
-            app('inventoryDailyLogService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新库存每日记录
-            app('processesContentService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新二次加工内容单
-            app('storeCheckingReceiveItemService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新入库盘收一体
-            app('orderPackageCommoditiesService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新订单商品
+            app('InventoryDailyLogService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新库存每日记录
+            app('ProcessesContentService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新二次加工内容单
+            app('StoreCheckingReceiveItemService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新入库盘收一体
+            app('OrderPackageCommoditiesService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新订单商品
 
             LogService::log(__METHOD__,'删除商品与对应条码',json_encode($commodityDel,JSON_UNESCAPED_UNICODE));
             CommodityBarcode::query()->whereIn('commodity_id',$commodityDel)->delete();
@@ -631,12 +632,12 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
             $updateCommodities[$del->commodity_id] = $target->commodity_id;
         }
         if (count($updateCommodities) > 0){
-            app('inventoryAccountMissionService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新库存盘点任务
+            app('InventoryAccountMissionService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新库存盘点任务
             app('inventoryCompareService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新库存对比
-            app('inventoryDailyLogService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新库存每日记录
-            app('processesContentService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新二次加工内容单
-            app('storeCheckingReceiveItemService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新入库盘收一体
-            app('orderPackageCommoditiesService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新订单商品
+            app('InventoryDailyLogService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新库存每日记录
+            app('ProcessesContentService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新二次加工内容单
+            app('StoreCheckingReceiveItemService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新入库盘收一体
+            app('OrderPackageCommoditiesService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新订单商品
         }
 
         if (count($createBarcodes) > 0) LogService::log(__METHOD__, "纠正商品-录入合并条码", json_encode(data_get($createBarcodes, '*.id'), JSON_UNESCAPED_UNICODE));
@@ -713,7 +714,7 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
     public function test3()
     {
         /** @var OrderTrackingService $orderTrackingService */
-        $orderTrackingService = app('orderTrackingService');
+        $orderTrackingService = app('OrderTrackingService');
         /** @var OrderService $orderService */
         $orderService = app(OrderService::class);
         $owners = app(OrderTrackingOwnerService::class)->getTrackingOrderOwner();
@@ -734,6 +735,8 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
 
     public function output()
     {
+        /** @var CacheService $cacheService */
+        $cacheService = app('CacheService');
         dd(config('cache.expireTime.authorities'));
     }
     public function usage()

app/Http/Controllers/WaybillFinancialSnapshotsController.php

@@ -47,9 +47,9 @@ class WaybillFinancialSnapshotsController extends Controller
         if ($request->checkAllSign){
             $param = $request->input();
             unset($param['checkAllSign']);
-            $sql = app('waybillFinancialService')->getSql($param);
+            $sql = app('WaybillFinancialService')->getSql($param);
         }else{
-            $sql = app('waybillFinancialService')->getSql(['waybill_id'=>$request->data]);
+            $sql = app('WaybillFinancialService')->getSql(['waybill_id'=>$request->data]);
         }
         $post = Http::post(config('go.export.url'),['type'=>'waybillFinancial','sql'=>$sql]);
         if ($post->status() == 500){

app/Http/Controllers/WeighExceptedController.php

@@ -20,14 +20,14 @@ class WeighExceptedController extends Controller
     {
         if(!Gate::allows('称重管理-查看异常')){ return redirect(url('/'));  }
         /** @var OrderPackageService */
-        $weightExcepteds = app('orderPackageService')->createExceptionPaginate($request->paginate ?? 50);
+        $weightExcepteds = app('OrderPackageService')->createExceptionPaginate($request->paginate ?? 50);
         return view('weight.weightExcepted.index',['weightExcepteds'=>$weightExcepteds,'view'=>'indexCreate']);
     }
 
     public function indexIssued(Request $request)
     {
         if(!Gate::allows('称重管理-查看异常')){ return redirect(url('/'));  }
-        $weightExcepteds=app('orderPackageService')->issueExceptionPaginate($request->paginate ?? 50);
+        $weightExcepteds=app('OrderPackageService')->issueExceptionPaginate($request->paginate ?? 50);
         return view('weight.weightExcepted.index',['weightExcepteds'=>$weightExcepteds,'view'=>'indexIssued']);
     }
 
@@ -37,8 +37,8 @@ class WeighExceptedController extends Controller
            if ($request->checkAllSign){
                $params = $request->input();
                unset($params['checkAllSign']);
-               $sql = app('weighExceptedService')->getIssuedExceptionSql($params);
-           }else $sql=app('weighExceptedService')->getIssuedExceptionSql(['id'=>$request->data]);
+               $sql = app('WeighExceptedService')->getIssuedExceptionSql($params);
+           }else $sql=app('WeighExceptedService')->getIssuedExceptionSql(['id'=>$request->data]);
            $post = Http::post(config('go.export.url'),['type'=>'packageIssuedException','sql'=>$sql]);
            if ($post->status() == 500){
                throw new Exception($post->header("Msg"));
@@ -51,8 +51,8 @@ class WeighExceptedController extends Controller
            if ($request->checkAllSign){
                $params = $request->input();
                unset($params['checkAllSign']);
-               $sql = app('weighExceptedService')->getCreateExceptionSql($params);
-           }else $sql=app('weighExceptedService')->getCreateExceptionSql(['id'=>$request->data]);
+               $sql = app('WeighExceptedService')->getCreateExceptionSql($params);
+           }else $sql=app('WeighExceptedService')->getCreateExceptionSql(['id'=>$request->data]);
            $post = Http::post(config('go.export.url'),['type'=>'packageCreateException','sql'=>$sql]);
            if ($post->status() == 500){
                throw new Exception($post->header("Msg"));

app/Http/Controllers/api/thirdPart/flux/ProcessController.php

@@ -179,7 +179,7 @@ class ProcessController extends Controller
         }
         //TODO 保留：根据条码与货主批量二次查找商品
         if (count($commoditiesData) > 0){
-            app('commodityService')->insert($commoditiesData);
+            app('CommodityService')->insert($commoditiesData);
             $this->log(__METHOD__, 'FLUX二次加工单接口录入商品__' . __FUNCTION__, json_encode($commoditiesData), Auth::user()['id']);
             $commodities=Commodity::query()->whereIn('sku',$commoditiesTem['sku'])->whereIn('owner_id',$commoditiesTem['owner_id'])->get();
             foreach ($commodities as $commodity){
@@ -187,7 +187,7 @@ class ProcessController extends Controller
                     $commodityBarCodeData[$commodity->sku."_".$commodity->owner_id]['commodity_id']=$commodity->id;
             }
             if (count($commodityBarCodeData) > 0){
-                app('commodityBarcodeService')->insert(array_values($commodityBarCodeData));
+                app('CommodityBarcodeService')->insert(array_values($commodityBarCodeData));
                 $this->log(__METHOD__, 'FLUX二次加工单接口录入商品条码__' . __FUNCTION__, json_encode($commodityBarCodeData), Auth::user()['id']);
             }
         }

app/Http/Controllers/api/thirdPart/weight/PackageController.php

@@ -237,7 +237,7 @@ class PackageController extends Controller
         if (!$package){
             $logisticNumber=$request['barcode'];
             /** @var $orderService OrderService */
-            $orderService = app('orderService');
+            $orderService = app('OrderService');
             $order = $orderService->logisticNumberFirstOrCreateOrder($logisticNumber);
             if (!$order) {
                 $response=["msg"=>"保存时发生错误（未在WMS找到该单）!","code"=>500,"data"=>null];

app/Imports/OrderIssueImport.php

@@ -34,7 +34,7 @@ class OrderIssueImport implements ToCollection, WithHeadingRow, WithMultipleShee
         }
         $exception = [];
         $sum = 2;
-        $orderService = app('orderService');
+        $orderService = app('OrderService');
         $rejectedService = new RejectedService();
         if ($endIS) {
             foreach ($collection as $row) {

app/Imports/StoreCheckingReceiveImport.php

@@ -111,7 +111,7 @@ class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
             Cache::put("storeCheckingReceive",["success"=>false, "data"=>"货主为空，不允许录入，至少为一行标明货主！"],86400);
             return false;
         }
-        $owner = app('ownerService')->firstOrCreate(["name"=>$owner_name],["name"=>$owner_name, "code"=>$owner_name]);
+        $owner = app('OwnerService')->firstOrCreate(["name"=>$owner_name],["name"=>$owner_name, "code"=>$owner_name]);
 
         //使用条码同步
         $commodityController = new CommodityController();
@@ -119,7 +119,7 @@ class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
 
         //使用条码获取商品ID,筛选出需要录入条码项
         /** @var CommodityBarcodeService $commodityBarcodeService */
-        $commodityBarcodeService = app('commodityBarcodeService');
+        $commodityBarcodeService = app('CommodityBarcodeService');
         $commodityBarCodes = $commodityBarcodeService->getCommodities($barcodes, $owner->id);
         foreach ($commodityBarCodes as $barcode){
             if(!isset($commodities[$barcode->code]))continue;
@@ -152,7 +152,7 @@ class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
                     }
                 }
             }
-            $commoditiesTem = app('commodityService')->get(['owner_id'=>$owner->id, 'sku'=>$skus]);
+            $commoditiesTem = app('CommodityService')->get(['owner_id'=>$owner->id, 'sku'=>$skus]);
 
             if (count($commoditiesTem) > 0){
                 $barcodes = [];
@@ -212,7 +212,7 @@ class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
                 //录入商品
                 if (count($createCommodities) > 0){
                     /** @var CommodityService $commodityService */
-                    $commodityService = app('commodityService');
+                    $commodityService = app('CommodityService');
                     $commodityService->insert($createCommodities);
                     LogService::log(__METHOD__,"盘收录入临时商品",json_encode($createCommodities,JSON_UNESCAPED_UNICODE));
 
@@ -245,7 +245,7 @@ class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
             Cache::put("storeCheckingReceive",["success"=>false, "errors"=>$errors],86400);
             return false;
         }
-        $storeCheckingReceive = app('storeCheckingReceiveService')->create([
+        $storeCheckingReceive = app('StoreCheckingReceiveService')->create([
             "owner_id" => $owner->id,
             "created_at" => date('Y-m-d H:i:s'),
             'status' => "已导入",
@@ -257,7 +257,7 @@ class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
             $item["store_checking_receive_id"] = $storeCheckingReceive->id;
         }
 
-        app('storeCheckingReceiveItemService')->insert($items);
+        app('StoreCheckingReceiveItemService')->insert($items);
         LogService::log(__METHOD__,"导入盘收任务-批量录入盘收记录",json_encode($items,JSON_UNESCAPED_UNICODE));
 
         Cache::put("storeCheckingReceive",["success"=>true,"data"=>$storeCheckingReceive,"errors"=>$errors],86400);

app/OrderPackage.php

@@ -107,7 +107,7 @@ class OrderPackage extends Model
         foreach($resultOracleObjs_grouped as $resultOracleObj_grouped){
             $resultOracleObj = $resultOracleObj_grouped[0];
             /** @var OrderService */
-            $order = app('orderService')->logisticNumberFirstOrCreateOrder($resultOracleObj['soreference5']);
+            $order = app('OrderService')->logisticNumberFirstOrCreateOrder($resultOracleObj['soreference5']);
             if (!$order){
                 LogService::log(__METHOD__,"此包裹在WMS未找到order",json_encode($resultOracleObj),Auth::user()['id']);
                 continue;

app/Package.php

@@ -91,7 +91,7 @@ class Package extends Model
             array_push($packages,[
                 'batch_number'=>$batchCode??'',
                 /** @var OrderIssueService */
-                'order_id' => app('orderIssueService')->createOrFindByOrderNo($resultOracleObj['orderno']),
+                'order_id' => app('OrderIssueService')->createOrFindByOrderNo($resultOracleObj['orderno']),
                 'logistic_number'=>$resultOracleObj['SOReference5']??'',
                 'weight'=>$weight,
                 'weighed_at'=> $now,

app/Providers/AppServiceProvider.php

@@ -63,7 +63,7 @@ class AppServiceProvider extends ServiceProvider
     public function register()
     {
         //
-        app()->singleton('orderIssuePerformanceService',OrderIssuePerformanceService::class);
+        app()->singleton('OrderIssuePerformanceService',OrderIssuePerformanceService::class);
         app()->singleton('inventoryCompareService',InventoryCompareService::class);
     }
 
@@ -98,37 +98,37 @@ class AppServiceProvider extends ServiceProvider
     }
 
     private function loadingService(){
-        app()->singleton('cacheService',CacheService::class);
-        app()->singleton('userService',UserService::class);
-        app()->singleton('authorityService',AuthorityService::class);
-        app()->singleton('waybillFinancialService',WaybillFinancialService::class);
-        app()->singleton('weighExceptedService',WeighExceptedService::class);
-        app()->singleton('allInventoryService',AllInventoryService::class);
-        app()->singleton('inventoryDailyLogService',InventoryDailyLogService::class);
-        app()->singleton('processService',ProcessService::class);
-        app()->singleton('processStatisticService',ProcessStatisticService::class);
-        app()->singleton('ownerService',OwnerService::class);
-        app()->singleton('processMethodService',ProcessMethodService::class);
-        app()->singleton('logisticService',LogisticService::class);
-        app()->singleton('packageStatisticsService',PackageStatisticsService::class);
-        app()->singleton('oracleActAllocationDetailService',OracleActAllocationDetailService::class);
-        app()->singleton('shopService',ShopService::class);
-        app()->singleton('orderPackageService',OrderPackageService::class);
-        app()->singleton('orderIssueService',OrderIssueService::class);
-        app()->singleton('orderService',OrderService::class);
-        app()->singleton('oracleDocOrderHeaderService',OracleDOCOrderHeaderService::class);
-        app()->singleton('rejectedBillService',RejectedBillService::class);
-        app()->singleton('rejectedBillItemService',RejectedBillItemService::class);
-        app()->singleton('storeCheckingReceiveService',StoreCheckingReceiveService::class);
-        app()->singleton('storeCheckingReceiveItemService',StoreCheckingReceiveItemService::class);
-        app()->singleton('commodityBarcodeService',CommodityBarcodeService::class);
-        app()->singleton('oracleBasSkuService',OracleBasSkuService::class);
-        app()->singleton('oracleDocAsnDetailService',OracleDocAsnDetailService::class);
-        app()->singleton('inventoryAccountMissionService',InventoryAccountMissionService::class);
-        app()->singleton('processesContentService',ProcessesContentService::class);
-        app()->singleton('storeService',StoreService::class);
-        app()->singleton('warehouseService',WarehouseService::class);
-        app()->singleton('storeItemService',StoreItemService::class);
+        app()->singleton('CacheService',CacheService::class);
+        app()->singleton('UserService',UserService::class);
+        app()->singleton('AuthorityService',AuthorityService::class);
+        app()->singleton('WaybillFinancialService',WaybillFinancialService::class);
+        app()->singleton('WeighExceptedService',WeighExceptedService::class);
+        app()->singleton('AllInventoryService',AllInventoryService::class);
+        app()->singleton('InventoryDailyLogService',InventoryDailyLogService::class);
+        app()->singleton('ProcessService',ProcessService::class);
+        app()->singleton('ProcessStatisticService',ProcessStatisticService::class);
+        app()->singleton('OwnerService',OwnerService::class);
+        app()->singleton('ProcessMethodService',ProcessMethodService::class);
+        app()->singleton('LogisticService',LogisticService::class);
+        app()->singleton('PackageStatisticsService',PackageStatisticsService::class);
+        app()->singleton('OracleActAllocationDetailService',OracleActAllocationDetailService::class);
+        app()->singleton('ShopService',ShopService::class);
+        app()->singleton('OrderPackageService',OrderPackageService::class);
+        app()->singleton('OrderIssueService',OrderIssueService::class);
+        app()->singleton('OrderService',OrderService::class);
+        app()->singleton('OracleDocOrderHeaderService',OracleDOCOrderHeaderService::class);
+        app()->singleton('RejectedBillService',RejectedBillService::class);
+        app()->singleton('RejectedBillItemService',RejectedBillItemService::class);
+        app()->singleton('StoreCheckingReceiveService',StoreCheckingReceiveService::class);
+        app()->singleton('StoreCheckingReceiveItemService',StoreCheckingReceiveItemService::class);
+        app()->singleton('CommodityBarcodeService',CommodityBarcodeService::class);
+        app()->singleton('OracleBasSkuService',OracleBasSkuService::class);
+        app()->singleton('OracleDocAsnDetailService',OracleDocAsnDetailService::class);
+        app()->singleton('InventoryAccountMissionService',InventoryAccountMissionService::class);
+        app()->singleton('ProcessesContentService',ProcessesContentService::class);
+        app()->singleton('StoreService',StoreService::class);
+        app()->singleton('WarehouseService',WarehouseService::class);
+        app()->singleton('StoreItemService',StoreItemService::class);
 
         $this->loadingOrderModuleService();
         $this->loadingBasedModuleService();
@@ -136,30 +136,30 @@ class AppServiceProvider extends ServiceProvider
     }
 
     private function loadingOrderModuleService(){
-        app()->singleton('orderTrackingService',OrderTrackingService::class);
-        app()->singleton('orderService',OrderService::class);
-        app()->singleton('orderPackageService',OrderPackageService::class);
-        app()->singleton('orderPackageCommoditiesService',OrderPackageCommoditiesService::class);
-        app()->singleton('orderIssueService',OrderIssueService::class);
-        app()->singleton('orderIssueWorkLoadService',OrderIssueWorkLoadService::class);
-        app()->singleton('orderIssuePerformanceService',OrderIssuePerformanceService::class);
-        app()->singleton('oracleDOCOrderHeaderService',OracleDOCOrderHeaderService::class);
-        app()->singleton('oracleActAllocationDetailService',OracleActAllocationDetailService::class);
-        app()->singleton('orderIssueProcessLogService',OrderIssueProcessLogService::class);
+        app()->singleton('OrderTrackingService',OrderTrackingService::class);
+        app()->singleton('OrderService',OrderService::class);
+        app()->singleton('OrderPackageService',OrderPackageService::class);
+        app()->singleton('OrderPackageCommoditiesService',OrderPackageCommoditiesService::class);
+        app()->singleton('OrderIssueService',OrderIssueService::class);
+        app()->singleton('OrderIssueWorkLoadService',OrderIssueWorkLoadService::class);
+        app()->singleton('OrderIssuePerformanceService',OrderIssuePerformanceService::class);
+        app()->singleton('OracleDocOrderHeaderService',OracleDOCOrderHeaderService::class);
+        app()->singleton('OracleActAllocationDetailService',OracleActAllocationDetailService::class);
+        app()->singleton('OrderIssueProcessLogService',OrderIssueProcessLogService::class);
     }
 
     private function loadingBasedModuleService(){
-        app()->singleton("shopService", ShopService::class);
+        app()->singleton("ShopService", ShopService::class);
         //app()->singleton("logisticService", LogisticService::class);
-        //app()->singleton('ownerService',OwnerService::class);
-        app()->singleton('commodityService' , CommodityService::class);
-        app()->singleton('batchUpdateService' , BatchUpdateService::class);
-        app()->singleton('dataHandlerService',DataHandlerService::class);
-        app()->singleton('depositoryService',DepositoryService::class);
+        //app()->singleton('OwnerService',OwnerService::class);
+        app()->singleton('CommodityService', CommodityService::class);
+        app()->singleton('BatchUpdateService', BatchUpdateService::class);
+        app()->singleton('DataHandlerService',DataHandlerService::class);
+        app()->singleton('DepositoryService',DepositoryService::class);
     }
 
     private function loadingRejectedModuleService(){
-        app()->singleton('rejectedService',RejectedService::class);
+        app()->singleton('RejectedService',RejectedService::class);
     }
 
 }

app/Providers/AuthServiceProvider.php

@@ -45,7 +45,7 @@ class AuthServiceProvider extends ServiceProvider
         });
         if(!Schema::hasTable('authorities')){return;}
         /** @var AuthorityService $authorityService */
-        $authorityService=app('authorityService');
+        $authorityService=app('AuthorityService');
         $authorities = $authorityService->getAll();
         foreach($authorities as $authority) {
             Gate::define($authority->name, function($user) use ($authority) {

app/Services/CommodityService.php

@@ -89,7 +89,7 @@ Class CommodityService
 
     /* 通过货主代码与条形码寻找FLUX商品补充至WMS 单条*/
     public function ownerAndBarcodeFirstOrCreate(Owner $owner,$barcode){
-        $wmsCommodity = app('oracleBasSkuService')->first(['customerid'=>$owner->code, 'barcode'=>$barcode]);
+        $wmsCommodity = app('OracleBasSkuService')->first(['customerid'=>$owner->code, 'barcode'=>$barcode]);
         if (!$wmsCommodity) return null;
 
         $commodity = $this->firstOrCreate(['owner_id'=>$owner->id, 'sku'=>$wmsCommodity->sku],[
@@ -101,11 +101,11 @@ Class CommodityService
             "height" => $wmsCommodity->skuhigh,
             "volumn" => $wmsCommodity->cube,
         ]);
-        if ($wmsCommodity->alternate_sku1)app('commodityBarcodeService')->first([
+        if ($wmsCommodity->alternate_sku1)app('CommodityBarcodeService')->first([
             'commodity_id' => $commodity->id,
             'code' => $wmsCommodity->alternate_sku1,
         ]);
-        if ($wmsCommodity->alternate_sku2)app('commodityBarcodeService')->first([
+        if ($wmsCommodity->alternate_sku2)app('CommodityBarcodeService')->first([
             'commodity_id' => $commodity->id,
             'code' => $wmsCommodity->alternate_sku2,
         ]);

app/Services/InventoryAccountService.php

@@ -39,7 +39,7 @@ class InventoryAccountService
             ->sql();
     }
     private function conditionQuery($queryParam){
-        $ownerIds=app('ownerService')->getSelectionId();
+        $ownerIds=app('OwnerService')->getSelectionId();
         $inventories=InventoryAccount::query()->with(['owner','creator'])->orderBy('id','desc')->whereIn('owner_id',$ownerIds);
         $columnQueryRules=[
             'owner_id' => ['multi' => ','],

app/Services/InventoryCompareService.php

@@ -147,7 +147,7 @@ class InventoryCompareService
         return $inventoryCompares;
     }
     private function conditionQueryInventoryCompare(array $param){
-        $ownerIds=app('ownerService')->getSelectionId();
+        $ownerIds=app('OwnerService')->getSelectionId();
         $differ=$param['differ']??'';
         if ($differ=='有'){
             $inventoryCompares = InventoryCompare::query()->with(['owner','commodity'=>function($query){

app/Services/OrderIssueService.php

@@ -328,7 +328,7 @@ class OrderIssueService
     public function createOrFind($clientCode)
     {
         /** @var OrderService $orderService */
-        $orderService = app('orderService');
+        $orderService = app('OrderService');
         $orderHeader = OracleDOCOrderHeader::query()->where('SOReference1', $clientCode)->first();
         if ($orderHeader=== null) {
             return null;

app/Services/OrderPackageService.php

@@ -28,7 +28,7 @@ class OrderPackageService
     public function createdByOrder($order)
     {
         /** @var OrderPackageCommoditiesService $orderPackageCommoditiesService */
-        $orderPackageCommoditiesService = app('orderPackageCommoditiesService');
+        $orderPackageCommoditiesService = app('OrderPackageCommoditiesService');
         $oracleActAllocationDetails = OracleActAllocationDetails::query()->where('OrderNo', $order['code'])->get();
         $orderHeader = OracleDOCOrderHeader::query()->where('OrderNo', $order['code'])->first();
         $oracleDOCOrderDetail = OracleDOCOrderDetail::query()->where('OrderNo', $order['code'])->get();
@@ -134,7 +134,7 @@ class OrderPackageService
 //                return $bool;
 //            });
 //        }
-//        $orderPackageCommoditiesService = app('orderPackageCommoditiesService');
+//        $orderPackageCommoditiesService = app('OrderPackageCommoditiesService');
 //        $orderPackageCommoditiesService->basedOnActAllocationDetail($order, $orderHeader, $actAllocationDetails);
 //        $order['wam_status'] = $orderHeader['oracleBASCode_codename_c'];
 //        $order->save();
@@ -150,7 +150,7 @@ class OrderPackageService
         if ($package)return $package;
 
         /** @var OrderService */
-        $order = app('orderService')->logisticNumberFirstOrCreateOrder($logistic_number);
+        $order = app('OrderService')->logisticNumberFirstOrCreateOrder($logistic_number);
         if ($order) $values["order_id"] = $order->id;
 
         $values["logistic_number"] = $logistic_number;

app/Services/OrderService.php

@@ -194,7 +194,7 @@ class OrderService
         $checkData = $params['data'] ?? null;
         if ($checktime_start || $checktime_end){
             /** @var  OracleActAllocationDetailService */
-            $ordernos = app('oracleActAllocationDetailService')
+            $ordernos = app('OracleActAllocationDetailService')
                 ->getOrderno(['checktime_start'=>$checktime_start,'checktime_end'=>$checktime_end,
                     'paginate'=>$paginate,'page'=>$page]);
             $params['ordernos'] = $ordernos;
@@ -320,7 +320,7 @@ class OrderService
     public function findOrCreateByClientCode($clientCode)
     {
         /** @var OrderPackageService $orderPackageService */
-        $orderPackageService = app('orderPackageService');
+        $orderPackageService = app('OrderPackageService');
         $order = Order::query()->where('client_code', $clientCode)->first();
 
         $orderHeader = OracleDOCOrderHeader::query()->where('SOReference1', $clientCode)->first();
@@ -425,7 +425,7 @@ class OrderService
          * @var OracleActAllocationDetailService
          * @var OracleActAllocationDetails $actAllocationDetail
          */
-        $actAllocationDetail = app('oracleActAllocationDetailService')->first(['picktotraceid' => $logistic_number]);
+        $actAllocationDetail = app('OracleActAllocationDetailService')->first(['picktotraceid' => $logistic_number]);
         if ($actAllocationDetail) {
             $order = $this->first(['code' => $actAllocationDetail->orderno]);
             if ($order) return $order;
@@ -435,27 +435,27 @@ class OrderService
             }]);
             $orderHeader = $actAllocationDetail->oracleDocOrderHeader ?? null;
         } else {
-            $orderHeader = app('oracleDocOrderHeaderService')->first(['soreference5' => $logistic_number]);
+            $orderHeader = app('OracleDocOrderHeaderService')->first(['soreference5' => $logistic_number]);
         }
         if ($orderHeader == null) return null;
         $order = $this->first(['code'=>$orderHeader->orderno]);
         if ($order) return $order;
         /** @var OwnerService */
-        $owner = app('ownerService')->first(['code' => $orderHeader->customerid]);
+        $owner = app('OwnerService')->first(['code' => $orderHeader->customerid]);
         if (!$owner) {
             $orderHeader->load('oracleBASCustomer');
             $customer_name = $orderHeader->oracleBASCustomer ? $orderHeader->oracleBASCustomer->descr_c : null;
             /** @var OwnerService */
-            if ($customer_name) $owner = app('ownerService')->create(['code' => $orderHeader->customerid, 'name' => $customer_name]);
+            if ($customer_name) $owner = app('OwnerService')->create(['code' => $orderHeader->customerid, 'name' => $customer_name]);
         }
 
         $shop = null;
         $shop_name = $orderHeader->issuepartyname;
         if ($shop_name && $owner) {
             /** @var ShopService */
-            $shop = app('shopService')->firstOrCreate(['name' => $shop_name, 'owner_id' => $owner->id]);
+            $shop = app('ShopService')->firstOrCreate(['name' => $shop_name, 'owner_id' => $owner->id]);
         }
-        $logistics = app('logisticService')->firstOrCreate(['code' => $orderHeader->userdefine1],
+        $logistics = app('LogisticService')->firstOrCreate(['code' => $orderHeader->userdefine1],
             ['code' => $orderHeader->userdefine1, 'name' => $orderHeader->carriername]);
         return Order::query()->create([
             'code' => $orderHeader->orderno,
@@ -680,7 +680,7 @@ class OrderService
         $logistic = Logistic::query()->where('code',$orderHeader->userdefine1)->first();
         $owner = Owner::query()->where('code',$orderHeader->customerid ?? '')->first();
         $shop = Shop::query()->where('name',$orderHeader->issuepartyname)->where('owner_id',$owner->id)->first();
-        $warehouse = app('warehouseService')->firstOrCreate(["code"=>$orderHeader->warehouseid],["code"=>$orderHeader->warehouseid,"name"=>$orderHeader->warehouseid]);
+        $warehouse = app('WarehouseService')->firstOrCreate(["code"=>$orderHeader->warehouseid],["code"=>$orderHeader->warehouseid,"name"=>$orderHeader->warehouseid]);
         return [
             'code' =>$orderHeader->orderno,
             'owner_id' =>$owner->id,

app/User.php

@@ -47,7 +47,7 @@ class User extends Authenticatable
     ];
     function hasRole($roles){
         /** @var UserService $userService */
-        $userService = app('userService');
+        $userService = app('UserService');
         return !!$roles->intersect($userService->getRoles())->count();
     }
     function isSuperAdmin(){