Merge branch 'Haozi' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Console/Kernel.php

@@ -4,6 +4,7 @@ namespace App\Console;
 
 use App\Console\Commands\BeforeCreateOwnerReport;
 use App\Console\Commands\ClearCancelledOrderTask;
+use App\Console\Commands\CreateProcurementTotalBill;
 use App\Console\Commands\CreateWeightStatistic;
 use App\Console\Commands\FluxOrderFix;
 use App\Console\Commands\InventoryDailyLoggingOwner;
@@ -46,6 +47,7 @@ class  Kernel extends ConsoleKernel
         WasSyncWmsAsnInformation::class,
         CreateWeightStatistic::class,
         BeforeCreateOwnerReport::class,
+        CreateProcurementTotalBill::class,
     ];
 
     /**
@@ -72,6 +74,7 @@ class  Kernel extends ConsoleKernel
         $schedule->command('clear:cancelledOrder')->everyTenMinutes();
         $schedule->command('WasSyncWmsAsnInformation')->everyMinute();
         $schedule->command('create:weightStatistic')->dailyAt("00:30");
+        $schedule->command('createProcurementTotalBill')->monthlyOn(1);
     }
 
     /**

app/Http/Controllers/ProcurementController.php

@@ -417,7 +417,7 @@ class ProcurementController extends Controller
                 $query->with('customer')->whereIn('id',$owner_ids);
             },'procurementDeliveries'])
             ->where('type',0) //只取采购单
-            ->paginate($param['paginate'] ?? 50);
+            ->get();
         foreach ($procurements as $procurement){
             if (empty($procurement->procurementDeliveries))continue;
             $procurement->receive_amount=$procurement->procurementDeliveries->sum('receipt_amount');

app/Services/OrderService.php

@@ -1008,7 +1008,7 @@ class OrderService
     {
         if (!$logistics)$logistics = app("OwnerPriceExpressService")->getBuildLogistic($owner);
         $query = DB::raw(<<<sql
-SELECT COUNT(1) count,logistic_id FROM orders WHERE wms_status = '订单完成' 
+SELECT COUNT(1) count,logistic_id FROM orders WHERE wms_status = '订单完成'
 AND owner_id = ?
 AND wms_edittime like ? GROUP BY logistic_id
 sql

resources/views/maintenance/user/edit.blade.php

@@ -49,7 +49,7 @@
                         <label for="email" class="col-2 col-form-label text-right">手机号</label>
                         <div class="col-8">
                             <input type="text" class="form-control @error('phone') is-invalid @enderror"
-                                   name="phone" autocomplete="off" value="@if(old('phone')){{old('phone')}}@else{{$user->userDetail->mobile_phone}}@endif" required>
+                                   name="phone" autocomplete="off" value="@if(old('phone')){{old('phone')}}@else{{$user->userDetail ? $user->userDetail->mobile_phone : ''}}@endif" required>
                             @error('phone')
                             <span class="invalid-feedback" role="alert">
                                 <strong>{{ $message }}</strong>

resources/views/order/index/delivering.blade.php

@@ -24,22 +24,22 @@
                     </div>
                     @can('订单管理-批量备注')<button @click="modal()" type="button" class="btn btn-sm ml-2 btn-outline-primary">批量备注追加</button>@endcan
                     @can('订单管理-编辑')
-                        <span class="btn btn-sm tooltipTarget ml-2" @click="freezeAll" style="cursor: pointer" title="订单的冻结条件要只局限在“创建订单”,“分配完成”,“拣货完成”,“播种完成”"
-                              :class="[checkData.length>0?'btn-dark':'btn-outline-dark']">冻结</span>
-                        <button type="button" @click="thaw(checkData,true)" class="btn btn-sm tooltipTarget" title="解除已冻结订单"
-                                :class="[checkData.length>0?'btn-dark':'btn-outline-danger']" style="opacity: 0.7">解冻</button>
-                        <span class="btn btn-sm tooltipTarget ml-2" @click="deAllocationAll" style="cursor: pointer"  title="订单的取消分配条件要只局限在“分配完成”或“部分分配”"
-                              :class="[checkData.length>0?'btn-dark':'btn-outline-dark']">取消分配</span>
-                        <button type="button" @click="resetLogisticsGetMark()" class="btn btn-sm "
-                                :class="[checkData.length>0?'btn-dark':'btn-outline-secondary']">重置快递获取标记</button>
+                        <span class="btn btn-sm tooltipTarget ml-1 btn-outline-dark"  @click="freezeAll" style="cursor: pointer" title="订单的冻结条件要只局限在“创建订单”,“分配完成”,“拣货完成”,“播种完成”"
+                              :class="[checkData.length>0?'btn-dark text-light':'']" >冻结</span>
+                        <button type="button" @click="thaw(checkData,true)" class="btn btn-sm tooltipTarget ml-1" title="解除已冻结订单"
+                                :class="[checkData.length>0?'btn-danger':'btn-outline-danger']" style="opacity: 0.7">解冻</button>
+                        <span class="btn btn-sm tooltipTarget ml-1" @click="deAllocationAll" style="cursor: pointer"  title="订单的取消分配条件要只局限在“分配完成”或“部分分配”"
+                              :class="[checkData.length>0?'btn-dark':'btn-outline-dark'] ">取消分配</span>
+                        <button type="button" @click="resetLogisticsGetMark()" class="btn btn-sm ml-1 btn-outline-secondary" style="background: #d7e8df;"
+                                :class="[checkData.length>0?'btn-dark text-black':''] ">重置快递获取标记</button>
                     @endcan
-                    @can('订单管理-订单-生成问题件')<button  @click="orderIssueTag()" type="button" class="btn btn-sm ml-2 btn-outline-primary "
+                    @can('订单管理-订单-生成问题件')<button  @click="orderIssueTag()" type="button" class="btn btn-sm ml-1 btn-outline-primary "
                                                  :class="[checkData.length>0?'btn-dark':'btn-outline-primary']">标记问题件</button>@endcan
                     @can('订单管理-订单-生成退货单')
-                        <button class="btn btn-sm ml-2" :class="[checkData.length>0?'btn-dark':'btn-outline-danger']" @click="isRejectedBillExist()"
+                        <button class="btn btn-sm ml-1" :class="[checkData.length>0?'btn-danger':'btn-outline-danger']" @click="isRejectedBillExist()"
                             style="opacity: 0.7">生成退货单</button>
                     @endcan
-                    <button class="btn btn-sm ml-2 btn-primary" v-if="checkData.length>0" @click="copyLogisticNumber()">复制快递单号</button>
+                    <button class="btn btn-sm ml-1 btn-primary" v-if="checkData.length>0" @click="copyLogisticNumber()">复制快递单号</button>
                 </div>
                 <div class="modal fade " style="top: 20%" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
                     <div class="modal-dialog">

routes/api.php

@@ -13,24 +13,4 @@ use Illuminate\Support\Facades\Route;
 | is assigned the "api" middleware group. Enjoy building your API!
 |
 */
