修改退回入库报错问题

app/Http/Controllers/ProcurementController.php

@@ -30,7 +30,8 @@ class ProcurementController extends Controller
 {
     use AsyncResponse;
 
-    private function newProcurement($param,$userId,$type=0,$status=0){
+    private function newProcurement($param,$userId,$type=0,$status=0): Procurement
+    {
         $procurement=new Procurement([
             'owner_material_id'=>$param['owner_material_id'],
             'quantity'=>$param['quantity'],
@@ -89,7 +90,7 @@ class ProcurementController extends Controller
         $procurement=$this->newProcurement($param,Auth::user()['id']);
         return redirect('procurement/procurement/index')->with('successTip','新采购单“'.$procurement->code.'”添加成功');
     }
-    public function createProcurement(ProcurementRequest $request)
+    public function createProcurement(ProcurementRequest $request): array
     {
         $this->gate('采购管理-采购-新建');
         $request->validated();
@@ -104,7 +105,7 @@ class ProcurementController extends Controller
         }
     }
     //新增询价
-    public function createEnquiry(EnquiryRequest $request)
+    public function createEnquiry(EnquiryRequest $request): array
     {
         $this->gate('采购管理-采购-新建');
         $request->validated();
@@ -136,7 +137,7 @@ class ProcurementController extends Controller
         }
     }
     //新增打样
-    public function createProof(ProofRequest $request)
+    public function createProof(ProofRequest $request): array
     {
         $this->gate('采购管理-采购-新建');
         $request->validated();
@@ -167,7 +168,8 @@ class ProcurementController extends Controller
         }
     }
     //取消采购单
-    public function cancel($id){
+    public function cancel($id): array
+    {
         $this->gate('采购管理-采购-编辑');
         try {
             $procurement=Procurement::query()->find($id);
@@ -180,7 +182,8 @@ class ProcurementController extends Controller
         }
     }
     //询价单提交采购申请
-    public function submitProcurement(ProcurementAmountRequest $request){
+    public function submitProcurement(ProcurementAmountRequest $request): array
+    {
         $this->gate('采购管理-采购-编辑');
         $request->validated();
         $param=$request->all();
@@ -207,7 +210,8 @@ class ProcurementController extends Controller
             return ['success' => false,'message' => $e->getMessage()];
         }
     }
-    public function initiateProcurement(Request $request){
+    public function initiateProcurement(Request $request): array
+    {
         $this->gate('采购管理-采购-编辑');
         $id=$request->input('id');
         /** @var ProcurementService $procurementService*/
@@ -220,7 +224,8 @@ class ProcurementController extends Controller
             return ['success' => false,'message' => $e->getMessage()];
         }
     }
-    public function costPrice(Request $request){
+    public function costPrice(Request $request): array
+    {
         $this->gate('采购管理-财务-采购账单');
         $id=$request->input('id');
         $cost_price=$request->input('cost_price');
@@ -234,7 +239,7 @@ class ProcurementController extends Controller
             return ['success' => false,'message' => $e->getMessage()];
         }
     }
-    public function createAnew(Request $request)
+    public function createAnew(Request $request): array
     {
         $this->gate('采购管理-采购-新建');
         $ids=$request->input('checkData');

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

@@ -17,7 +17,7 @@ use Illuminate\Support\Facades\Auth;
 class ProcurementController extends Controller
 {
 
-    public function getWaitQuotation(Request $request)
+    public function getWaitQuotation(Request $request): \Illuminate\Http\JsonResponse
     {
         $status=$request->input('status');//0:待报价,2:待接单
         $procurements=Procurement::query()
@@ -36,7 +36,7 @@ class ProcurementController extends Controller
         if (!empty($procurements))return response()->json(['status'=>1,'data'=>$procurements], 200);
     }
 
-    public function getQuotationDetailById(Request $request)
+    public function getQuotationDetailById(Request $request): \Illuminate\Http\JsonResponse
     {
         $id=$request->input('id');
         $procurement=Procurement::query()
@@ -46,7 +46,7 @@ class ProcurementController extends Controller
         if ($procurement) return response()->json(['status'=>1,'data'=>$procurement], 200);
     }
     //报价
-    public function setOffer(Request $request)
+    public function setOffer(Request $request): \Illuminate\Http\JsonResponse
     {
         $param=$request->all(['id','offer']);
         $user= Auth::user();
@@ -67,7 +67,7 @@ class ProcurementController extends Controller
         if ($procurementQuotation) return response()->json(['status'=>1,'data'=>$procurementQuotation], 200);
     }
     //接单
-    public function accept(Request $request)
+    public function accept(Request $request): \Illuminate\Http\JsonResponse
     {
         $id=$request->input('id');
         $user= Auth::user();
@@ -84,7 +84,7 @@ class ProcurementController extends Controller
         if ($procurement) return response()->json(['status'=>1,'data'=>$procurement], 200);
     }
     //生产中的订单
-    public function getProductionProcurement()
+    public function getProductionProcurement(): \Illuminate\Http\JsonResponse
     {
         $procurements=Procurement::query()
             ->with('ownerMaterial.material')
@@ -94,14 +94,14 @@ class ProcurementController extends Controller
         if ($procurements) return response()->json(['status'=>1,'data'=>$procurements], 200);
     }
     //结束生产
-    public function finishProductionProcurement(Request $request)
+    public function finishProductionProcurement(Request $request): \Illuminate\Http\JsonResponse
     {
         $id=$request->input('id');
         $procurement=Procurement::query()->find($id)->update(['status'=>5]);
         if ($procurement) return response()->json(['status'=>1,'data'=>$procurement], 200);
     }
 
-    public function getProcurementDeliveries()
+    public function getProcurementDeliveries(): \Illuminate\Http\JsonResponse
     {
         $procurementDeliveries=ProcurementDeliverie::query()
             ->with('procurement.ownerMaterial.material')
@@ -109,7 +109,7 @@ class ProcurementController extends Controller
             ->get();
         if ($procurementDeliveries) return response()->json(['status'=>1,'data'=>$procurementDeliveries], 200);
     }
-    public function makeProcurementDelivery(Request $request)
+    public function makeProcurementDelivery(Request $request): \Illuminate\Http\JsonResponse
     {
         $param=$request->all(['id','deliverAmount']);
         $procurement=Procurement::query()
@@ -140,21 +140,21 @@ class ProcurementController extends Controller
         if ($procurement->type!=2)ProcurementCheckSheet::query()->create(['procurement_delivery_id'=>$procurementDelivery->id,'account_payable'=>$procurementDelivery->receipt_amount*$procurement->cost_price,'auditor'=>0]);
         if ($procurementDelivery) return response()->json(['status'=>1,'data'=>$procurementDelivery], 200);
     }
-    public function getProcurementDeliveryById(Request $request)
+    public function getProcurementDeliveryById(Request $request): \Illuminate\Http\JsonResponse
     {
         $procurementDelivery=ProcurementDeliverie::query()
             ->with(['procurement.ownerMaterial.material','receiver.userDetail','procurement.ownerMaterial.owner.customer','procurement.supplier','procurement.ownerMaterial.file'])
             ->find($request->input('id'));
         if ($procurementDelivery) return response()->json(['status'=>1,'data'=>$procurementDelivery], 200);
     }
-    public function updateProcurementDeliveryAmount(Request $request)
+    public function updateProcurementDeliveryAmount(Request $request): \Illuminate\Http\JsonResponse
     {
         $param=$request->all(['id','delivernum']);
         $procurementDelivery=ProcurementDeliverie::query()->where('id',$param['id'])->update(['amount'=>$param['delivernum']]);
         if ($procurementDelivery)return response()->json(['status'=>1,'data'=>$procurementDelivery], 200);
     }
 
-    public function getProcurementTotalBill()
+    public function getProcurementTotalBill(): \Illuminate\Http\JsonResponse
     {
         $procurementTotalBills=ProcurementTotalBill::query()
             ->get();
@@ -164,14 +164,14 @@ class ProcurementController extends Controller
         }
         if ($procurementTotalBills) return response()->json(['status'=>1,'data'=>$procurementTotalBills], 200);
     }
-    public function markProcurementTotalBillStatus(Request $request)//供应商提交对账单
+    public function markProcurementTotalBillStatus(Request $request): \Illuminate\Http\JsonResponse//供应商提交对账单
     {
         $id=$request->input('id');
         $procurementTotalBill=ProcurementTotalBill::query()->find($id)->update(['status'=>1]);//1:已出账
         return response()->json(['status'=>1,'data'=>$procurementTotalBill], 200);
     }
     //收货员确认收货
-    public function makeReceipt(Request $request)
+    public function makeReceipt(Request $request): \Illuminate\Http\JsonResponse
     {
         $param=$request->all(['id','delivernum']);
         $procurementDelivery=ProcurementDeliverie::query()->with('procurement')->find($param['id']);
@@ -179,7 +179,7 @@ class ProcurementController extends Controller
         $procurementDelivery->procurement->update(['status'=>6]);
         if ($procurementDelivery) return response()->json(['status'=>1,'data'=>$procurementDelivery], 200);
     }
-    public function supplierDeliverConfirm(Request $request)
+    public function supplierDeliverConfirm(Request $request): \Illuminate\Http\JsonResponse
     {
         $procurementDelivery=ProcurementDeliverie::query()
             ->with(['procurement','procurementCheckSheet'])->find($request->input('id'));

app/Services/RejectedBillService.php

@@ -165,9 +165,11 @@ class RejectedBillService
         }
         return $logisticNumberReturn;
     }
-    public function getCheckNumbers($updateCollect){
+    public function getCheckNumbers($updateCollect): array
+    {
         $checkNumbers=[];
         foreach ($updateCollect as $data){
+            if (!$data->notes) continue;
             $checkedNumber=$this->screenCheckNumber($data->customerid,$data->notes);
             if (!$checkedNumber) continue;
             array_push($checkNumbers, $checkedNumber);