库存盘点--增加盲收盘点功能,盘点任务列表按权限约束客户

人事管理--临时工报表删除，不影响临时工再登录

app/Http/Controllers/UserDutyCheckController.php

@@ -96,7 +96,7 @@ class UserDutyCheckController extends Controller
     public function importAndExportDutyCheck($user_id,$importAndExportQRCodeType)
     {
         $dateNow = Carbon::now()->format('Y-m-d');
-        $userDutyCheckOld = UserDutyCheck::where('user_id', $user_id)->where('checked_at','like',$dateNow.'%')->orderBy('id','desc')->limit(10)->first();
+        $userDutyCheckOld = UserDutyCheck::query()->with('laborReport')->where('user_id', $user_id)->where('checked_at','like',$dateNow.'%')->orderBy('id','desc')->first();
         $date = date('Y-m-d H:i:s');
         $this->log(__METHOD__, "提交打卡记录__" . __FUNCTION__, json_encode([$user_id, $date]));
         $userDutyCheck = new UserDutyCheck([
@@ -108,7 +108,7 @@ class UserDutyCheckController extends Controller
         if (!$userDutyCheckOld) {
             //当前日期的前一天
             $yesterday = Carbon::yesterday()->format('Y-m-d');
-            $userDutyCheckYesterday = UserDutyCheck::where('user_id', $user_id)->where('checked_at','like', $yesterday.'%')->orderBy('id','desc')->limit(10)->first();
+            $userDutyCheckYesterday = UserDutyCheck::query()->with('laborReport')->where('user_id', $user_id)->where('checked_at','like', $yesterday.'%')->orderBy('id','desc')->first();
             if ($importAndExportQRCodeType && $importAndExportQRCodeType == 'export') {
                 if ($userDutyCheckYesterday && $userDutyCheckYesterday->type == '登入') {
                     $userDutyCheck->verify_user_id = $userDutyCheckYesterday->verify_user_id;
@@ -118,7 +118,7 @@ class UserDutyCheckController extends Controller
                 }
             }
             if ($importAndExportQRCodeType && $importAndExportQRCodeType == 'import') {
-                if ($userDutyCheckYesterday && $userDutyCheckYesterday->type == '登入') {
+                if ($userDutyCheckYesterday && $userDutyCheckYesterday->type == '登入'&&$userDutyCheckYesterday->laborReport) {
                     $userDutyCheck->import = true;//已入场的不能再入场
                     return $userDutyCheck;
                 }
@@ -132,8 +132,9 @@ class UserDutyCheckController extends Controller
             $this->log(__METHOD__, "创建打卡记录" . __FUNCTION__, json_encode($userDutyCheck));
             return $userDutyCheck;
         }
+
         if ($importAndExportQRCodeType && $importAndExportQRCodeType == 'import') {
-            if ($userDutyCheckOld->type == '登入') {
+            if ($userDutyCheckOld->type == '登入'&&$userDutyCheckOld->laborReport) {
                 $userDutyCheck->import = true;//已入场的不能再入场
                 return $userDutyCheck;
             }

app/Services/InventoryAccountService.php

@@ -38,7 +38,8 @@ class InventoryAccountService
             ->sql();
     }
     private function conditionQuery($queryParam){
-        $inventories=InventoryAccount::query()->with(['owner','creator'])->orderBy('id','desc');
+        $ownerIds=app('ownerService')->getSelectionId();
+        $inventories=InventoryAccount::query()->with(['owner','creator'])->orderBy('id','desc')->whereIn('owner_id',$ownerIds);
         $columnQueryRules=[
             'owner_id' => ['multi' => ','],
             'date_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],

app/Services/LaborReportService.php

@@ -207,6 +207,10 @@ class LaborReportService
     }
     public function 删除($id){
         $laborReport=LaborReport::query()->where('id',$id)->delete();
+        if ($laborReport>0)LaborReportStatus::create([
+           'labor_report_id'=>$id,
+           'status'=>'已删除',
+        ]);
         Controller::logS(__METHOD__,'删除盘点记录时修改盘点任务信息'.__FUNCTION__,json_encode($id));
         return $laborReport;
     }

app/Services/OwnerService.php

@@ -17,6 +17,10 @@ Class OwnerService
     {
         return Owner::filterAuthorities()->select($column)->get();
     }
+    public function getSelectionId($column = ['id'])
+    {
+        return Owner::filterAuthorities()->select($column)->get();
+    }
     /**
      *同步WMS全部货主至WAS
      */

database/migrations/2020_09_24_152015_change_labor_report_status.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class ChangeLaborReportStatus extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        DB::statement("ALTER TABLE labor_report_statuses MODIFY COLUMN status enum ('未审核','已入场','已退场','已换组','已退组','已删除') default '未审核'");
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        DB::statement("ALTER TABLE labor_report_statuses MODIFY COLUMN status enum ('未审核','已入场','已退场','已换组','已退组') default '未审核'");
+    }
+}

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

@@ -80,12 +80,6 @@
                                 </ul>
                             </div>
                             <div class="col-6">
-                                <div >
-                                    <div >
-                                        库位：
-                                    </div>
-                                    <input type="text" class="form-control mb-2" v-model="location" @focusin="focusOutDocument"  @focusout="focusDocument" @keyup="oninputEnter">
-                                </div>
                                 <div v-if="inputMode=='regular'">
                                     <div class="btn btn-sm btn-outline-primary"
                                          v-if="!isManualInputtingBarcode" @click="changeToManualInputBarcode">手动输入</div>
@@ -93,6 +87,12 @@
                                          @click="changeToScanInputBarcode" v-if="isManualInputtingBarcode">扫描输入</div>
                                 </div>
                                 <input type="text" id="barcode" class="form-control" :disabled="status.barcodeDisable" placeholder="扫入条码" @focusin="focusOutDocument" @focusout="focusDocument" v-model="inputting.barcode">
+                                <div >
+                                    <div >
+                                        库位：
+                                    </div>
+                                    <input type="text" class="form-control mb-2" v-model="location" @focusin="focusOutDocument"  @focusout="focusDocument" @keyup="oninputEnter">
+                                </div>
                                 <div v-if="inputMode=='regular'">
                                     <div class="card-title">
                                         生产日期：

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

@@ -1228,14 +1228,7 @@
                 增加系统之外的盘点记录(location, barcode, count, inventoryId, owner_code, param) {
                     let _this = this;
                     let url = '{{url('inventory/增加系统之外的盘点记录')}}';
-                    axios.post(url, {
-                        location: location,
-                        barcode: barcode,
-                        count: count,
-                        inventoryId: inventoryId,
-                        owner_code: owner_code,
-                        param: param
-                    }).then(
+                    axios.post(url, {location:location,barcode:barcode,count:count,inventoryId:inventoryId,owner_code:owner_code,param:param}).then(
                         function (response) {
                             if (!response.data.success) {
                                 tempTip.setDuration(3000);