ソースを参照

ownerService错误修改

LD 5 年 前
コミット
23f1379ce0

+ 16 - 8
app/Console/Kernel.php

@@ -2,8 +2,16 @@
 
 namespace App\Console;
 
+use App\Console\Commands\FluxOrderFix;
+use App\Console\Commands\InventoryDailyLoggingOwner;
+use App\Console\Commands\LogExpireDelete;
+use App\Console\Commands\MakeServiceCommand;
 use App\Console\Commands\SyncBatchTask;
+use App\Console\Commands\SyncLogCacheTask;
+use App\Console\Commands\SyncUserVisitMenuLogsCacheTask;
 use App\Console\Commands\SyncWMSOrderTask;
+use App\Console\Commands\TestTemp;
+use App\Console\Commands\WASSyncWMSOrderInformation;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -15,14 +23,14 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
-        \App\Console\Commands\LogExpireDelete::class,
-        \App\Console\Commands\MakeServiceCommand::class,
-        \App\Console\Commands\FluxOrderFix::class,
-        \App\Console\Commands\InventoryDailyLoggingOwner::class,
-        \App\Console\Commands\WASSyncWMSOrderInformation::class,
-        \App\Console\Commands\SyncLogCacheTask::class,
-        \App\Console\Commands\SyncUserVisitMenuLogsCacheTask::class,
-        \App\Console\Commands\TestTemp::class,
+        LogExpireDelete::class,
+        MakeServiceCommand::class,
+        FluxOrderFix::class,
+        InventoryDailyLoggingOwner::class,
+        WASSyncWMSOrderInformation::class,
+        SyncLogCacheTask::class,
+        SyncUserVisitMenuLogsCacheTask::class,
+        TestTemp::class,
         SyncBatchTask::class,
         SyncWMSOrderTask::class,
     ];

+ 4 - 1
app/Http/Controllers/api/thirdPart/haiq/StorageController.php

@@ -142,7 +142,7 @@ class StorageController
                 "detail02"=> "detail02",
                 "detail03"=> "detail03",
                 "qrCode"=> "qrCode",
-                "qty00"=> "qty00",
+                "qty00"=> "11",
                 "qty01"=> 1,
                 "qty02"=> 2,
                 "title"=> "title",
@@ -151,6 +151,9 @@ class StorageController
             ],
             "locCode"=> "1004-BZ04-01-01"
         ];
+        $this->lightOff = [
+            "locCode"=> "12G03-21",
+        ];
     }
 
     public function relocate(Request $request,$post){

+ 1 - 1
app/Services/InventoryAccountService.php

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

+ 1 - 1
app/Services/InventoryCompareService.php

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

+ 3 - 1
app/Services/OwnerService.php

@@ -30,12 +30,14 @@ Class OwnerService
             return Owner::query()->select($column)->whereIn('id', $ownerIds)->get();
         },config('cache.expirations.owners'));
     }
-    public function getSelectionId($column = ['id'])
+
+    public function getSelection($column = ['id'])
     {
         return $this->cacheService->getOrExecute('OwnersAll_Id',function()use($column){
             return Owner::filterAuthorities()->select($column)->get();
         },config('cache.expirations.owners'));
     }
+
     /**
      *同步WMS全部货主至WAS
      */

+ 1 - 1
app/Services/RealtimePendingOrdersService.php

@@ -39,7 +39,7 @@ class RealtimePendingOrdersService
     {
         $start = $start ?? date('Y-m-d 00:00:00');
         $end = $end ?? date('Y-m-d 23:59:59');
-        $ownerIds = app('OwnerService')->getSelectionId();
+        $ownerIds = app('OwnerService')->getSelection();
         $builders = Order::query()->selectRaw("warehouses.code," .
             "count(case wms_status when '创建订单' then 1 end) as createOrder, " .
             "count(case wms_status when '分配完成' then 1 end) as assignedComplete, " .