盘点优化---整合盲收，盘点到同一页面

app/Commodity.php

@@ -16,8 +16,8 @@ class Commodity extends Model
     public function setNameAttribute($value){
         $this->attributes['name']=str_replace(PHP_EOL,'',$value);
     }
-    public function getNameAttAttribute(){
-        return $this['name']=str_replace(array("\r\n","\n","\r"),'',$this['name']);
+    public function getNameAttribute($value){
+        return $this->attributes['name']=str_replace(array("\r\n","\n","\r",""",'"'),'',$value);
     }
     public function barcodes()
     {

app/Http/Controllers/InventoryAccountController.php

@@ -103,7 +103,9 @@ class InventoryAccountController extends Controller
         /** @var InventoryAccountService $inventoryService */
         $inventoryService=app('inventoryAccountService');
         $inventoryAccount=$inventoryService->updateInventory($inventoryId);
-        if ($inventoryAccountMissions&&$inventoryAccount) return ['success'=>true,'status'=>'盲收盘点成功'];
+        if ($inventoryAccountMissions&&$inventoryAccount)
+        $stockInventoryPersons=$inventoryAccountMissions[0]->stockInventoryPersons;
+        return ['success'=>true,'inventoryMissions'=>$inventoryAccountMissions,'inventory'=>$inventoryAccount,'stockInventoryPersons'=>$stockInventoryPersons];
     }
     //根据该库存和产品条码查询该条盘点记录??
     public function searchStockInventoryRecord(Request $request){
@@ -236,7 +238,8 @@ class InventoryAccountController extends Controller
             /** @var InventoryAccountService $inventoryService */
             $inventoryService=app('inventoryAccountService');
             $inventoryAccount=$inventoryService->updateInventory($inventoryId);
-            return ['success'=>true,'inventoryMission'=>$inventoryAccountMission,'inventory'=>$inventoryAccount];
+            $stockInventoryPersons=$inventoryAccountMission[0]->stockInventoryPersons;
+            return ['success'=>true,'inventoryMission'=>$inventoryAccountMission,'inventory'=>$inventoryAccount,'stockInventoryPersons'=>$stockInventoryPersons];
         }else{
             /** @var InventoryAccountService $inventoryAccountMission */
             $inventoryAccountService=app('inventoryAccountService');

app/Services/InventoryAccountService.php

@@ -480,6 +480,7 @@ class InventoryAccountService
             $inventoryAccount->returned=$inventoryAccount->getReturnedAmount(); //复盘归位数
             $inventoryAccount->update();
             Controller::logS(__METHOD__,"修改盘点任务记录".__FUNCTION__,json_encode($inventoryId));
+            $inventoryAccountMission=InventoryAccountMission::with(['commodity.barcodes','stockInventoryPersons'])->where('id',$inventoryAccountMission->id)->first();
             return $inventoryAccountMission;
         }else{
             return null;

app/Services/InventoryCompareService.php

@@ -151,15 +151,15 @@ class InventoryCompareService
         if ($differ=='有'){
             $inventoryCompares = InventoryCompare::query()->with(['owner','commodity'=>function($query){
                 $query->with('barcodes');
-            }])->where('differ','>',0)->orderByDesc('id')->whereIn('owner_id',$ownerIds);
+            }])->where('differ','>',0)->orderByDesc('id')->whereIn('inventory_compares.owner_id',$ownerIds);
         }elseif ($differ=='无'){
             $inventoryCompares = InventoryCompare::query()->with(['owner','commodity'=>function($query){
                 $query->with('barcodes');
-            }])->where('differ','<',0)->orderByDesc('id')->whereIn('owner_id',$ownerIds);
+            }])->where('differ','<',0)->orderByDesc('id')->whereIn('inventory_compares.owner_id',$ownerIds);
         }else{
             $inventoryCompares = InventoryCompare::query()->with(['owner','commodity'=>function($query){
                 $query->with('barcodes');
-            }])->orderByDesc('id')->whereIn('owner_id',$ownerIds);
+            }])->orderByDesc('id')->whereIn('inventory_compares.owner_id',$ownerIds);
         }
         unset($param['differ']);
         $columnQueryRules=[

resources/views/inventory/stockInventory/blindReceive.blade.php

@@ -163,6 +163,7 @@
                 </div>
             </div>
         </div>
+
     </div>
 @endsection
 
@@ -198,13 +199,11 @@
                     this.status.amountDisable=false;
                     this.isManualInputtingAmount=true;
                     $('#amountLabel').text('输入数量：');
-                    // $('#amount').attr('placeholder','数字');
                 },
                 changeToScanInputAmount:function(){
                     this.status.amountDisable=true;
                     this.isManualInputtingAmount=false;
                     $('#amountLabel').text('自动扫入数量：');
-                    // $('#amount').attr('placeholder','自动');
                 },
                 changeToManualInputBarcode:function(){
                     this.status.barcodeDisable=false;
@@ -306,7 +305,6 @@
                         data.focusOutDocument();
                         window.tempTip.confirm('扫到其它条码，是否切换至新条码并记录？',doIt,function () {
                             data.inputting.barcode=data.lastScannedBarcode;
-                            // data.cleanInputs();
                             data.focusDocument();
                         })
                     }else{
@@ -520,6 +518,7 @@
                     }
                 }
             }
+
         });
     </script>
 @endsection