采购管理

app/Http/Controllers/ProcurementController.php

@@ -24,6 +24,7 @@ use Carbon\Traits\Date;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Gate;
+use Matrix\Builder;
 
 class ProcurementController extends Controller
 {
@@ -117,7 +118,6 @@ class ProcurementController extends Controller
                 'initiator'=>Auth::user()['id'],
                 'type'=>1,
                 'status'=>0,
-                'is_enquiry'=>'是',
                 'time'=>14400000,
             ]);
             $procurement->save();
@@ -244,10 +244,9 @@ class ProcurementController extends Controller
         foreach ($procurements as $procurement){
             if ($procurement->type==2){
                 $pro=$this->newProcurement($procurement,Auth::user()['id'],$procurement->type,2);
-                $pro->loadMissing(['initiator','ownerMaterial.material','ownerMaterial.owner.customer']);
-                continue;
+            }else{
+                $pro=$this->newProcurement($procurement,Auth::user()['id'],$procurement->type);
             }
-            $pro=$this->newProcurement($procurement,Auth::user()['id'],$procurement->type);
             $pro->loadMissing(['initiator','ownerMaterial.material','ownerMaterial.owner.customer']);
             $collect->add($pro);
         }
@@ -315,7 +314,11 @@ class ProcurementController extends Controller
         $procurements = Procurement::query()
             ->filter($filters)
             ->with(['initiator','supplier','ownerMaterial.material','ownerMaterial.owner'=>function($query)use($owner_ids){
+                /** @var Builder $query */
                 $query->with('customer')->whereIn('id',$owner_ids);
+            },'procurementDeliveries'=>function($builder){
+                /** @var Builder $builder */
+                $builder->orderByDesc('id')->first();
             }])
             ->where('type',0) //只取采购单
             ->paginate($param['paginate'] ?? 50);
@@ -360,7 +363,7 @@ class ProcurementController extends Controller
                 $procurement->quantity,
                 $procurement->unit_price,
                 '',//送货数量
-                '',//销售总价
+                $procurement->unit_price*$procurement->amount,//销售总价=销售数量*销售单价
                 is_null($procurement->status) ? '' :$procurementStatus[$procurement->status],
                 $procurement->ownerMaterial->owner->customer ? $procurement->ownerMaterial->owner->customer->phone :'',
             ];

app/Http/Controllers/api/procurement/wechat/ProcurementController.php

@@ -24,11 +24,11 @@ class ProcurementController extends Controller
             ->withCount('procurementQuotations')
             ->with('ownerMaterial.material')
             ->where('status',$status)
-            ->whereNull('supplier_id')
             ->get();
         $keys = [];
         foreach ($procurements as $key=>$procurement){
             if ($procurement->procurement_quotations_count>0 && $status==0 )$keys[]= $key;
+            if ($procurement->type==2 && $procurement->supplier_id )$keys[]= $key;
             if($status==0)$procurement->deadline=Carbon::parse($procurement->deadline)->diffInMilliseconds(Carbon::now()); //待报价倒计时4小时
             if($status==2)$procurement->deadline=Carbon::parse($procurement->deadline)->subHours(-24)->diffInMilliseconds(Carbon::now()); //待接单倒计时24小时
         }
@@ -77,9 +77,9 @@ class ProcurementController extends Controller
             /** @var ProcurementService $procurementService*/
             $procurementService=app(ProcurementService::class);
             $supplier=$procurementService->screenSupplier($user,$material);
-            $procurement->update(['status'=>4,'supplier_id'=>$supplier->id]);//4:生产中
+            $procurement->update(['status'=>4,'supplier_id'=>$supplier->id,'deadline'=>Carbon::now()->toDateTimeString()]);//4:生产中
         }else{
-            $procurement->update(['status'=>4]);//4:生产中
+            $procurement->update(['status'=>4,'deadline'=>Carbon::now()->toDateTimeString()]);//4:生产中
         }
         if ($procurement) return response()->json(['status'=>1,'data'=>$procurement], 200);
     }

resources/views/procurement/finance/procurementBill.blade.php

@@ -31,7 +31,7 @@
                 </td>
                 <td class="">@{{ procurement.code }}</td>
                 <td class="">@{{ procurement.created_at }}</td>
-                <td class=""></td>
+                <td class=""><span v-if="procurement.supplier_id">@{{ procurement.deadline }}</span></td>
                 <td class=""></td>
                 <td v-if="procurement.owner_material.owner">@{{ procurement.owner_material.owner.name }}</td>
                 <td v-if="procurement.owner_material.owner.customer">@{{ procurement.owner_material.owner.customer.company_name }}</td>

resources/views/procurement/procurement/_addEnquiry.blade.php

@@ -62,48 +62,6 @@
                             <textarea type="text" class="form-control" name="specification" autocomplete="off" value="{{ old('specification') }}" readonly>@{{ specification }}</textarea>
                         </div>
                     </div>