-Route::group(['prefix' => 'procurement','middleware'=>'procurement.auth.api'], function ($router) {
-    Route::any('banding', 'api\thirdPart\weixin\AuthController@banding');
-    Route::post('getWaitQuotation', 'api\thirdPart\weixin\ProcurementController@getWaitQuotation');
-    Route::post('getQuotationDetailById', 'api\thirdPart\weixin\ProcurementController@getQuotationDetailById');
-    Route::post('setOffer', 'api\thirdPart\weixin\ProcurementController@setOffer');
-    Route::post('accept', 'api\thirdPart\weixin\ProcurementController@accept');
-    Route::get('getProductionProcurement', 'api\thirdPart\weixin\ProcurementController@getProductionProcurement');
-    Route::get('getProcurementDeliveries', 'api\thirdPart\weixin\ProcurementController@getProcurementDeliveries');
-    Route::post('makeProcurementDelivery', 'api\thirdPart\weixin\ProcurementController@makeProcurementDelivery');
-    Route::post('finishProductionProcurement', 'api\thirdPart\weixin\ProcurementController@finishProductionProcurement');
-    Route::post('getProcurementDeliveryById', 'api\thirdPart\weixin\ProcurementController@getProcurementDeliveryById');
-    Route::post('updateProcurementDeliveryAmount', 'api\thirdPart\weixin\ProcurementController@updateProcurementDeliveryAmount');
-    Route::get('getProcurementTotalBill', 'api\thirdPart\weixin\ProcurementController@getProcurementTotalBill');
-    Route::post('markProcurementTotalBillStatus', 'api\thirdPart\weixin\ProcurementController@markProcurementTotalBillStatus');
-    Route::post('makeReceipt', 'api\thirdPart\weixin\ProcurementController@makeReceipt');
-    Route::post('supplierDeliverConfirm', 'api\thirdPart\weixin\ProcurementController@supplierDeliverConfirm');
-});
-Route::group(['prefix' => 'procurement'], function ($router) {
-    Route::post('login', 'api\thirdPart\weixin\AuthController@login');
-});
 

routes/api/thirdPart/weixin.php

@@ -1,7 +1,7 @@
 <?php
 
 use Illuminate\Http\Request;
-
+use Illuminate\Support\Facades\Route;
 
 
 /*
@@ -15,3 +15,23 @@ Route::group(['middleware'=>'auth.api'],function(){
 });
 Route::post('login', "WxLoginController@login");//微信小程序登录验证
 
+Route::group(['prefix' => 'procurement','middleware'=>'procurement.auth.api'], function ($router) {
+    Route::any('banding', 'AuthController@banding');
+    Route::post('getWaitQuotation', 'ProcurementController@getWaitQuotation');
+    Route::post('getQuotationDetailById', 'ProcurementController@getQuotationDetailById');
+    Route::post('setOffer', 'ProcurementController@setOffer');
+    Route::post('accept', 'ProcurementController@accept');
+    Route::get('getProductionProcurement', 'ProcurementController@getProductionProcurement');
+    Route::get('getProcurementDeliveries', 'ProcurementController@getProcurementDeliveries');
+    Route::post('makeProcurementDelivery', 'ProcurementController@makeProcurementDelivery');
+    Route::post('finishProductionProcurement', 'ProcurementController@finishProductionProcurement');
+    Route::post('getProcurementDeliveryById', 'ProcurementController@getProcurementDeliveryById');
+    Route::post('updateProcurementDeliveryAmount', 'ProcurementController@updateProcurementDeliveryAmount');
+    Route::get('getProcurementTotalBill', 'ProcurementController@getProcurementTotalBill');
+    Route::post('markProcurementTotalBillStatus', 'ProcurementController@markProcurementTotalBillStatus');
+    Route::post('makeReceipt', 'ProcurementController@makeReceipt');
+    Route::post('supplierDeliverConfirm', 'ProcurementController@supplierDeliverConfirm');
+});
+Route::group(['prefix' => 'procurement'], function ($router) {
+    Route::post('login', 'AuthController@login');
+});