Merge branch 'Haozi' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Http/Controllers/PersonnelController.php

@@ -40,12 +40,12 @@ class PersonnelController extends Controller
         $checkedAtDate=Carbon::parse($checked_at)->format('Y-m-d');
         /** @var LaborReportService $laborReportService */
         $laborReportService=app(LaborReportService::class);
+        $laborReport=LaborReport::query()->with('userDutyCheck','user.userDetail')
+            ->where('user_id',$user_id)
+            ->where('created_at','like',$checkedAtDate.'%')
+            ->orderBy('id','desc')->first();
         switch ($type) {
             case '进组':
-              $laborReport=LaborReport::query()->with('userDutyCheck','user.userDetail')
-                  ->where('user_id',$user_id)
-                  ->where('created_at','like',$checkedAtDate.'%')
-                  ->orderBy('id','desc')->first();
               if ($laborReport && !$laborReport->check_in_at && !$laborReport->user_workgroup_id){ //第一次进组
                   $laborReport->update([
                       'check_in_at'=>$checked_at,
@@ -91,11 +91,12 @@ class PersonnelController extends Controller
                   app('LogService')->log(__METHOD__,"录入进组补卡".__FUNCTION__,json_encode($newReport),Auth::user()['id']);
                   return ['success'=>true,'data'=>$newReport->userDutyCheck];
               }
+              break;
             case '退组':
-                $laborReport=LaborReport::query()->with('userDutyCheck')
-                    ->where('user_id',$user_id)
-                    ->where('created_at','like',$checkedAtDate.'%')
-                    ->orderBy('id','desc')->first();
+//                $laborReport=LaborReport::query()->with('userDutyCheck')
+//                    ->where('user_id',$user_id)
+//                    ->where('created_at','like',$checkedAtDate.'%')
+//                    ->orderBy('id','desc')->first();
                 if ($laborReport && !$laborReport->check_out_at){
                     $laborReport->update([
                         'check_out_at'=>$checked_at,
@@ -118,7 +119,8 @@ class PersonnelController extends Controller
                     'verify_user_id'=>Auth::user()['id'],
                 ]);
                 $userDutyCheckBefore=UserDutyCheck::query()->where('user_id',$user_id)->where('checked_at','like',$checkedAtDate.'%')->orderBy('id','desc')->first();
-                if ($userDutyCheckBefore['type']=='登入'&&$userDutyCheck->type=='登入')return ['result'=>true,'data'=>'已存在进场记录！'];
+//                if ($userDutyCheckBefore['type']=='登入'&&$userDutyCheck->type=='登入')return ['result'=>true,'data'=>'已存在进场记录！'];
+                if ($laborReport && $userDutyCheck->type=='登入')return ['result'=>true,'data'=>'已存在进场记录！'];
                 if ($userDutyCheckBefore['type']=='登出'&&$userDutyCheck->type=='登出')return ['result'=>true,'data'=>'已存在出场记录！'];
                 $userDutyCheck->save();
                 app('LogService')->log(__METHOD__,"录入补卡".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);

app/Http/Controllers/RejectedBillItemController.php

@@ -102,6 +102,17 @@ class RejectedBillItemController extends Controller
         app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>'true','id'=>$rejectedBillItem['id']];
     }
+    public function apiReviseOwner(Request $request)
+    {
+        if(!Gate::allows('退货管理-录入')){
+            return ['success'=>'false','failure_info'=>'没有权限'];
+        }
+        $rejectedBill = RejectedBill::query()
+            ->where('id',$request->input('id_rejected_bill'))
+            ->update(['id_owner'=>$request->input('commodityOwnerId')]);
+        if ($rejectedBill) return ['success'=>'true'];
+        return ['success'=>'false','message'=>'校正货主失败!'];
+    }
 
     public function apiUpdate(Request $request)
     {
@@ -371,7 +382,6 @@ class RejectedBillItemController extends Controller
         app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($rejectedBillItem),Auth::user()['id']);
         return ['success'=>'true','id'=>$request->input('id')];
     }
-
     /**
      * Display the specified resource.
      *

app/Http/Controllers/UserController.php

@@ -39,7 +39,7 @@ class UserController extends Controller
                  $query->where('name','like',$role);
             });
         }
-        if($request->has('owner_id')){
+        if($request->input('owner_id')){
             $owner_id= $request->input('owner_id');
             $owner_ids = array_filter(preg_split('/[,， ]+/is',$owner_id));
             $ownerIds=[];

app/Services/PackageService.php

@@ -3,6 +3,7 @@
 namespace App\Services;
 
 use App\OrderPackage;
+use App\Package;
 use App\Services\common\QueryService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
@@ -37,8 +38,6 @@ class PackageService
         }
         $columnQueryRules=[
             'batch_number' => ['like' => ''],
-            'created_at_start' => ['alias' => 'created_at','startDate' => " 00:00:00"],
-            'created_at_end' => ['alias' => 'created_at','endDate' => " 23:59:59"],
             'weighed_at_start' => ['alias' => 'weighed_at', 'startDate' => ':00'],
             'weighed_at_end' => ['alias' => 'weighed_at','endDate' => ":59"],
             'id' => ['multi' => ','],

app/UserDutyCheck.php

@@ -59,6 +59,7 @@ class UserDutyCheck extends Model
             'identity_number'=>$identity_number,
             'labor_company_id'=>$labor_company_id,
             'user_duty_check_id'=>$this['id'],
+            'created_at'=>$this['checked_at'],
         ]);
         $laborReport->save();
         $laborReportStatus=new LaborReportStatus([

database/migrations/2021_04_21_172034_change_order_packages_created_at_and_weighted_at_index.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ChangeOrderPackagesCreatedAtAndWeightedAtIndex extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('order_packages', function (Blueprint $table) {
+            $table->dropIndex(['created_at']);
+            $table->index(['weighed_at']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('order_packages', function (Blueprint $table) {
+            $table->index(['created_at']);
+            $table->dropIndex(['weighed_at']);
+        });
+    }
+}

resources/views/maintenance/ownerMaterial/_create.blade.php

@@ -42,7 +42,7 @@
                                     v-model="addOwnerMaterial.material_id"
                                     :class="materialErrors.material_id?'is-invalid':''"
                                     @focus="materialErrors.material_id= null">
-                                <option v-for="(materials,i) in filterMaterials"  :value="materials.id">@{{ materials.code }}</option>
+                                <option v-for="(materials,i) in filterMaterials"  :value="materials.id">@{{ materials.name }}</option>
                             </select>
                             <input type="text" placeholder="输入耗材进行筛选" class="form-control col-m-4 offset-1" @input="filterMaterial($event,1)">
                             <div class="invalid-feedback" v-if="materialErrors.material_id">

resources/views/maintenance/ownerMaterial/index.blade.php

@@ -199,7 +199,7 @@
                 if(value==='' || value===null)this.filterMaterials = materials;
                 else {
                     this.filterMaterials = materials.filter(function(item){
-                        return item.code.indexOf(value) !== -1;
+                        return item.name.indexOf(value) !== -1;
                     });
                     if(this.filterMaterials.length>0){
                         if(type===1)this.addOwnerMaterial.material_id = this.filterMaterials[0]['id'];

resources/views/package/weigh/index.blade.php

@@ -95,14 +95,12 @@
                 $('#list').removeClass('d-none');
                 let _this = this;
                 let data = [[
-                    {name:'created_at_start',type:'dateTime',tip:'选择显示创建日期的起始时间'},
                     {name:'weighed_at_start',type:'time',tip:['选择显示称重日期的起始时间','选择显示称重日期的起始时间']},
                     {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
                         placeholder:['货主','定位或多选货主'],data:_this.owners},
                     {name:'logistic_number',type:'input',tip:'可支持多快递单号，糊模查找需要在左边打上%符号',placeholder:'快递单号'},
                     {name:'is_weighed',type:'checkbox',tip:'是否已称重', data: [{name: 'true', value: '是否已称重'}]}
                 ],[
-                    {name:'created_at_end',type:'dateTime',tip:'选择显示创建日期的结束时间'},
                     {name:'weighed_at_end',type:'time',tip:['选择显示称重日期的结束时间','选择显示称重日期的结束时间']},
                     {name:'batch_number',type:'input',tip:'波次号：可在两侧增加百分号(%)进行模糊搜索',placeholder:'波次号'}
                 ]];

resources/views/rejected/create.blade.php

@@ -689,9 +689,15 @@
                     let _this=this;
                     let url='{{url('apiLocal/rejectedBillItem/store')}}';
                     _this.itemInputting.id_rejected_bill=_this.status.editingBill.id;
-                    // if (_this.items.length<1 && _this.commodityOwnerId!==_this.billInputting.id_owner){
-                    //
-                    // }
+                    if (_this.items.length<1){
+                        let baoShiBuFaOwnerId='';
+                        _this.owners.forEach(function (owner){
+                           if (owner.name==='宝时补发') baoShiBuFaOwnerId=owner.id;
+                        });
+                        if(_this.commodityOwnerId!==_this.billInputting.id_owner && _this.billInputting.id_owner!==baoShiBuFaOwnerId){
+                            _this.isChangeOwner(_this.itemInputting.id_rejected_bill);
+                        }
+                    }
                     axios.post(url,_this.itemInputting).then(function (response) {
                         _this.cleanError();
                         if(response.data.success==='true'){
@@ -717,26 +723,32 @@
                         alert('连接错误：'+response)
                     });
                 },
-                isChangeOwner(){
-                    window.tempTip.confirm('当前退货记录货主名与录入商品的货主不匹配' + this.procurement_type[type] + ' ' + code, () => {
-                        window.axios.get("{{url('')}}/" + id)
-                            // .then(res => {
-                        //         if (res.data.success) {
-                        //             this.procurements.forEach(function (procurement) {
-                        //                 if (procurement.id === res.data.data.id) {
-                        //                     procurement.status = res.data.data.status;
-                        //                     window.tempTip.setDuration(2000);
-                        //                     window.tempTip.showSuccess("已成功取消该条采购申请");
-                        //                 }
-                        //             })
-                        //         } else {
-                        //             tempTip.setDuration(3000);
-                        //             tempTip.show(res.data.message);
-                        //         }
-                        //     }).catch(err => {
-                        //     window.tempTip.setDuration(3000);
-                        //     window.tempTip.show("网络错误：" + err);
-                        // });
+                isChangeOwner(id_rejected_bill){
+                    let _this=this;
+                    let url='{{url('apiLocal/rejectedBillItem/reviseOwner')}}';
+                    window.tempTip.confirm('当前退货记录货主名与录入商品的货主不匹配！ '+'确定校正退货记录货主名吗？', () => {
+                        window.axios.post(url,{commodityOwnerId:_this.commodityOwnerId,id_rejected_bill:id_rejected_bill}).then(res => {
+                                if (res.data.success==='true') {
+                                    let owner_name='';
+                                    _this.owners.forEach(function (owner){
+                                        if (owner.id==_this.commodityOwnerId){
+                                            owner_name=owner.name;
+                                        }
+                                    })
+                                   _this.billInputting.id_owner= _this.commodityOwnerId;
+                                    _this.rejectedBills.forEach(function (rejectedBill){
+                                            if (id_rejected_bill==rejectedBill.id)rejectedBill.owner_name=owner_name;
+                                    })
+                                } else {
+                                    tempTip.setDuration(3000);
+                                    tempTip.show(res.data.message);
+                                    return;
+                                }
+                            }).catch(err => {
+                            window.tempTip.setDuration(3000);
+                            window.tempTip.show("网络错误：" + err);
+                            return;
+                        });
                     });
                 },
                 endAndPackCommitEdit:function () {

routes/apiLocal.php

@@ -8,6 +8,7 @@ use Illuminate\Support\Facades\Route;
 */
 Route::post('rejected/recoverSelected', 'RejectedController@apiRecoverSelected');
 Route::post('rejectedBillItem/store', 'RejectedBillItemController@apiStore');
+Route::post('rejectedBillItem/reviseOwner', 'RejectedBillItemController@apiReviseOwner');
 Route::post('rejectedBillItem/update', 'RejectedBillItemController@apiUpdate');
 Route::post('rejectedBillItem/apiGet', 'RejectedBillItemController@apiGet');
 Route::post('rejectedBillItem/apiDelete', 'RejectedBillItemController@apiDelete');

syncProject.sh

@@ -16,6 +16,6 @@ expect {
 }
 expect eof"
 done
+npm run dev
 php artisan migrate
-yarn run development
 composer update