-{{--                    <div class="form-group row">--}}
-{{--                        <label for="quantity" class="col-2 col-form-label text-right">采购数量</label>--}}
-{{--                        <div class="col-8">--}}
-{{--                            <input type="text" class="form-control @error('quantity') is-invalid @enderror"--}}
-{{--                                   v-model="quantity"  name="quantity" autocomplete="off" value="{{ old('quantity') }}" required>--}}
-{{--                            @error('quantity')--}}
-{{--                            <span class="invalid-feedback" role="alert">--}}
-{{--                                <strong>{{ $message }}</strong>--}}
-{{--                            </span>--}}
-{{--                            @enderror--}}
-{{--                        </div>--}}
-{{--                    </div>--}}
-{{--                    <div class="form-group row">--}}
-{{--                        <label for="amount" class="col-2 col-form-label text-right">销售数量</label>--}}
-{{--                        <div class="col-8">--}}
-{{--                            <input type="text" class="form-control @error('amount') is-invalid @enderror"--}}
-{{--                                   name="amount" autocomplete="off" value="{{ old('amount') }}" @input="countTotalPrice" v-model="amount" required>--}}
-{{--                            @error('amount')--}}
-{{--                            <span class="invalid-feedback" role="alert">--}}
-{{--                                <strong>{{ $message }}</strong>--}}
-{{--                            </span>--}}
-{{--                            @enderror--}}
-{{--                        </div>--}}
-{{--                    </div>--}}
-{{--                    <div class="form-group row">--}}
-{{--                        <label for="unit_price" class="col-2 col-form-label text-right">销售单价</label>--}}
-{{--                        <div class="col-8">--}}
-{{--                            <input type="text" class="form-control @error('unit_price') is-invalid @enderror"--}}
-{{--                                   name="unit_price" autocomplete="off" value="{{ old('unit_price') }}" @input="countTotalPrice" v-model="unit_price" required>--}}
-{{--                            @error('unit_price')--}}
-{{--                            <span class="invalid-feedback" role="alert">--}}
-{{--                                <strong>{{ $message }}</strong>--}}
-{{--                            </span>--}}
-{{--                            @enderror--}}
-{{--                        </div>--}}
-{{--                    </div>--}}
-{{--                    <div class="form-group row">--}}
-{{--                        <label for="total_price" class="col-2 col-form-label text-right">销售总价</label>--}}
-{{--                        <div class="col-8">--}}
-{{--                            <input type="text" class="form-control" name="total_price" autocomplete="off" value="{{ old('total_price') }}" v-model="total_price" readonly>--}}
-{{--                        </div>--}}
-{{--                    </div>--}}
                 </form>
             </div>
             <div class="modal-footer">

resources/views/procurement/procurement/_addProof.blade.php

@@ -62,48 +62,6 @@
                             <textarea type="text" class="form-control" name="specification" autocomplete="off" value="{{ old('specification') }}" readonly>@{{ specification }}</textarea>
                         </div>
                     </div>
-                    {{--                    <div class="form-group row">--}}
-                    {{--                        <label for="quantity" class="col-2 col-form-label text-right">采购数量</label>--}}
-                    {{--                        <div class="col-8">--}}
-                    {{--                            <input type="text" class="form-control @error('quantity') is-invalid @enderror"--}}
-                    {{--                                   v-model="quantity"  name="quantity" autocomplete="off" value="{{ old('quantity') }}" required>--}}
-                    {{--                            @error('quantity')--}}
-                    {{--                            <span class="invalid-feedback" role="alert">--}}
-                    {{--                                <strong>{{ $message }}</strong>--}}
-                    {{--                            </span>--}}
-                    {{--                            @enderror--}}
-                    {{--                        </div>--}}
-                    {{--                    </div>--}}
-                    {{--                    <div class="form-group row">--}}
-                    {{--                        <label for="amount" class="col-2 col-form-label text-right">销售数量</label>--}}
-                    {{--                        <div class="col-8">--}}
-                    {{--                            <input type="text" class="form-control @error('amount') is-invalid @enderror"--}}
-                    {{--                                   name="amount" autocomplete="off" value="{{ old('amount') }}" @input="countTotalPrice" v-model="amount" required>--}}
-                    {{--                            @error('amount')--}}
-                    {{--                            <span class="invalid-feedback" role="alert">--}}
-                    {{--                                <strong>{{ $message }}</strong>--}}
-                    {{--                            </span>--}}
-                    {{--                            @enderror--}}
-                    {{--                        </div>--}}
-                    {{--                    </div>--}}
-                    {{--                    <div class="form-group row">--}}
-                    {{--                        <label for="unit_price" class="col-2 col-form-label text-right">销售单价</label>--}}
-                    {{--                        <div class="col-8">--}}
-                    {{--                            <input type="text" class="form-control @error('unit_price') is-invalid @enderror"--}}
-                    {{--                                   name="unit_price" autocomplete="off" value="{{ old('unit_price') }}" @input="countTotalPrice" v-model="unit_price" required>--}}
-                    {{--                            @error('unit_price')--}}
-                    {{--                            <span class="invalid-feedback" role="alert">--}}
-                    {{--                                <strong>{{ $message }}</strong>--}}
-                    {{--                            </span>--}}
-                    {{--                            @enderror--}}
-                    {{--                        </div>--}}
-                    {{--                    </div>--}}
-                    {{--                    <div class="form-group row">--}}
-                    {{--                        <label for="total_price" class="col-2 col-form-label text-right">销售总价</label>--}}
-                    {{--                        <div class="col-8">--}}
-                    {{--                            <input type="text" class="form-control" name="total_price" autocomplete="off" value="{{ old('total_price') }}" v-model="total_price" readonly>--}}
-                    {{--                        </div>--}}
-                    {{--                    </div>--}}
                 </form>
             </div>
             <div class="modal-footer">