Merge branch 'Haozi'

# Conflicts:
#	app/Commodity.php
#	resources/views/inventory/stockInventory/inventoryMission.blade.php

app/Commodity.php

@@ -17,7 +17,7 @@ class Commodity extends Model
         $this->attributes['name']=str_replace(PHP_EOL,'',$value);
     }
     public function getNameAttribute($value){
-        return str_replace(array("\r\n","\n","\r","\""),' ',$value);
+        return 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/Http/Controllers/UserDutyCheckController.php

@@ -60,7 +60,11 @@ class UserDutyCheckController extends Controller
                 $errorMessage = $laborReportService->makeOrChangeLaborReportByUserDutyCheck($userDutyCheck, $importAndExportQRCodeType);
                 if ($errorMessage) return $errorMessage;
                 $laravelEchoPrefix = config('database.redis.options.prefix');
-                $this->log(__METHOD__, "进出场扫码__" . __FUNCTION__, json_encode($importAndExportQRCodeType,$userDetail));
+                $log=[
+                    'importAndExportQRCodeType'=>$importAndExportQRCodeType,
+                    'userDetail'=>$userDetail,
+                ];
+                $this->log(__METHOD__, "进出场扫码__" . __FUNCTION__, json_encode($log));
                 return response()->view('personnel/checking-in/importAndExportSuccess', ['full_name' => $userDetail->full_name, 'checked_at' => $userDutyCheck->checked_at, 'type' => $userDutyCheck->type, 'laravelEchoPrefix' => $laravelEchoPrefix]);
 
             }
@@ -293,7 +297,11 @@ class UserDutyCheckController extends Controller
             if ($userDutyCheck->type == '登出') return "<h1 style='color: red;text-align:center'>进场是否未打卡？如若未打，请先返回打进场卡！</h1>";
             $html=$this->updateLaborReport($user_id,$userWorkgroupID);
             if ($html)return $html;
-            $this->log(__METHOD__, "进组扫码__" . __FUNCTION__, json_encode($userWorkgroupID,$user_id));
+            $log=[
+                'userWorkgroupID'=>$userWorkgroupID,
+                'user_id'=>$user_id,
+            ];
+            $this->log(__METHOD__, "进组扫码__" . __FUNCTION__, json_encode($log));
         }else{
             return view("personnel/checking-in/enterGroupClock", compact('userWorkgroupID'));
         }

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=[

config/users.php

@@ -3,7 +3,7 @@
 return [
 
 
-    'superAdmin' => ['ldaaww','baoshi56','周亚萍','shiyao','zhouzhendong','胡浩','zengjun','阿珺',],
+    'superAdmin' => ['ldaaww','baoshi56','周亚萍','shiyao','zhouzhendong','胡浩','zengjun','阿珺','huhao'],
     'token_expire_minutes'=>7200,
     'token_check_in_expire_minutes'=>432000, //打卡过期时间，单位为秒
 ];

package-lock.json

@@ -8763,7 +8763,7 @@
         },
         "socket.io-client": {
             "version": "2.3.0",
-            "resolved": "https://registry.npm.taobao.org/socket.io-client/download/socket.io-client-2.3.0.tgz",
+            "resolved": "https://registry.npm.taobao.org/socket.io-client/download/socket.io-client-2.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsocket.io-client%2Fdownload%2Fsocket.io-client-2.3.0.tgz",
             "integrity": "sha1-FNW6LgC5vNFFrkQ6uWs/hsvMG7Q=",
             "requires": {
                 "backo2": "1.0.2",

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