Merge branch 'master' into Haozi

app/Http/Controllers/ClientController.php

@@ -1,119 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-
-class ClientController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        return view('client.base.index');
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        return view('client.base.create');
-    }
-
-
-    public function areaCheckIndex(){
-        return view('client.areaCheck.index');
-    }
-
-
-    public function areaCheckCreate(){
-        return view('client.areaCheck.create');
-    }
-
-    public function billCheckIndex(){
-        return view('client.billCheck.index');
-    }
-
-
-    public function billCheckCreate(){
-        return view('client.billCheck.create');
-    }
-
-    public function performanceReportIndex(){
-        return view('client.performanceReport.index');
-    }
-    public function instantBillIndex(){
-        return view('client.instantBill.index');
-    }
-    public function valueAddedServiceIndex(){
-        return view('client.valueAddedService.index');
-    }
-    public function valueAddedServiceCreate(){
-        return view('client.valueAddedService.create');
-    }
-    public function relating(){
-        return view('client.relating');
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function show($id)
-    {
-        //
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit($id)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, $id)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        //
-    }
-}

app/Http/Controllers/Controller.php

@@ -17,6 +17,11 @@ class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
     static public function logS($method,$type,$description,$id_user=null){
+        if(!$id_user){
+            $id_user = '';
+            $user=auth()->user();
+            if($user) $id_user = $user['id'];
+        }
         (new Log([
             'operation'=>$method,
             'type'=>$type,

app/Http/Controllers/LaborReportController.php

@@ -24,7 +24,7 @@ class LaborReportController extends Controller
         $laborReportsTem=clone $laborReports;
         $laborReportsTem=$laborReportsTem->where($column,'like','%'.$request->input($column).'%')->where('created_at','>',$today->format('Y-m-d'));
         if($laborReportsTem->count()==0
-            ||$laborReportsTem->first()[$column]==$request->input($column)){
+            ||$laborReportsTem->get()[0][$column]==$request->input($column)){
             $laborReports=$laborReports->where($column,$request->input($column));
         }else{
             $laborReports=$laborReportsTem;
@@ -172,7 +172,7 @@ class LaborReportController extends Controller
         return Excel::download(new Export($row,$list),date('YmdHis', time()).'-临时工报表记录单.xlsx');
     }
 
-    //门卫打卡审核
+    //门卫打卡审核`
     public function guardClockAudit(Request $request){
         if(!Gate::allows('人事管理-门卫审核')){ return ["success"=>false,"data"=>"您无此权限操作！！!"];  }
         $id=$request->input('id');

app/Http/Controllers/LogisticController.php

@@ -58,11 +58,11 @@ class LogisticController extends Controller
             'code' => ['nullable', 'string', 'max:50', 'unique:logistics,code'],
         ]);
     }
-    protected function validatorUpdate(array $data)
+    protected function validatorUpdate(array $data,$id)
     {
         return Validator::make($data, [
-            'name' => ['required', 'string', 'max:50'],
-            'code' => ['nullable', 'string', 'max:50'],
+            'name' => ['required', 'string', 'max:50',"unique:logistics,name,$id"],
+            'code' => ['nullable', 'string', 'max:50',"unique:logistics,code,$id"],
         ]);
     }
     /**
@@ -98,7 +98,7 @@ class LogisticController extends Controller
     public function update(Request $request, Logistic $logistic)
     {
         if(!Gate::allows('物流公司-编辑')){ return redirect(url('/'));  }
-        $this->validatorUpdate($request->all())->validate();
+        $this->validatorUpdate($request->all(),$logistic->id)->validate();
         $logistic->fill($request->all());
         $logistic->update();
         $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);

app/Http/Controllers/PackageController.php

@@ -5,6 +5,8 @@ namespace App\Http\Controllers;
 use App\Events\WeighedEvent;
 use App\Exports\Export;
 use App\Logistic;
+use App\OracleDOCOrderHeader;
+use App\OracleDOCWaveDetails;
 use App\Owner;
 use App\Package;
 use App\PaperBox;
@@ -34,7 +36,7 @@ class PackageController extends Controller
         $packagesTem=clone $packages;
         $packagesTem=$packagesTem->where($column,'like','%'.$request->input($column).'%')->where('created_at','>',$today->format('Y-m-d'));
         if($packagesTem->count()==0
-            ||$packagesTem->first()[$column]==$request->input($column)){
+            ||$packagesTem->get()[0][$column]==$request->input($column)){
             $packages=$packages->where($column,$request->input($column));
         }else{
             $packages=$packagesTem;
@@ -110,7 +112,7 @@ class PackageController extends Controller
         $this->validator($request)->validate();
         $logistic_number=$request->input('logistic_number');
         $weight=$request->input('weight');
-        $batch_number=$request->input('batch_number');
+        $batch_number=strtoupper($request->input('batch_number'));
         $order_code=$request->input('order_code');
         $paper_box_id=$request->input('paper_box_id');
         $isSamePackBatch=$request->input('is_same_pack_batch');
@@ -122,13 +124,28 @@ class PackageController extends Controller
             $package=Package::where('logistic_number',$logistic_number)->first();
         }
         if ($order_code)$package=Package::where('order_code',$order_code)->first();
-        if (!$package && !$logistic_number)return redirect('package/create')->with('successError','录入失败！系统内没有对应波次的包裹！');
+
+        $accomplishToWMS=new Api\thirdPart\flux\PackageController();
+        $result=$accomplishToWMS->markWMSOnBatch($batch_number,$weight);
+        if ($result['result']){
+            $newValues['status']='已上传';
+            Controller::logS(__METHOD__,'SUCCESS_'.__FUNCTION__,'批量更改波次上传成功'.$batch_number);
+        }else{
+            $newValues['status']='上传异常';
+            Controller::logS(__METHOD__,'error_'.__FUNCTION__,'批量更改波次上传异常:'.$result['message'].$batch_number);
+        }
+
+        if (!$result['result']){
+            return redirect('package/create')->with('successError','录入失败！'.$result['message']);
+        }
+
+//        if (!$package && !$logistic_number)return redirect('package/create')->with('successError','录入失败！系统内没有对应波次的包裹！');
         $successTip = '操作成功';
         if ($package){
             $accomplishToWMS=new Api\thirdPart\flux\PackageController();
             if ($isSamePackBatch||($package->batch_rule&&strstr($package->batch_rule,'组合'))){
                 $this->log(__METHOD__,'活动波次开始同步_'.__FUNCTION__,json_encode($package),Auth::user()['name']);
-                $this->syncBatch($package->batch_number,$weight,null,null,null,Carbon::now(),$paper_box_id);
+                $this->syncBatch($package->batch_number,$weight,null,null,null,Carbon::now(),null);
             }else{
                 if($batch_number){
                     return redirect('package/create')->with('successError','录入失败！该波次不是组合提总！');
@@ -145,19 +162,13 @@ class PackageController extends Controller
                     $package->status="上传异常";
                 }
             }
+            $package->save();
+            $this->log(__METHOD__,'create_'.__FUNCTION__,json_encode($package),Auth::user()['name']);
+            event(new WeighedEvent($package));
         }else{
-            $package=new Package([
-                'logistic_number'=>$logistic_number,
-                'weight'=>$weight,
-                'paper_box_id'=>$paper_box_id,
-                'batch_number'=>$batch_number,
-                'order_code'=>$order_code,
-            ]);
-            $successTip = "新建称重记录成功！单号：$logistic_number";
+            $this->syncBatch($batch_number,$weight,null,null,null,Carbon::now(),null);
+            $successTip = "批量录入波次成功！波次号：$batch_number";
         }
-        $package->save();
-        $this->log(__METHOD__,'create_'.__FUNCTION__,json_encode($package),Auth::user()['name']);
-        event(new WeighedEvent($package));
         return redirect('package/create')->with('successTip', $successTip);
     }
 
@@ -351,10 +362,10 @@ class PackageController extends Controller
     }
 
     public function syncBatch($batch_number,$weight,$max,$centre,$min,$date,$paperBox_id){
-        $accomplishToWMS=new Api\thirdPart\flux\PackageController();
-        $packageBatch=Package::where('batch_number',$batch_number)->first();
-        if(!$packageBatch)return;
+//        $accomplishToWMS=new Api\thirdPart\flux\PackageController();
+//        $packageBatch=Package::where('batch_number',$batch_number)->first();
         $newValues = ['weight' => $weight];
+        $newValues['batch_number']=$batch_number;
         if($max)$newValues['length']=$max;
         if($centre)$newValues['width']=$centre;
         if($min)$newValues['height']=$min;
@@ -363,19 +374,32 @@ class PackageController extends Controller
         if($max&&$centre&&$min){
             $newValues['bulk']=$max*$centre*$min;
         }
-        $weightChanged=$packageBatch['weight']!=$weight;
-        Package::where('batch_number',$batch_number)->update($newValues);
-        $packageBatch['forceUpload']=$weightChanged;
-        Controller::logS(__METHOD__,__FUNCTION__,"批量更新时批次号传入：{$batch_number}，模型中：{$packageBatch['batch_number']}".json_encode($packageBatch));
-        $result=$accomplishToWMS->markWMSOnBatch($packageBatch['batch_number']);
-        if ($result['result']){
-            $newValues['status']='已上传';
-            Controller::logS(__METHOD__,'SUCCESS_'.__FUNCTION__,'批量更改波次上传成功'.json_encode($packageBatch));
-        }else{
-            $newValues['status']='上传异常';
-            Controller::logS(__METHOD__,'error_'.__FUNCTION__,'批量更改波次上传异常:'.$result['message'].json_encode($packageBatch));
+//        $weightChanged=$packageBatch['weight']!=$weight;
+//        Package::where('batch_number',$batch_number)->update($newValues);
+//        $packageBatch['forceUpload']=$weightChanged;
+        Controller::logS(__METHOD__,__FUNCTION__,"批量更新时批次号传入：{$batch_number}");
+//        $result=$accomplishToWMS->markWMSOnBatch($packageBatch['batch_number']);
+//        if ($result['result']){
+//            $newValues['status']='已上传';
+//            Controller::logS(__METHOD__,'SUCCESS_'.__FUNCTION__,'批量更改波次上传成功'.json_encode($packageBatch));
+//        }else{
+//            $newValues['status']='上传异常';
+//            Controller::logS(__METHOD__,'error_'.__FUNCTION__,'批量更改波次上传异常:'.$result['message'].json_encode($packageBatch));
+//        }picktotraceid
+        $packagesInOracle=OracleDOCWaveDetails::where('doc_wave_details.waveno',$batch_number)
+            ->leftJoin('act_allocation_details','act_allocation_details.orderno','doc_wave_details.orderno')
+            ->get();
+        foreach ($packagesInOracle as $packageInOracle) {
+            $newValues['logistic_number']=$packageInOracle['picktotraceid'];
+            $package = Package::where('logistic_number', $packageInOracle['picktotraceid'])->first();
+            if(!$package){
+                Package::create($newValues);
+            }else{
+                $package->fill($newValues);
+                $package->update();
+            }
         }
-        Package::where('batch_number',$batch_number)->update($newValues);
+//        Package::where('batch_number',$batch_number)->update($newValues);
 
     }
 

app/Http/Controllers/PriceModelExpressageController.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-
-class PriceModelExpressageController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        return view('maintenance.priceModel.expressage.index');
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function show($id)
-    {
-        //
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit($id)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, $id)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        //
-    }
-}

app/Http/Controllers/PriceModelLogisticController.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-
-class PriceModelLogisticController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        return view('maintenance.priceModel.logistic.index');
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function show($id)
-    {
-        //
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit($id)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, $id)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        //
-    }
-}

app/Http/Controllers/PriceModelNonstopController.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-
-class PriceModelNonstopController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        return view('maintenance.priceModel.nonstop.index');
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function show($id)
-    {
-        //
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit($id)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, $id)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        //
-    }
-}

app/Http/Controllers/PriceModelStorageController.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-
-class PriceModelStorageController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        return view('maintenance.priceModel.storage.index');
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function show($id)
-    {
-        //
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit($id)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, $id)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        //
-    }
-}

app/Http/Controllers/PriceModelTaskController.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-
-class PriceModelTaskController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        return view('maintenance.priceModel.task.index');
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function show($id)
-    {
-        //
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit($id)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, $id)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        //
-    }
-}

app/Http/Controllers/ProcessController.php

@@ -154,7 +154,7 @@ class ProcessController extends Controller
     }
 
     //计算单参与人工时信息
-    protected function countParticipantManHour($processDailyParticipant,$date){
+    public function countParticipantManHour($processDailyParticipant,$date){
         $user=$processDailyParticipant->user_id;
         $userDutyCheckStart=UserDutyCheck::select('id','checked_at')->where('user_id',$user)
             ->where('checked_at','like',$date.'%')->where('type','登入')->orderBy('id')->first();
@@ -854,6 +854,43 @@ class ProcessController extends Controller
         return ['success'=>Process::destroy($id)];
     }
 
+    //修改二次加工单每日单的起始日期
+    public function updateStartDate(Request $request){
+        $start_date=$request->start_date;
+        $process_id=$request->process_id;
+        if (!$start_date || !$process_id)return ['success'=>false,'data'=>'起始日期为空或单据已不存在！'];
+        $processDailiesId=[];
+        $processDailies=ProcessDaily::where('process_id',$process_id)->get();
+        $is_process_daily=false;
+        foreach ($processDailies as $processDaily){
+            if ($processDaily->date == $start_date){
+                $is_process_daily=true;
+            }
+            if (Carbon::parse($processDaily->date)->lt(Carbon::parse($start_date))){
+                array_push($processDailiesId,$processDaily->id);
+                unset($processDaily);
+            }
+        }
+        ProcessDaily::destroy($processDailiesId);
+        ProcessDailyParticipant::whereIn('process_daily_id',$processDailiesId)->delete();
+        $process=Process::find($process_id);
+        if (!$is_process_daily && $process){
+            $ProcessDailyNow=ProcessDaily::create([
+                'process_id'=>$process_id,
+                'date'=>$start_date,
+                'output'=>0,
+                'remain'=>$process->amount,
+            ]);
+            $processDailies->push($ProcessDailyNow);
+        }
+        $today=Carbon::now()->format('Y-m-d');
+        $this->createDeficiencyData($processDailies,$today);
+        $processDailies=ProcessDaily::with('processDailyParticipants')->where('process_id',$process_id)
+            ->orderBy('date','DESC')->get();
+        $this->log(__METHOD__,"修改二次加工单加工日记录_".__FUNCTION__,json_encode($request),Auth::user()['id']);
+        return ['success'=>true,'data'=>$processDailies];
+    }
+
     //执行
     public function export($processes){
         if(!Gate::allows('二次加工管理-查询')){ return '没有权限';  }

app/Http/Controllers/RejectedBillItemController.php

@@ -5,7 +5,6 @@ namespace App\Http\Controllers;
 use App\Commodity;
 use App\Events\InformWMSReceivedEvent;
 use App\Owner;
-use App\Rejected;
 use App\RejectedBill;
 use App\RejectedBillItem;
 use App\WMSReflectReceive;
@@ -119,6 +118,9 @@ class RejectedBillItemController extends Controller
                 $owner = Owner::find($rejectedBill['id_owner']);
                 if(strstr($owner->name??'','笕尚')){
                     $this->log(__METHOD__,'找不到表','121行');
+//                    $rejected=new Rejected();
+//                    $rejected->fill($rejectedBill->toArray());
+//                    $rejected->fill($rejectedBillItem->toArray());
                     $rejected=new Rejected();
                     $rejected->fill($rejectedBill->toArray());
                     $rejected->fill($rejectedBillItem->toArray());
@@ -198,10 +200,12 @@ class RejectedBillItemController extends Controller
         $havingFail=0;
         if(!config('api.API_FAKING')){
             $items->each(function(RejectedBillItem $rejectedBillItem)use(&$havingFail,$rejectedBill){
-                $rejected=new Rejected();
-                $this->log(__METHOD__,'找不到表','200行');
-                $rejected->fill($rejectedBill->toArray());
-                $rejected->fill($rejectedBillItem->toArray());
+//                $rejected=new Rejected();
+//                $this->log(__METHOD__,'找不到表','200行');
+//                $rejected->fill($rejectedBill->toArray());
+//                $rejected->fill($rejectedBillItem->toArray());
+                $rejected=$rejectedBill->toArray();
+                $rejected = array_merge($rejected, $rejectedBillItem->toArray());
                 $rejectedJianshang=new api\thirdPart\jianshang\RejectedController();
                 $sended=$rejectedJianshang->sendRejected($rejected);
                 if(!$sended){
@@ -232,8 +236,9 @@ class RejectedBillItemController extends Controller
             if(config('api.jianshang_rejecteds_log_switch'))Controller::logS(__METHOD__,__FUNCTION__,"进入发送方法，但退单已入库，跳出！退单号：{$rejectedBill['logistic_number_return']}",Auth::user()['id']);
             return true;
         }
-        $rejected=new Rejected();
-        $rejected->fill($rejectedBill->toArray());
+//        $rejected=new Rejected();
+        $rejected=$rejectedBill->toArray();
+//        $rejected->fill($rejectedBill->toArray());
         $goodses=[];
         $items->each(function(RejectedBillItem $item)use(&$goodses){
             $goodses[]=$item->toArray();

app/Http/Controllers/RejectedController.php

@@ -119,7 +119,7 @@ class RejectedController extends Controller
         $logistic_number_return = $params['logistic_number_return'];
         $logistic_number = $params['logistic_number'];
         $id_logistic_return= $params['id_logistic_return'];
-        $rejectedBillsQuery=RejectedBill::with(['owner','logistic','items',]);
+        $rejectedBillsQuery=RejectedBill::with(['owner','logistic','items']);
         if($created_at_start&&!$created_at_end){
             $created_at_end = $created_at_start;
         }
@@ -184,7 +184,7 @@ class RejectedController extends Controller
             $rejectedBillsQueryTem=$rejectedBillsQueryTem->where('created_at','>',$startDay->format('Y-m-d'));
             $rejectedBillsQueryTem=$rejectedBillsQueryTem->where('order_number','like','%'.$order_number.'%');
             if($rejectedBillsQueryTem->count()==0
-                ||$rejectedBillsQueryTem->first()['order_number']==$order_number){
+                ||$rejectedBillsQueryTem->get()[0]['order_number']==$order_number){
                 $rejectedBillsQuery=$rejectedBillsQuery->where('order_number',$order_number);
             }else{
                 $rejectedBillsQuery=$rejectedBillsQueryTem;
@@ -200,7 +200,7 @@ class RejectedController extends Controller
                 $rejectedBillsQueryTem=$rejectedBillsQueryTem->where('created_at','>',$startDay->format('Y-m-d'));
                 $rejectedBillsQueryTem=$rejectedBillsQueryTem->where('logistic_number_return','like','%'.$logistic_number_return.'%');
                 if($rejectedBillsQueryTem->count()==0
-                    ||$rejectedBillsQueryTem->first()['logistic_number_return']==$logistic_number_return){
+                    ||$rejectedBillsQueryTem->get()[0]['logistic_number_return']==$logistic_number_return){
                     $rejectedBillsQuery=$rejectedBillsQuery->where('logistic_number_return',$logistic_number_return);
                 }else{
                     $rejectedBillsQuery=$rejectedBillsQueryTem;
@@ -212,8 +212,9 @@ class RejectedController extends Controller
             $rejectedBillsQueryTem=clone $rejectedBillsQuery;
             $rejectedBillsQueryTem=$rejectedBillsQueryTem->where('created_at','>',$startDay->format('Y-m-d'));
             $rejectedBillsQueryTem=$rejectedBillsQueryTem->where('logistic_number','like','%'.$logistic_number.'%');
+
             if($rejectedBillsQueryTem->count()==0
-                ||$rejectedBillsQueryTem->first()['logistic_number']==$logistic_number){
+                ||$rejectedBillsQueryTem->get()[0]['logistic_number']==$logistic_number){
                 $rejectedBillsQuery=$rejectedBillsQuery->where('logistic_number',$logistic_number);
             }else{
                 $rejectedBillsQuery=$rejectedBillsQueryTem;
@@ -222,6 +223,7 @@ class RejectedController extends Controller
         if ($id_logistic_return){
             $rejectedBillsQuery=$rejectedBillsQuery->where('id_logistic_return',$id_logistic_return);
         }
+
         return $rejectedBillsQuery;
     }
 

app/Http/Controllers/TestController.php

@@ -11,10 +11,13 @@ use App\Events\WmsReceiveNewEvent;
 use App\Http\Controllers\Api\thirdPart\flux\WaybillController;
 use App\Logistic;
 use App\OracleDOCOrderHeader;
+use App\OracleDocOrderPackingSummary;
 use App\OracleDOCWaveDetails;
 use App\OracleDOCWaveHeader;
+use App\OracleIdxAsrsReceive;
 use App\Order;
 use App\Package;
+use App\ProcessStatistic;
 use App\Rejected;
 use App\RejectedBill;
 use App\RejectedBillItem;
@@ -108,13 +111,13 @@ class TestController extends Controller
 
     function tFixWithoutWaveno(Request $request)
     {
-        $re=OracleDOCWaveDetails::select(['doc_wave_details.waveno','doc_wave_details.orderno'])->where('doc_order_header.WAVENO','*')
-            ->leftJoin('DOC_ORDER_HEADER','DOC_ORDER_HEADER.orderno','doc_wave_details.orderno')->get();
-        dd($re);
-        $re->each(function($waveDetail){
-            $o=OracleDOCOrderHeader::where('orderno',$waveDetail['orderno'])->update(['waveno'=>$waveDetail['waveno']]);
-        });
-//        $orderHeader=OracleDOCOrderHeader::where('waveno',)
+//        $re=OracleDOCWaveDetails::select(['doc_wave_details.waveno','doc_wave_details.orderno'])->where('doc_order_header.WAVENO','*')
+//            ->leftJoin('DOC_ORDER_HEADER','DOC_ORDER_HEADER.orderno','doc_wave_details.orderno')->get();
+//        dd($re);
+//        $re->each(function($waveDetail){
+//            $o=OracleDOCOrderHeader::where('orderno',$waveDetail['orderno'])->update(['waveno'=>$waveDetail['waveno']]);
+//        });
+////        $orderHeader=OracleDOCOrderHeader::where('waveno',)
     }
     function t1(Request $request)
     {
@@ -126,22 +129,19 @@ class TestController extends Controller
             $conn=oci_connect($username,$password,$host.'/'.$service_name); //连接oracle数据库
             $IN_WarehouseID='';
             $IN_TraceID='' ;
-            $IN_Process_By_C='By OrderNO';
             $IN_WavenNo='';
-            $IN_OrderNO_C=$orderno;
-            $IN_Language='';
             $IN_UserID='';
             $IN_Language='';
             $OUT_Return_Code='';
             $sql_sp="begin SPCUS_EDI_WCS001(:IN_WarehouseID,:IN_Process_Action_C,:IN_Process_By_C,
         :IN_WaveNO_C,:IN_OrderNO_C,:IN_OrderLineNO_C,:IN_AllocationDetailsID,:IN_Language,:IN_UserID,:OUT_Return_Code); end;";
             $stmt = oci_parse($conn, $sql_sp);
-            oci_bind_by_name($stmt,':IN_Warehouse',$IN_Process_Action_C);
-            oci_bind_by_name($stmt,':IN_TraceID',$IN_Warehouse);
-            oci_bind_by_name($stmt,':IN_WavenNo',$IN_WaveNO_C);
-            oci_bind_by_name($stmt,':IN_Language',$IN_OrderNO_C);
-            oci_bind_by_name($stmt,':IN_UserID',$IN_OrderLineNO_C);
-            oci_bind_by_name($stmt,':OUT_Return_Code',$IN_AllocationDetailsID);
+            oci_bind_by_name($stmt,':IN_Warehouse',$IN_WarehouseID);
+            oci_bind_by_name($stmt,':IN_TraceID',$IN_TraceID);
+            oci_bind_by_name($stmt,':IN_WavenNo',$IN_WavenNo);
+            oci_bind_by_name($stmt,':IN_Language',$IN_Language);
+            oci_bind_by_name($stmt,':IN_UserID',$IN_UserID);
+            oci_bind_by_name($stmt,':OUT_Return_Code',$OUT_Return_Code);
             return oci_execute($stmt);
 
         }
@@ -150,14 +150,10 @@ class TestController extends Controller
     }
 
 
-    function tj(Request $request)
+    function packageT(Request $request)
     {
-        $waybills = Waybill::where('created_at', 'like', '%2020-05-25%')->orWhere('created_at', 'like', '%2020-05-30%')->get();
-        $controller = (new WaybillController());
-        $waybills->each(function ($waybill) use ($controller) {
-            $controller->accomplishToWMS($waybill);
-        });
-        dd($waybills->count());
+        $package=Package::where('created_at','<','2020-07-08')->whereNotNull('logistic_number')->first();
+        $package->fetchLogistic();
     }
 
     function injectJS(Request $request)
@@ -170,11 +166,34 @@ class TestController extends Controller
 
     public function tj2(Request $request)
     {
-        $rejected = Rejected::find(10);
-        $rejectedJianshang = new \App\Http\Controllers\api\jianshang\RejectedController();
-        dd($rejectedJianshang->sendRejected($rejected));
+        $numbersesOfBatch=OracleDOCWaveDetails::select('picktotraceid as logistic_number','act_allocation_details.orderno')->where('doc_wave_details.waveno','W190630000042')
+            ->leftJoin('act_allocation_details','doc_wave_details.orderno','act_allocation_details.orderno')->get();
+
+        $oneIdxAsrsReceive=OracleDocOrderPackingSummary::where('traceid',$numbersesOfBatch[0]['logistic_number'])->first();
+        if(!$oneIdxAsrsReceive){
+            $inserts='';
+            $values=[];
+            foreach($numbersesOfBatch as $numbers){
+                $inserts .= " into doc_order_packing_summary (traceid,orderno,grossweight,addwho,addtime,editwho,edittime)values(?,?,?,?,?,?,?) ";
+                $values[] = $numbers['logistic_number']??'';
+                $values[] = $numbers['orderno']??'';
+                $values[] = 12;
+                $values[] = 'WAS';
+                $values[] = Carbon::now();
+                $values[] = 'WAS';
+                $values[] = Carbon::now();
+            }
+            DB::connection('oracle')->insert("insert all {$inserts} select * from dual",$values);
+        }else{
+            $logisticNumbers=$numbersesOfBatch->map(function($numbers){return $numbers['logistic_number'];});
+            OracleDocOrderPackingSummary::whereIn('traceid',$logisticNumbers)->update(['grossweight'=>32]);
+        }
     }
 
+    public function delme()
+    {
+        dd(DB::connection('oracle')->insert("insert into delme_log (id,name)values(?,?)",[32,'xx']));
+    }
     public function excelIt()
     {
         $excel = new ExcelController();
@@ -248,32 +267,6 @@ class TestController extends Controller
     /*1*/
     function test()
     {/**/
-        $data=[];
-        $data['destination_city_id']=1;
-        $data['destination']="陕西省零鲁区鲱鱼大街404号260";
-        $waybill=Waybill::find(1);
-        if ($data['destination_city_id'] && $waybill->destination_city_id != $data['destination_city_id']){
-            $city=City::find($data['destination_city_id']);
-            if ($city && (mb_strpos($data['destination'],$city->name)===false || mb_strpos($data['destination'],$city->province_name)===false)){
-                if (mb_strpos($data['destination'],$city->name)===false && mb_strpos($data['destination'],$city->province_name)===false){
-                    $data['destination']=$city->province_name.$city->name.$data['destination'];
-                    goto sign;
-                }
-                if (mb_strpos($data['destination'],$city->province_name)===false){
-                    $data['destination']=$city->province_name.$data['destination'];
-                }
-                if (mb_strpos($data['destination'],$city->name)===false){var_dump(3);
-                    $province_name=$city->province_name;
-                    $start_index=mb_strpos($data['destination'],$city->province_name.'省');
-                    if ($start_index===false)$start_index=mb_strpos($data['destination'],$city->province_name);
-                    else $province_name=$province_name.'省';
-                    $strBefore=mb_substr($data['destination'],$start_index,mb_strlen($province_name));
-                    $strAfter=mb_substr($data['destination'],$start_index+mb_strlen($province_name));
-                    $data['destination']=$strBefore.$city->name.$strAfter;
-                }
-            }
-        }
-        sign:
     }
 
 }

app/Http/Controllers/WaybillsController.php

@@ -35,7 +35,7 @@ class WaybillsController extends Controller
         $waybillsTem=clone $waybills;
         $waybillsTem=$waybillsTem->where($column,'like','%'.$request->input($column).'%')->where('waybills.created_at','>',$today->format('Y-m-d'));
         if($waybillsTem->count()==0
-            ||$waybillsTem->first()[$column]==$request->input($column)){
+            ||$waybillsTem->get()[0][$column]==$request->input($column)){
             $waybills=$waybills->where($column,$request->input($column));
         }else{
             $waybills=$waybillsTem;
@@ -211,9 +211,11 @@ class WaybillsController extends Controller
             unset($waybill['carrier_weight_unit_id_other']);
         }
         $this->validatorWaybillDispatch($request,$id)->validate();
-
         $data=$request->input();
-        //dd($data);
+        //替换换行符
+        if ($data['dispatch_remark']){
+            $data['dispatch_remark']=str_replace(PHP_EOL,' ',$data['dispatch_remark']);
+        }
         if (!isset($data['destination']))$data['destination']=$waybill->destination;
         if (isset($data['destination_city_id']) && $waybill->destination_city_id != $data['destination_city_id']){
             $city=City::find($data['destination_city_id']);
@@ -898,6 +900,8 @@ class WaybillsController extends Controller
                 'mileage'=>'nullable|numeric|min:0',
                 'amount'=>'nullable|numeric|min:0',
                 'amount_unit_id'=>'required',
+                'warehouse_weight_other'=>'nullable|min:0|numeric|max:999999',
+                'warehouse_weight_unit_id_other'=>'required_with:warehouse_weight_other|nullable|integer',
             ],[
                 'required'=>':attribute 为必填项',
                 'alpha_num'=>':attribute 应为字母或数字',

app/Http/Controllers/api/thirdPart/flux/PackageController.php

@@ -7,12 +7,16 @@ use App\Jobs\MarkPackageExcepted;
 use App\Logistic;
 use App\OracleDOCOrderDetail;
 use App\OracleDOCOrderHeader;
+use App\OracleDocOrderPackingSummary;
+use App\OracleDOCWaveDetails;
 use App\OracleDOCWaveHeader;
+use App\OracleIdxAsrsReceive;
 use App\Owner;
 use App\Package;
 use App\WMSReflectPackage;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 use Zttp\Zttp;
 
@@ -21,122 +25,121 @@ class PackageController extends Controller
 
     public function new_(Request $request)
     {
-        $requestInputs=$request->all();
-        $this->log(__METHOD__,'request_'.__FUNCTION__,json_encode($requestInputs),null);
-        $errors=$this->validatorForNew($requestInputs)->errors();
-        if(count($errors)>0){
-            $this->log(__METHOD__,'error2_'.__FUNCTION__,json_encode($requestInputs).'||'.json_encode($errors),null);
-            return ['response'=>['flag'=>'W','message'=>'fields wrong, see Errors report please.',
-                'errors'=>$errors]];
-        }
-        $receiveInputs=$requestInputs['request'];
-        $package=Package::where('logistic_number',$receiveInputs['SOReference5'])->first();
-        if (!$receiveInputs['Customer']) {
-            $this->log(__METHOD__, __FUNCTION__, '富勒没有下发货主！快递单号：'.$receiveInputs['SOReference5'] , null);
-        }
-        $owner=Owner::select('id')->where('code',$receiveInputs['Customer'])->first();
-        if (!$owner&&$receiveInputs['SOReference5']) {
-            Owner::create(['code'=>$receiveInputs['Customer'],'name'=>$receiveInputs['Customer']]);
-            $this->log(__METHOD__, __FUNCTION__, '富勒下发找不到货主，添加. 快递单号：'.$receiveInputs['SOReference5'] , null);
-        }
-        if (!$receiveInputs['CarrierID']) {
-            $this->log(__METHOD__, __FUNCTION__, '富勒没有下发快递公司！快递单号：'.$receiveInputs['SOReference5'] , null);
-        }
-        $logistic=Logistic::select('id')->where('code',$receiveInputs['CarrierID'])->first();
-        if (!$logistic&&$receiveInputs['CarrierID']) {
-            Logistic::create(['code'=>$receiveInputs['CarrierID'],'name'=>$receiveInputs['CarrierID']]);
-            $this->log(__METHOD__, __FUNCTION__, '富勒下发找不到承运商，添加. 快递单号：' .$receiveInputs['SOReference5'] , null);
-        }
-        if ($package) {
-            $package->delivery_number = $receiveInputs['palletid'];
-            if ($owner) {
-                $package->owner_id = $owner->id;
-                $packagePaperBox = new Package();
-                $paperBox_id = $packagePaperBox->checkPaperBox($package->length, $package->width, $package->height, $owner->id);
-                if ($paperBox_id) $package->paperBox_id = $paperBox_id;
-            } else {
-                $package->status = '记录异常';
-            }
-            $package->recipient = $receiveInputs['Consigneename'];
-            if ($logistic) $package->logistic_id = $logistic->id;
-            $package->batch_number = $receiveInputs['USERDEFINE1'];
-            $package->batch_rule = $receiveInputs['USERDEFINE2'];
-            $package->save();
-            $result = $this->accomplishToWMS($package);
-            if ($result['result'] == 'success') {
-                if ($package->status == "记录异常") $package->status = "已上传异常";
-                else $package->status = "已上传";
-            } else {
-                $package->status = "上传异常";
-            }
-            $package->save();
-            $this->log(__METHOD__, 'fluxPackageApi' . __FUNCTION__, json_encode($request->all()), null);
-            return response()->json(['response' => ['flag' => 'Y', 'code' => '0000', 'message' => '正确接收']])
-                ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
-        }
-        //package不存在
-        $receive = new WMSReflectPackage($receiveInputs);
-        try{
-            $receive->save();
-        }catch (\Exception $exception){
-            Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'WMS下发请求保存异常：'.$exception->getMessage(),null);
-            return ['response'=>['flag'=>'W','message'=>'already send, order number unique violation.',
-                'errors'=>$exception->getMessage()]];
-        }
-        if (isset($owner->id)&&isset($logistic->id)){
-            $createPackage = new Package([
-                'logistic_number'=>$receiveInputs['SOReference5'],
-                'delivery_number'=>$receiveInputs['palletid'],
-                'recipient'=>$receiveInputs['Consigneename'],
-                'owner_id'=>$owner->id,
-                'logistic_id'=>$logistic->id,
-                'batch_number'=>$receiveInputs['USERDEFINE1'],
-                'batch_rule'=>$receiveInputs['USERDEFINE2'],
-                'status'=>'未测量'
-            ]);
-        }else{
-            $this->log(__METHOD__,'fluxPackageApi(no owner or carrier)'.__FUNCTION__,json_encode($request->all()),null);
-            $createPackage = new Package([
-                'logistic_number'=>$receiveInputs['SOReference5'],
-                'delivery_number'=>$receiveInputs['palletid'],
-                'recipient'=>$receiveInputs['Consigneename'],
-                'batch_number'=>$receiveInputs['USERDEFINE1'],
-                'batch_rule'=>$receiveInputs['USERDEFINE2'],
-                'status'=>'记录异常'
-            ]);
-        }
-        $createPackage->order_code=$receiveInputs['Orderno'];
-        $createPackage->save();
-        //活动波次同步  组合提总
-        if ($receiveInputs['USERDEFINE2']&&strstr($receiveInputs['USERDEFINE2'],'组合')) {
-            $packageBatch = Package::whereRaw('batch_number = ? AND weight IS NOT NULL', [$receiveInputs['USERDEFINE1']])->first();
-            if ($receiveInputs['USERDEFINE1'] && $packageBatch) {
-                $createPackage->measuring_machine_id = $packageBatch->measuring_machine_id;
-                $createPackage->weight = $packageBatch->weight;
-                $createPackage->length = $packageBatch->length;
-                $createPackage->width = $packageBatch->width;
-                $createPackage->height = $packageBatch->height;
-                $createPackage->bulk = $packageBatch->bulk;
-                $createPackage->paper_box_id = $packageBatch->paper_box_id;
-                $createPackage->save();
-                $result = $this->accomplishToWMS($createPackage);
-                if ($result['result'] == 'success') {
-                    if ($createPackage->status == "记录异常") $createPackage->status = "已上传异常";
-                    else $createPackage->status = "已上传";
-                } else {
-                    $createPackage->status = "上传异常";
-                }
-            }
-            if (!$receiveInputs['USERDEFINE1'] || !$packageBatch) {
-                MarkPackageExcepted::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
-            }
-            $createPackage->save();
-            $this->log(__METHOD__, 'success_' . __FUNCTION__, json_encode($request->all()), null);
-            return response()->json(['response' => ['flag' => 'Y', 'code' => '0000', 'message' => '正确接收']])
-                ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
-        }
-        MarkPackageExcepted::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
-        $this->log(__METHOD__,'success_'.__FUNCTION__,json_encode($request->all()),null);
+//        $requestInputs=$request->all();
+//        $this->log(__METHOD__,'request_'.__FUNCTION__,json_encode($requestInputs),null);
+//        $errors=$this->validatorForNew($requestInputs)->errors();
+//        if(count($errors)>0){
+//            $this->log(__METHOD__,'error2_'.__FUNCTION__,json_encode($requestInputs).'||'.json_encode($errors),null);
+//            return ['response'=>['flag'=>'W','message'=>'fields wrong, see Errors report please.',
+//                'errors'=>$errors]];
+//        }
+//        $receiveInputs=$requestInputs['request'];
+//        $package=Package::where('logistic_number',$receiveInputs['SOReference5'])->first();
+//        if (!$receiveInputs['Customer']) {
+//            $this->log(__METHOD__, __FUNCTION__, '富勒没有下发货主！快递单号：'.$receiveInputs['SOReference5'] , null);
+//        }
+//        $owner=Owner::select('id')->where('code',$receiveInputs['Customer'])->first();
+//        if (!$owner&&$receiveInputs['SOReference5']) {
+//            Owner::create(['code'=>$receiveInputs['Customer'],'name'=>$receiveInputs['Customer']]);
+//            $this->log(__METHOD__, __FUNCTION__, '富勒下发找不到货主，添加. 快递单号：'.$receiveInputs['SOReference5'] , null);
+//        }
+//        if (!$receiveInputs['CarrierID']) {
+//            $this->log(__METHOD__, __FUNCTION__, '富勒没有下发快递公司！快递单号：'.$receiveInputs['SOReference5'] , null);
+//        }
+//        $logistic=Logistic::select('id')->where('code',$receiveInputs['CarrierID'])->first();
+//        if (!$logistic&&$receiveInputs['CarrierID']) {
+//            Logistic::create(['code'=>$receiveInputs['CarrierID'],'name'=>$receiveInputs['CarrierID']]);
+//            $this->log(__METHOD__, __FUNCTION__, '富勒下发找不到承运商，添加. 快递单号：' .$receiveInputs['SOReference5'] , null);
+//        }
+//        if ($package) {
+//            $package->delivery_number = $receiveInputs['palletid'];
+//            if ($owner) {
+//                $package->owner_id = $owner->id;
+//                $packagePaperBox = new Package();
+//                $packagePaperBox->fetchPaperBox($package->length, $package->width, $package->height);
+//            } else {
+//                $package->status = '记录异常';
+//            }
+//            $package->recipient = $receiveInputs['Consigneename'];
+//            if ($logistic) $package->logistic_id = $logistic->id;
+//            $package->batch_number = $receiveInputs['USERDEFINE1'];
+//            $package->batch_rule = $receiveInputs['USERDEFINE2'];
+//            $package->save();
+//            $result = $this->accomplishToWMS($package);
+//            if ($result['result'] == 'success') {
+//                if ($package->status == "记录异常") $package->status = "已上传异常";
+//                else $package->status = "已上传";
+//            } else {
+//                $package->status = "上传异常";
+//            }
+//            $package->save();
+//            $this->log(__METHOD__, 'fluxPackageApi' . __FUNCTION__, json_encode($request->all()), null);
+//            return response()->json(['response' => ['flag' => 'Y', 'code' => '0000', 'message' => '正确接收']])
+//                ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+//        }
+//        //package不存在
+//        $receive = new WMSReflectPackage($receiveInputs);
+//        try{
+//            $receive->save();
+//        }catch (\Exception $exception){
+//            Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'WMS下发请求保存异常：'.$exception->getMessage(),null);
+//            return ['response'=>['flag'=>'W','message'=>'already send, order number unique violation.',
+//                'errors'=>$exception->getMessage()]];
+//        }
+//        if (isset($owner->id)&&isset($logistic->id)){
+//            $createPackage = new Package([
+//                'logistic_number'=>$receiveInputs['SOReference5'],
+//                'delivery_number'=>$receiveInputs['palletid'],
+//                'recipient'=>$receiveInputs['Consigneename'],
+//                'owner_id'=>$owner->id,
+//                'logistic_id'=>$logistic->id,
+//                'batch_number'=>$receiveInputs['USERDEFINE1'],
+//                'batch_rule'=>$receiveInputs['USERDEFINE2'],
+//                'status'=>'未测量'
+//            ]);
+//        }else{
+//            $this->log(__METHOD__,'fluxPackageApi(no owner or carrier)'.__FUNCTION__,json_encode($request->all()),null);
+//            $createPackage = new Package([
+//                'logistic_number'=>$receiveInputs['SOReference5'],
+//                'delivery_number'=>$receiveInputs['palletid'],
+//                'recipient'=>$receiveInputs['Consigneename'],
+//                'batch_number'=>$receiveInputs['USERDEFINE1'],
+//                'batch_rule'=>$receiveInputs['USERDEFINE2'],
+//                'status'=>'记录异常'
+//            ]);
+//        }
+//        $createPackage->order_code=$receiveInputs['Orderno'];
+//        $createPackage->save();
+//        //活动波次同步  组合提总
+//        if ($receiveInputs['USERDEFINE2']&&strstr($receiveInputs['USERDEFINE2'],'组合')) {
+//            $packageBatch = Package::whereRaw('batch_number = ? AND weight IS NOT NULL', [$receiveInputs['USERDEFINE1']])->first();
+//            if ($receiveInputs['USERDEFINE1'] && $packageBatch) {
+//                $createPackage->measuring_machine_id = $packageBatch->measuring_machine_id;
+//                $createPackage->weight = $packageBatch->weight;
+//                $createPackage->length = $packageBatch->length;
+//                $createPackage->width = $packageBatch->width;
+//                $createPackage->height = $packageBatch->height;
+//                $createPackage->bulk = $packageBatch->bulk;
+//                $createPackage->paper_box_id = $packageBatch->paper_box_id;
+//                $createPackage->save();
+//                $result = $this->accomplishToWMS($createPackage);
+//                if ($result['result'] == 'success') {
+//                    if ($createPackage->status == "记录异常") $createPackage->status = "已上传异常";
+//                    else $createPackage->status = "已上传";
+//                } else {
+//                    $createPackage->status = "上传异常";
+//                }
+//            }
+//            if (!$receiveInputs['USERDEFINE1'] || !$packageBatch) {
+//                MarkPackageExcepted::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
+//            }
+//            $createPackage->save();
+//            $this->log(__METHOD__, 'success_' . __FUNCTION__, json_encode($request->all()), null);
+//            return response()->json(['response' => ['flag' => 'Y', 'code' => '0000', 'message' => '正确接收']])
+//                ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+//        }
+//        MarkPackageExcepted::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
+//        $this->log(__METHOD__,'success_'.__FUNCTION__,json_encode($request->all()),null);
         return response()->json(['response'=>['flag'=>'Y','code'=>'0000','message'=>'正确接收']])
             ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
     }
@@ -167,47 +170,91 @@ class PackageController extends Controller
             'request.USERDEFINE3' => 'userdefine3',
         ]);
     }
-    /**
-     * 完成的包裹称量发送给WMS
-     */
+//    /**
+//     * 完成的包裹称量发送给WMS
+//     */
+//    public function accomplishToWMS(Package $package)
+//    {
+//        try{
+////            OracleDOCOrderDetail::where('SOREFERENCE5',$package->logistic_number)->update(['grossweight'=>'Y']);
+////            return ['result'=>$success];
+////            return ['result'=>true];
+//            //对WMS接口请求不需要了，直接写其数据库
+//            $json=["request"=>['TASKID'=>$package->WMSReflectPackage_name,
+//                'SOReference5'=>$package->logistic_number,
+//                'Weigh'=>$package->weight,
+//                'Addwho'=>'',
+//                'Addtime'=>Carbon::now(),
+//                'Package'=>$package->paperBox_name,
+//                'USERDEFINE1'=>$package->batch_number,
+//                'USERDEFINE2'=>$package->batch_rule,
+//                'USERDEFINE3'=>'OK',
+//            ]];
+//            $json=json_encode($json);
+//            $url=url(config('api.flux.package.new'));
+//            $response = Zttp::post($url, json_decode($json));
+//            $this->log(__METHOD__,'Sign'.__FUNCTION__,json_encode($response->json()),null);
+//            $response=$response->json();
+//            $noIssues=true;
+//            if(!$response||!isset($response['response'])||!$response['response']['flag']=='Y'){
+//                $noIssues=false;
+//            }
+//            if($noIssues&&$response['response']['flag']=='Y'){
+//                $this->log(__METHOD__,'SUCCESS_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
+//                return ['result'=>'success'];
+//            }
+//            $this->log(__METHOD__,'ERROR_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
+//            return ['result'=>'false'];
+//        }catch (\Exception $exception){
+//            Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'请求异常：'.$exception->getMessage(),null);
+//            return ['result'=>'false'];
+//        }
+//    }
     public function accomplishToWMS(Package $package)
     {
         try{
-//            OracleDOCOrderDetail::where('SOREFERENCE5',$package->logistic_number)->update(['grossweight'=>'Y']);
-//            return ['result'=>$success];
-            return ['result'=>true];
-            //对WMS接口请求不需要了，直接写其数据库
-            $json=["request"=>['TASKID'=>$package->WMSReflectPackage_name,
-                'SOReference5'=>$package->logistic_number,
-                'Weigh'=>$package->weight,
-                'Addwho'=>'',
-                'Addtime'=>Carbon::now(),
-                'Package'=>$package->paperBox_name,
-                'USERDEFINE1'=>$package->batch_number,
-                'USERDEFINE2'=>$package->batch_rule,
-                'USERDEFINE3'=>'OK',
-            ]];
-            $json=json_encode($json);
-            $url=url(config('api.flux.package.new'));
-            $response = Zttp::post($url, json_decode($json));
-            $this->log(__METHOD__,'Sign'.__FUNCTION__,json_encode($response->json()),null);
-            $response=$response->json();
-            $noIssues=true;
-            if(!$response||!isset($response['response'])||!$response['response']['flag']=='Y'){
-                $noIssues=false;
+            $idxAsrsReceive=OracleIdxAsrsReceive::where('userdefine1',$package['logistic_number'])->first();
+            if(!$idxAsrsReceive){
+                OracleIdxAsrsReceive::create(['grouptaskid'=>$package['logistic_number'],'grouptasksequence'=>1,'userdefine1'=>$package['logistic_number'],'userdefine2'=>$package['weight'],'addwho'=>'WAS','addtime'=>Carbon::now()]);
             }
-            if($noIssues&&$response['response']['flag']=='Y'){
-                $this->log(__METHOD__,'SUCCESS_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
-                return ['result'=>'success'];
+            $docOrderPackingSummary=OracleDocOrderPackingSummary::where('traceid',$package['logistic_number'])->first();
+            if(!$docOrderPackingSummary){
+                OracleDocOrderPackingSummary::create(['traceid'=>$package['logistic_number'],'orderno'=>$package['oracleInfo']['orderno'],'grossweight'=>$package['weight'],'addwho'=>'WAS','addtime'=>Carbon::now(),'editwho'=>'WAS','edittime'=>Carbon::now()]);
             }
-            $this->log(__METHOD__,'ERROR_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
-            return ['result'=>'false'];
+//            $json=["request"=>['TASKID'=>$package->WMSReflectPackage_name,
+//                'SOReference5'=>$package->logistic_number,
+//                'Weigh'=>$package->weight,
+//                'Addwho'=>'',
+//                'Addtime'=>Carbon::now(),
+//                'Package'=>$package->paperBox_name,
+//                'USERDEFINE1'=>$package->batch_number,
+//                'USERDEFINE2'=>$package->batch_rule,
+//                'USERDEFINE3'=>'OK',
+//            ]];
+//            $json=json_encode($json);
+//            $url=url(config('api.flux.package.new'));
+//            $response = Zttp::post($url, json_decode($json));
+//            $this->log(__METHOD__,'Sign'.__FUNCTION__,json_encode($response->json()),null);
+//            $response=$response->json();
+//            $noIssues=true;
+//            if(!$response||!isset($response['response'])||!$response['response']['flag']=='Y'){
+//                $noIssues=false;
+//            }
+//            if($noIssues&&$response['response']['flag']=='Y'){
+//                $this->log(__METHOD__,'SUCCESS_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
+//                return ['result'=>'success'];
+//            }
+                $this->log(__METHOD__,'SUCCESS_'.__FUNCTION__,"称重写入WMS成功：".json_encode($package),null);
+            return ['result'=>'success'];
         }catch (\Exception $exception){
-            Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'请求异常：'.$exception->getMessage(),null);
+            Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'称重写入WMS请求异常：'.$exception->getMessage(),null);
             return ['result'=>'false'];
         }
     }
-    public function markWMSOnBatch($batchNumber){
+    public function markWMSOnBatch($batchNumber,$weight){
+        $batchNumber = strtoupper($batchNumber);
+
+
         $docWaveHeader=OracleDOCWaveHeader::where('waveno',$batchNumber)->first();
         if(!$docWaveHeader){
             {return ['result'=>false,'message'=>'波次不存在'];}
@@ -216,7 +263,56 @@ class PackageController extends Controller
             $query->where('SOSTATUS','<>','99')->where('SOSTATUS','<>','63');
         })->get();
         if($unpackedOrders->isNotEmpty()){return ['result'=>false,'message'=>'有未装箱或完成的订单在该波次，不能批量记录重量'];}
+
+
+
+
         OracleDOCWaveHeader::where('waveno',$batchNumber)->update(['userdefine3'=>'Y']);
+
+        $numbersesOfBatch=OracleDOCWaveDetails::select('picktotraceid as logistic_number','act_allocation_details.orderno')->where('doc_wave_details.waveno','W190630000042')
+            ->leftJoin('act_allocation_details','doc_wave_details.orderno','act_allocation_details.orderno')->get();
+        $oneIdxAsrsReceive=OracleIdxAsrsReceive::where('userdefine1',$numbersesOfBatch[0]['logistic_number'])->first();
+        if(!$oneIdxAsrsReceive){
+            $inserts='';
+            $values=[];
+            foreach($numbersesOfBatch as $numbers){
+                $inserts .= " into idx_asrs_receive (grouptaskid,grouptasksequence,userdefine1,userdefine2,addwho,addtime)values(?,?,?,?,?,?) ";
+                $values[] = $numbers['logistic_number']??'';
+                $values[] = 1;
+                $values[] = $numbers['logistic_number']??'';
+                $values[] = $weight;
+                $values[] = 'WAS';
+                $values[] = Carbon::now();
+            }
+            DB::connection('oracle')->insert("insert all {$inserts} select * from dual",$values);
+        }else{
+            $logisticNumbers=$numbersesOfBatch->map(function($numbers){return $numbers['logistic_number'];});
+            OracleIdxAsrsReceive::whereIn('userdefine1',$logisticNumbers)->update(['userdefine2'=>$weight]);
+        }
+
+        $oneIdxAsrsReceive=OracleDocOrderPackingSummary::where('traceid',$numbersesOfBatch[0]['logistic_number'])->first();
+        if(!$oneIdxAsrsReceive){
+            $inserts='';
+            $values=[];
+            foreach($numbersesOfBatch as $numbers){
+                $inserts .= " into doc_order_packing_summary (traceid,orderno,grossweight,addwho,addtime,editwho,edittime)values(?,?,?,?,?,?,?) ";
+                $values[] = $numbers['logistic_number']??'';
+                $values[] = $numbers['orderno']??'';
+                $values[] = $weight;
+                $values[] = 'WAS';
+                $values[] = Carbon::now();
+                $values[] = 'WAS';
+                $values[] = Carbon::now();
+            }
+            DB::connection('oracle')->insert("insert all {$inserts} select * from dual",$values);
+        }else{
+            $logisticNumbers=$numbersesOfBatch->map(function($numbers){return $numbers['logistic_number'];});
+            OracleDocOrderPackingSummary::whereIn('traceid',$logisticNumbers)->update(['grossweight'=>$weight]);
+        }
+
+
+
+        //TODO
         Controller::logS(__METHOD__,'SUCCESS_'.__FUNCTION__,'标记WMS波次：'.$batchNumber.',userdefine3="Y"',auth()->user()['id']);
         return ['result'=>true];
     }

app/Http/Controllers/api/thirdPart/jianshang/RejectedController.php

@@ -5,7 +5,8 @@ namespace App\Http\Controllers\api\thirdPart\jianshang;
 
 
 use App\Http\Controllers\Controller;
-use App\Rejected;
+use App\Logistic;
+use App\QualityLabel;
 use App\RejectedBill;
 use App\RejectedBillItem;
 use Carbon\Carbon;
@@ -16,17 +17,18 @@ use Zttp\Zttp;
 
 class RejectedController extends Controller
 {
-    function sendRejected(Rejected $rejected){
+    function sendRejected($rejected){
         $amount = $rejected['amount'] ?? '';
         $created_at = $rejected['created_at'] ?? '';
         $fee_collected = $rejected['fee_collected'] ?? '';
         $goods_barcode = $rejected['barcode_goods'] ?? '';
         $goods_name = $rejected['name_goods'] ?? '';
-        $logistic_name_return = $rejected->logisticName();
+        $logistic_name_return = Logistic::nameById($rejected['id_logistic_return']);
         $logistic_number = $rejected['logistic_number'] ?? '';
         $logistic_number_return = $rejected['logistic_number_return'] ?? '';
         $order_number = $rejected['order_number'] ?? '';
-        $quality_label = $rejected->qualityLabelName();
+        $quality_label = QualityLabel::where('id',$rejected['id_quality_label'])->first();
+        $quality_label = $quality_label?$quality_label['name']:'';
         $sender_mobile = $rejected['mobile_sender'] ?? '';
         $sender_name = $rejected['sender'] ?? '';
         $json = $this->packSendToRemote($amount,$created_at,$fee_collected,$goods_barcode,
@@ -111,7 +113,7 @@ class RejectedController extends Controller
         return $response->json();
     }
 
-    function sendRejected2(Rejected $rejected){
+    function sendRejected2(array $rejected){
         if(config('api.jianshang_rejecteds_log_switch'))Controller::logS(__METHOD__,__FUNCTION__,"发送笕尚接口，进入入口。退单号：{$rejected['logistic_number_return']}",Auth::user()['id']);
         $created_at = $rejected['created_at'] ?? '';
         $fee_collected = $rejected['fee_collected'] ?? '';
@@ -123,7 +125,7 @@ class RejectedController extends Controller
             $temGoods['quality_label']=$goods['quality_label'] ?? '';
             $goodses[]=$temGoods;
         }
-        $logistic_name_return = $rejected->logisticName();
+        $logistic_name_return = Logistic::nameById($rejected['id_logistic_return']);
         $logistic_number = $rejected['logistic_number'] ?? '';
         $logistic_number_return = $rejected['logistic_number_return'] ?? '';
         $order_number = $rejected['order_number'] ?? '';
@@ -205,12 +207,18 @@ class RejectedController extends Controller
         $this->log(__METHOD__,'笕尚接口发送请求：',$data);
         $url=config('api.url_rejected_send_jianshang2');
         if(env('api_faking'))$url=url(config('api.fakingUrl_rejected_send_jianshang'));
-        $response=Zttp::withHeaders([
-            'sign'=>$sign,
-            'nonce'=>$nonce,
-            'timestamp'=>$timestamp,
-            'Content-Type'=>'application/json'
-        ])->post($url,json_decode($data,true));
+        try{
+
+            $response=Zttp::withHeaders([
+                'sign'=>$sign,
+                'nonce'=>$nonce,
+                'timestamp'=>$timestamp,
+                'Content-Type'=>'application/json'
+            ])->post($url,json_decode($data,true));
+        }catch (\Exception $e){
+            $this->log(__METHOD__,'笕尚接口返回异常！！：',$e->getMessage().'||'.json_encode($data));
+            $response=false;
+        }
         if(!$response){
             $this->log(__METHOD__,'笕尚接口返回异常！！：',$response->body());
             return false;

app/Http/Controllers/api/thirdPart/weight/PackageController.php

@@ -17,6 +17,151 @@ use Illuminate\Support\Facades\Validator;
 
 class PackageController extends Controller
 {
+//    public function new_(Request $requestInitial){
+//        $request=[];
+//        foreach ($requestInitial->all() as $k=>$v){
+//            $request[strtolower($k)]=$v;
+//        }
+//        $reqDate=isset($request['time'])?$request['time']:Carbon::now();
+//        $errors=$this->validatorWeight($request)->errors();
+//
+//        if (count($errors)>0){
+//            $this->log(__METHOD__,'error'.__FUNCTION__,json_encode($request).'||'.json_encode($errors),null);
+//            $response=["msg"=>$errors,"code"=>500,"data"=>null];
+//            return json_encode($response);
+//        }
+//
+//        $measuringMachine=MeasuringMachine::where('code',$request['id'])->first();
+//        if (!$measuringMachine){
+//            $measuringMachine=new MeasuringMachine([
+//                'name'=>$request['id'],
+//                'code'=>$request['id'],
+//                'status'=>'在线'
+//            ]);
+//            $measuringMachine->save();
+//            $this->log(__METHOD__,'weightApi(new measuring machine)'.__FUNCTION__,json_encode($request),null);
+//        }else{
+//            $measuringMachineStatus=new MeasuringMachine();
+//            $measuringMachineStatus->changeStatus($measuringMachine);
+//        }
+//        MeasuringMachineQueue::dispatch($measuringMachine)->delay(Carbon::now()->addMinutes(30));
+//
+//        $package=Package::where('logistic_number',$request['barcode'])->first();
+//        if (isset($request['length'])&&isset($request['width'])&&isset($request['height'])){
+//            $length=$request['length'];
+//            $width=$request['width'];
+//            $height=$request['height'];
+//            $max=($length>=($width>=$height?$width:$height)?$length:($width>=$height?$width:$height));
+//            if ($max==$length){
+//                $centre=$width>=$height?$width:$height;
+//                $min=$width<$height?$width:$height;
+//            }elseif ($max==$width){
+//                $centre=$length>=$height?$length:$height;
+//                $min=$length<$height?$length:$height;
+//            }else{
+//                $centre=$width>=$length?$width:$length;
+//                $min=$width<$length?$width:$length;
+//            }
+//        }else{
+//            $max=0;$centre=0;$min=0;
+//        }
+//        $apiController=new \App\Http\Controllers\Api\thirdPart\flux\PackageController();
+//        if ($package){
+//            $packageController=new \App\Http\Controllers\PackageController();
+//            $package->fetchPaperBox($max,$centre,$min,$package->owner_id);
+//            //处理活动波次
+//            if ($package->batch_rule&&strstr($package->batch_rule,'组合')){
+//                $packageController->syncBatch($package->batch_number,$request['weight'],$max,$centre,$min,$reqDate,$package['paper_box_id']);
+//            }else{
+//                $package->measuring_machine_id=$measuringMachine->id;
+//                $package->weight=$request['weight'];
+//                $package->length=$max;
+//                $package->width=$centre;
+//                $package->height=$min;
+//                $package->bulk=$max*$centre*$min;
+//                $package->weighed_at=$reqDate;
+//                $package->status="未上传";
+//                $this->log(__METHOD__,'Batch_'.__FUNCTION__,json_encode($package),null);
+//                $package->save();
+//                $result=$apiController->accomplishToWMS($package);
+//                if ($result['result']){
+//                    if ($package->status=="记录异常")$package->status="已上传异常";
+//                    else $package->status="已上传";
+//                }else{
+//                    $package->status="上传异常";
+//                }
+//                $package->save();
+//            }
+//            if ($package->order_code){
+//                $waybill=Waybill::where('wms_bill_number',$package->order_code)->where('status','!=','已完结')
+//                    ->where('status','!=','无模型')->first();
+//                if ($waybill){
+//                    $waybill->warehouse_weight_other=$package->weight;
+//                    $waybill->warehouse_weight_unit_id_other=1;
+//                    $waybill->update();
+//                }
+//            }
+//            event(new WeighedEvent($package));
+//            $response=["msg"=>"保存成功",
+//                        "code"=>200,
+//                        "data"=>true,
+//                        "serverMsg"=>null,
+//                        "requestor"=>[
+//                                "requestor"=>"1",
+//                                "eventCode"=>"0",
+//                                "reqDate"=>$reqDate,
+//                                "resDate"=>Carbon::now()]
+//                        ];
+//            $this->log(__METHOD__,'weightApi'.__FUNCTION__,json_encode($request).'|'.json_encode($response),null);
+//            return json_encode($response,JSON_UNESCAPED_UNICODE);
+//        }
+//        if (!$package){
+//            $logisticNumber=$request['barcode'];
+//            $createPackage=new Package([
+//                'logistic_number'=>$logisticNumber,
+//                'delivery_number'=>$logisticNumber,
+//                'measuring_machine_id'=>$measuringMachine->id,
+//                'weight'=>$request['weight'],
+//                'length'=>$max,
+//                'width'=>$centre,
+//                'height'=>$min,
+//                'bulk'=>$max*$centre*$min,
+//                'weighed_at'=>$reqDate,
+//                'status'=>"未下发",
+//            ]);
+//            $createPackage->fetchAllFromOracle();
+//            $createPackage->fetchPaperBox($max, $centre, $min);
+//            $result=$apiController->accomplishToWMS($createPackage);
+//            if(!$result['result']){
+//                $this->log(__METHOD__,'weightApi'.__FUNCTION__,json_encode($request).'||'.json_encode($createPackage),null);
+//                $response=["msg"=>"写入WMS失败!","code"=>500,"data"=>null];
+//                return json_encode($response,JSON_UNESCAPED_UNICODE);
+//            }
+//            if ($createPackage->save()){
+//                $measuringMachine->touch();
+//                MeasuringMachineQueue::dispatch($measuringMachine)->delay(Carbon::now()->addMinutes(30));
+//                MarkPackageExcepted::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
+//                event(new WeighedEvent($createPackage));
+//                $response=["msg"=>"保存成功",
+//                    "code"=>200,
+//                    "data"=>true,
+//                    "serverMsg"=>null,
+//                    "requestor"=>[
+//                        "requestor"=>"1",
+//                        "eventCode"=>"0",
+//                        "reqDate"=>$reqDate,
+//                        "resDate"=>Carbon::now()]
+//                ];
+//                $this->log(__METHOD__,'weightApi'.__FUNCTION__,json_encode($request).'||'.json_encode($response),null);
+//                return json_encode($response,JSON_UNESCAPED_UNICODE);
+//            }
+//
+//            $response=["msg"=>"保存时发生错误（未下发）!","code"=>500,"data"=>null];
+//            $this->log(__METHOD__,'weightApi(ERROR)'.__FUNCTION__,json_encode($request).'||'.json_encode($response),null);
+//            return json_encode($response,JSON_UNESCAPED_UNICODE);
+//        }
+//    }
+
     public function new_(Request $requestInitial){
         $request=[];
         foreach ($requestInitial->all() as $k=>$v){
@@ -27,58 +172,27 @@ class PackageController extends Controller
 
         if (count($errors)>0){
             $this->log(__METHOD__,'error'.__FUNCTION__,json_encode($request).'||'.json_encode($errors),null);
-            $response=["msg"=>$errors,"code"=>500,"data"=>null];
-            return json_encode($response);
+            return json_encode(["msg"=>$errors,"code"=>500,"data"=>null]);
         }
 
-        $measuringMachine=MeasuringMachine::where('code',$request['id'])->first();
-        if (!$measuringMachine){
-            $measuringMachine=new MeasuringMachine([
-                'name'=>$request['id'],
-                'code'=>$request['id'],
-                'status'=>'在线'
-            ]);
-            $measuringMachine->save();
-            $this->log(__METHOD__,'weightApi(new measuring machine)'.__FUNCTION__,json_encode($request),null);
-        }else{
-            $measuringMachineStatus=new MeasuringMachine();
-            $measuringMachineStatus->changeStatus($measuringMachine);
-        }
-        MeasuringMachineQueue::dispatch($measuringMachine)->delay(Carbon::now()->addMinutes(30));
+        $measuringMachine=MeasuringMachine::firstOrCreate('code',$request['id']);
+        $measuringMachine->turnOn();
+        $measuringMachine->turnOffInMinutes(30);
 
         $package=Package::where('logistic_number',$request['barcode'])->first();
-        if (isset($request['length'])&&isset($request['width'])&&isset($request['height'])){
-            $length=$request['length'];
-            $width=$request['width'];
-            $height=$request['height'];
-            $max=($length>=($width>=$height?$width:$height)?$length:($width>=$height?$width:$height));
-            if ($max==$length){
-                $centre=$width>=$height?$width:$height;
-                $min=$width<$height?$width:$height;
-            }elseif ($max==$width){
-                $centre=$length>=$height?$length:$height;
-                $min=$length<$height?$length:$height;
-            }else{
-                $centre=$width>=$length?$width:$length;
-                $min=$width<$length?$width:$length;
-            }
-        }else{
-            $max=0;$centre=0;$min=0;
-        }
-        $accomplishToWMS=new \App\Http\Controllers\Api\thirdPart\flux\PackageController();
+
+        $edges=[$request['length']??0,$request['width']??0,$request['height']??0];
+        rsort($edges);
+        $fluxController=new \App\Http\Controllers\Api\thirdPart\flux\PackageController();
         if ($package){
-            $packagePaperBox=new Package();
-            $paperBox_id=null;
-            if ($package->owner_id){
-                $paperBox_id=$packagePaperBox->checkPaperBox($max,$centre,$min,$package->owner_id);
-                if (!$paperBox_id)$this->log(__METHOD__,'weightApi(no paper box)'.__FUNCTION__,json_encode($request),null);
-            }else{
-                $this->log(__METHOD__,'weightApi(no owner)'.__FUNCTION__,json_encode($request),null);
-            }
             $packageController=new \App\Http\Controllers\PackageController();
+            $package->fetchPaperBox($edges[0],$edges[1],$edges[2]);
+            $package['bulk']=$edges[0]*$edges[1]*$edges[2];
             //处理活动波次
-            if ($package->batch_rule&&strstr($package->batch_rule,'组合')){
-                $packageController->syncBatch($package->batch_number,$request['weight'],$max,$centre,$min,$reqDate,$paperBox_id);
+            if ($package->isActivityBatch()){
+                $package->unifyThisMeasureUnderBatch();
+                $result=$fluxController->markWMSOnBatch($package['batch_number'], $request['weight']);
+                $packageController->syncBatch($package->batch_number,$request['weight'],$max,$centre,$min,$reqDate,$package['paper_box_id']);
             }else{
                 $package->measuring_machine_id=$measuringMachine->id;
                 $package->weight=$request['weight'];
@@ -87,11 +201,10 @@ class PackageController extends Controller
                 $package->height=$min;
                 $package->bulk=$max*$centre*$min;
                 $package->weighed_at=$reqDate;
-                if ($paperBox_id)$package->paper_box_id=$paperBox_id;
                 $package->status="未上传";
                 $this->log(__METHOD__,'Batch_'.__FUNCTION__,json_encode($package),null);
                 $package->save();
-                $result=$accomplishToWMS->accomplishToWMS($package);
+                $result=$fluxController->accomplishToWMS($package);
                 if ($result['result']){
                     if ($package->status=="记录异常")$package->status="已上传异常";
                     else $package->status="已上传";
@@ -111,15 +224,15 @@ class PackageController extends Controller
             }
             event(new WeighedEvent($package));
             $response=["msg"=>"保存成功",
-                        "code"=>200,
-                        "data"=>true,
-                        "serverMsg"=>null,
-                        "requestor"=>[
-                                "requestor"=>"1",
-                                "eventCode"=>"0",
-                                "reqDate"=>$reqDate,
-                                "resDate"=>Carbon::now()]
-                        ];
+                "code"=>200,
+                "data"=>true,
+                "serverMsg"=>null,
+                "requestor"=>[
+                    "requestor"=>"1",
+                    "eventCode"=>"0",
+                    "reqDate"=>$reqDate,
+                    "resDate"=>Carbon::now()]
+            ];
             $this->log(__METHOD__,'weightApi'.__FUNCTION__,json_encode($request).'|'.json_encode($response),null);
             return json_encode($response,JSON_UNESCAPED_UNICODE);
         }
@@ -127,6 +240,7 @@ class PackageController extends Controller
             $logisticNumber=$request['barcode'];
             $createPackage=new Package([
                 'logistic_number'=>$logisticNumber,
+                'delivery_number'=>$logisticNumber,
                 'measuring_machine_id'=>$measuringMachine->id,
                 'weight'=>$request['weight'],
                 'length'=>$max,
@@ -136,23 +250,14 @@ class PackageController extends Controller
                 'weighed_at'=>$reqDate,
                 'status'=>"未下发",
             ]);
-            $result=$accomplishToWMS->accomplishToWMS($package);
-
-
-            $logisticNumberFeature=new LogisticNumberFeatureController();
-            $logistic=$logisticNumberFeature->getLogisticByFeatures($request['barcode']);
-            $createPackage=new Package([
-                'logistic_number'=>$request['barcode'],
-                'measuring_machine_id'=>$measuringMachine->id,
-                'weight'=>$request['weight'],
-                'length'=>$max,
-                'width'=>$centre,
-                'height'=>$min,
-                'bulk'=>$max*$centre*$min,
-                'weighed_at'=>$reqDate,
-                'status'=>"未下发",
-            ]);
-            if ($logistic)$createPackage->logistic_id=$logistic->id;
+            $createPackage->fetchAllFromOracle();
+            $createPackage->fetchPaperBox($max, $centre, $min);
+            $result=$fluxController->accomplishToWMS($createPackage);
+            if(!$result['result']){
+                $this->log(__METHOD__,'weightApi'.__FUNCTION__,json_encode($request).'||'.json_encode($createPackage),null);
+                $response=["msg"=>"写入WMS失败!","code"=>500,"data"=>null];
+                return json_encode($response,JSON_UNESCAPED_UNICODE);
+            }
             if ($createPackage->save()){
                 $measuringMachine->touch();
                 MeasuringMachineQueue::dispatch($measuringMachine)->delay(Carbon::now()->addMinutes(30));
@@ -171,13 +276,13 @@ class PackageController extends Controller
                 $this->log(__METHOD__,'weightApi'.__FUNCTION__,json_encode($request).'||'.json_encode($response),null);
                 return json_encode($response,JSON_UNESCAPED_UNICODE);
             }
+
             $response=["msg"=>"保存时发生错误（未下发）!","code"=>500,"data"=>null];
             $this->log(__METHOD__,'weightApi(ERROR)'.__FUNCTION__,json_encode($request).'||'.json_encode($response),null);
             return json_encode($response,JSON_UNESCAPED_UNICODE);
         }
     }
 
-
     public function validatorWeight(array $request){
         $validator=Validator::make($request,[
             'id'=>['required','max:30',/*function ($attribute, $value, $fail) {

app/Logistic.php

@@ -13,4 +13,10 @@ class Logistic extends Model
 {
     use ModelTimeFormat;
     protected $fillable = ['name','code'];
+
+
+    static function nameById($id){
+        $logistic=Logistic::where('id',$id)->first();
+        return $logistic?$logistic['name']:'';
+    }
 }

app/MeasuringMachine.php

@@ -3,8 +3,11 @@
 namespace App;
 
 use App\Events\WeighedEvent;
+use App\Http\Controllers\Controller;
+use App\Jobs\MeasuringMachineQueue;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
+use Illuminate\Support\Carbon;
 
 class MeasuringMachine extends Model
 {
@@ -15,9 +18,10 @@ class MeasuringMachine extends Model
 
 
     //TODO 上线下线
-    public function changeStatus(MeasuringMachine $measuringMachine){
-        $measuringMachine->status='在线';
-        $measuringMachine->save();
+    public function turnOn(){
+        if($this['status']=='在线')return;
+        $this['status']='在线';
+        $this->save();
         /*$package=Package::with('owner','paperBox','measuringMachine')->
         where('measuring_machine_id',$measuringMachine->id)->orderBy('id','DESC')->first();
         if (!$package){
@@ -26,4 +30,7 @@ class MeasuringMachine extends Model
         }
         event(new WeightEvent($package));*/
     }
+    public function turnOffInMinutes($minutes){
+        MeasuringMachineQueue::dispatch($this)->delay(Carbon::now()->addMinutes($minutes));
+    }
 }

app/OracleActAllocationDetails.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OracleActAllocationDetails extends Model
+{
+    protected $connection="oracle";
+    protected $primaryKey="ALLOCATIONDETAILSID";
+    protected $table="act_allocation_details";
+    public $timestamps=false;
+    public function getIncrementing(){ return false;}
+}

app/OracleDocOrderPackingSummary.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OracleDocOrderPackingSummary extends Model
+{
+    protected $connection="oracle";
+    protected $primaryKey="traceid";
+    protected $table = 'doc_order_packing_summary';
+    protected $fillable = ['traceid','orderno','grossweight','addwho','addtime','editwho','edittime'];
+    public $timestamps=false;
+    public function getIncrementing(){ return false;}
+}

app/OracleIdxAsrsReceive.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OracleIdxAsrsReceive extends Model
+{
+    protected $connection="oracle";
+    protected $primaryKey="GROUPTASKID";
+    protected $table = 'idx_asrs_receive';
+    protected $fillable = ['grouptaskid','grouptasksequence','userdefine1','userdefine2','addwho','addtime'];
+    public $timestamps=false;
+    public function getIncrementing(){ return false;}
+}

app/Package.php

@@ -41,7 +41,78 @@ class Package extends Model
     public function WMSReflectPackage(){
         return $this->hasOne('App\WMSReflectPackage','SOReference5','logistic_number');
     }
+    public function save(array $options=[]){
+        unset($this->_temOracleInfo);
+        unset($this->temOwner);
+        unset($this->temLogistic);
+        parent::save($options);
+    }
+
+    public function isActivityBatch(){
+        return ($this['batch_rule'] && strstr($this['batch_rule'],'组合')  && $this['batch_number'] );
+    }
+    public function unifyThisMeasureUnderBatch(){
+        $this->fetchPaperBox();
+        Package::where(['batch_number'=>$this['batch_number']])->update(['weight'=>$this['weight']??'',
+            'length'=>$this['length']??'',
+            'width'=>$this['width']??'',
+            'height'=>$this['height']??'',
+            'paper_box_id'=>$this['paper_box_id']??'']);
+    }
 
+    public function fetchLogisticFromOracle(){
+        if(!$this['oracleInfo'])return null;
+        if($this['temLogistic'])return $this['temLogistic'];
+        $logistic= Logistic::where('code',$this['oracleInfo']['SOReference5'])->first();
+        if(!$logistic){
+            Logistic::create(['code'=>$this['oracleInfo']['SOReference5'],'name'=>$this['oracleInfo']['SOReference5']]);
+            $this->log(__METHOD__, __FUNCTION__, "富勒下发找不到快递公司，添加{$this['oracleInfo']['customerid']}" , null);
+        }
+        if(!$logistic)return null;
+        $this['temLogistic']=$logistic;
+        $this['logistic_id'] = $logistic['id'];
+        return $logistic;
+    }
+    public function fetchOwnerFromOracle(){
+        if(!$this['oracleInfo'])return null;
+        if($this['temOwner'])return $this['temOwner'];
+        $owner= Owner::where('code',$this['oracleInfo']['customerid'])->first();
+        if(!$owner){
+            Owner::create(['code'=>$this['oracleInfo']['customerid'],'name'=>$this['oracleInfo']['customerid']]);
+            $this->log(__METHOD__, __FUNCTION__, "富勒下发找不到货主，添加{$this['oracleInfo']['customerid']}" , null);
+        }
+        if(!$owner)return null;
+        $this['temOwner']=$owner;
+        $this['owner_id'] = $owner['id'];
+        return $owner;
+    }
+    public function fetchAllFromOracle(){
+        if(!$this['oracleInfo'])return null;
+        $this->fetchOwnerFromOracle();
+        $this->fetchLogisticFromOracle();
+        $this['recipient'] = $this['oracleInfo']['Consigneename'];
+        if($this['oracleInfo']['SOReference5'])
+            $this['logistic_number'] = $this['oracleInfo']['SOReference5'];
+        $this['batch_rule'] = isset($this['oracleInfo']['userdefine2'])?$this['oracleInfo']['userdefine2']:'';
+    }
+
+    public function getOracleInfoAttribute()
+    {
+        if(!$this['logistic_number'])return '';
+        if(isset($this->_temOracleInfo)&&$this->_temOracleInfo)return $this->_temOracleInfo;
+        $allocationDetail=OracleActAllocationDetails::select([
+            'doc_order_header.userdefine1',
+            'doc_order_header.userdefine2',
+            'doc_order_header.SOReference5',
+            'doc_order_header.orderno',
+            'doc_order_header.customerid',
+            'doc_order_header.Consigneename'
+        ])
+            ->where('picktotraceid',$this['logistic_number'])
+            ->leftJoin('DOC_Order_Header','act_allocation_details.orderno','doc_order_header.orderno');
+        $this->_temOracleInfo=$allocationDetail->first();
+        return $this->_temOracleInfo;
+    }
     public function getOwnerNameAttribute()
     {
         return $this['owner']? $this['owner']['name']:null;
@@ -64,14 +135,22 @@ class Package extends Model
 
 
     //寻找相近纸箱ID
-    public  function checkPaperBox($max,$centre,$min,$owner_id){
+    public  function fetchPaperBox($max, $centre, $min, $owner_id=null){
+        if($this['paper_box_id'])return $this['paper_box_id'];
         $sumDiffer=0;
         $maxDiffer=0;
         $paperBox_id=null;
+        if(!$owner_id) $owner_id = $this['owner_id'];
+        if(!$owner_id) {
+            $owner = $this->fetchOwnerFromOracle();
+            $owner_id = $owner['id'];
+            if(!$owner_id)return null;
+        }
         $boxes=Owner::select('id')->with('paperBoxes')->find($owner_id);
+        $targetPaperBox=null;
         foreach ($boxes->paperBoxes as $i=>$paperBox){
             if ($paperBox->length==$max&&$paperBox->width==$centre&&$paperBox->height==$min){
-                $paperBox_id=$paperBox->id;
+                $targetPaperBox=$paperBox;
                 break;
             }
             $lengthDiffer=abs($paperBox->length-$max);
@@ -81,20 +160,21 @@ class Package extends Model
             if($i==0){
                 $maxDiffer=$thisMaxDiffer;
                 $sumDiffer=$lengthDiffer+$widthDiffer+$heightDiffer;
-                $paperBox_id=$paperBox->id;
+                $targetPaperBox=$paperBox;
             }
             if ($thisMaxDiffer==$maxDiffer){
                 if($sumDiffer>($lengthDiffer+$widthDiffer+$heightDiffer)){
                     $sumDiffer=$lengthDiffer+$widthDiffer+$heightDiffer;
-                    $paperBox_id=$paperBox->id;
+                    $targetPaperBox=$paperBox;
                 }
             }
             if ($thisMaxDiffer<$maxDiffer){
                 $sumDiffer=$lengthDiffer+$widthDiffer+$heightDiffer;
                 $maxDiffer=$thisMaxDiffer;
-                $paperBox_id=$paperBox->id;
+                $targetPaperBox=$paperBox;
             }
         }
-        return $paperBox_id;
+        if($targetPaperBox)$this['paper_box_id']=$targetPaperBox['id'];
+        return $targetPaperBox['id'];
     }
 }

app/ProcessDaily.php

@@ -17,7 +17,7 @@ class ProcessDaily extends Model
 
 
     public function process(){
-        return $this->hasOne('App\Process','id','process_id');
+        return $this->belongsTo('App\Process','process_id','id');
     }
     public function processDailyParticipants(){
         return $this->hasMany('App\ProcessDailyParticipant','process_daily_id','id');

config/database.php

@@ -64,15 +64,15 @@ return [
         ],
 
         'oracle' => [
-            'driver' => 'oracle',
-            'host' => '47.103.12.61',
-            'port' => '1521',
-            'database'=> '',
-            'service_name' => 'orcl',
-            'username' => 'WMS_USER',
-            'password' => 'WMS_USER',
-            'charset' => 'utf8',
-            'prefix' => '',
+            'driver' => env('ORACLE_DRIVER', 'oracle'),
+            'host' => env('ORACLE_HOST', '47.103.12.61'),
+            'port' => env('ORACLE_PORT', '1521'),
+            'database'=> env('ORACLE_DATABASE', ''),
+            'service_name' => env('ORACLE_SERVICE_NAME', 'orcl'),
+            'username' => env('ORACLE_USERNAME', 'WMS_USER'),
+            'password' => env('ORACLE_PASSWORD', 'WMS_USER'),
+            'charset' => env('ORACLE_CHARSET', 'utf8'),
+            'prefix' => env('ORACLE_PREFIX', ''),
         ],
 
         'pgsql' => [

public/t.php

@@ -1,3 +1,5 @@
 <?php
-phpinfo();
+;
+rsort($arr);
 
+var_dump($arr);

resources/views/client/areaCheck/create.blade.php

@@ -1,43 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-    @component('client.areaCheck.menu')@endcomponent
-<form class="card col-md-8 offset-md-2 card-body">
-    <div class="form-inline mt-3">
-        <label class="col-2 text-info">项目小组</label>
-        <select class="form-control col-7">
-            <option></option>
-        </select>
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2 text-info">子项目</label>
-        <select class="form-control col-7">
-            <option></option>
-        </select>
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2 text-info">用仓类型</label>
-        <select class="form-control col-7">
-            <option></option>
-        </select>
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2">货物整托</label>
-        <input class="form-control col-7">
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2 ">货物半托</label>
-        <input class="form-control col-7">
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2 ">平面区面积</label>
-        <input class="form-control col-7">
-    </div>
-    <div class="form-group mt-3">
-        <div class="col-7 offset-2">
-            <input type="submit" class="btn btn-success form-control">
-        </div>
-    </div>
-</form>
-@endsection
-

resources/views/client/areaCheck/index.blade.php

@@ -1,160 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-    @component('client.areaCheck.menu')@endcomponent
-    <div class="card m-2">
-        <form>
-            <table class="table table-sm table-bordered  text-nowrap mb-0" style="background: #fff;min-width: 1500px">
-                <tr>
-                    <td colspan="10">
-                        <select name="paginate"  class="form-control-sm" style="vertical-align: middle">
-                            <option value="50">每页显示50行</option>
-                            <option value="100">每页显示100行</option>
-                            <option value="200">每页显示200行</option>
-                            <option value="500">每页显示500行</option>
-                            <option value="1000">每页显示1000行</option>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="width: 300px">
-                        <div class="form-inline">
-                            <select name="owner_id"    class="form-control form-control-sm tooltipTarget "   style="vertical-align: middle;max-width: 100px" :class="filterData.owner_id?'bg-warning':''">
-                                <option value="" class="text-secondary">货主 </option>
-                                <option  class="font-weight-bold"></option>
-                            </select>
-                            <div style="position: relative;">
-                                <button type="button"  style=" max-width: 100px" class="btn btn-sm btn-outline-dark container pull-left">多货主查询</button>
-                            </div>
-                        </div>
-                    </td>
-                    <td style="width: 300px">
-                            <input class="form-control form-control-sm" placeholder="结算月(示例：202001)" style="max-width: 200px">
-                    </td>
-                    <td style="width: 300px">
-                        <input class="form-control form-control-sm" type="date" style="max-width: 200px">
-                    </td>
-                    <td style="width: 300px">
-                        <select name="status"  class="form-control form-control-sm " style="vertical-align: middle;max-width: 100px" >
-                            <option value="" class="text-secondary">用仓类型</option>
-                        </select>
-                    </td>
-                    <td colspan="6"></td>
-                </tr>
-                <tr>
-                    <td>
-                        <select  name="status"  class="form-control form-control-sm " style="vertical-align: middle;max-width: 100px" >
-                            <option value="" class="text-secondary">子项目</option>
-                        </select>
-                    </td>
-                    <td>
-                        <select name="status"  class="form-control form-control-sm " style="vertical-align: middle;max-width: 100px" >
-                            <option value="" class="text-secondary">项目组</option>
-                        </select>
-                    </td>
-                    <td>
-                        <input class="form-control form-control-sm" type="date" style="max-width: 200px">
-                    </td>
-                    <td colspan="7"></td>
-                </tr>
-                <tr>
-                    <td colspan="10">
-                        <span class="dropdown">
-                            <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle "
-                                    data-toggle="dropdown" >
-                                导出Excel
-                            </button>
-                            <div class="dropdown-menu">
-                                <a class="dropdown-item" @click="waybillExport(1)" href="javascript:">导出勾选内容</a>
-                                <a class="dropdown-item" @click="waybillExport(2)" href="javascript:">导出所有页</a>
-                            </div>
-                        </span>
-                    </td>
-                </tr>
-            </table>
-        </form>
-        <table class="table table-sm table-hover table-bordered table-striped text-nowrap m-2">
-            <tr>
-                <th>
-                    <label for="all">
-                        <input id="all" type="checkbox" >全选
-                    </label>
-                </th>
-                <th>序号</th>
-                <th>项目组</th>
-                <th>货主</th>
-                <th>子项目</th>
-                <th>结算月</th>
-                <th>录入日期</th>
-                <th>用仓类型</th>
-                <th>货物整托</th>
-                <th>货物半托</th>
-                <th>平面区面积</th>
-                <th>结算面积</th>
-                <th>操作</th>
-            </tr>
-            <tr>
-                <td>
-                    <input class="checkItem" type="checkbox" >
-                </td>
-                <td>1</td>
-                <td>XXX</td>
-                <td>BS</td>
-                <td>东浩子项目1</td>
-                <td class="text-muted">202006</td>
-                <td>2020-06-15 15:06:32</td>
-                <td>整租</td>
-                <td>20</td>
-                <td>20</td>
-                <td>20</td>
-                <td>20</td>
-                <td><button class="btn btn-sm btn-outline-info">修改</button></td>
-            </tr>
-            <tr class="text-success">
-                <td>
-                    <input class="checkItem" type="checkbox" >
-                </td>
-                <td>2</td>
-                <td>XXX</td>
-                <td>BS</td>
-                <td>东浩子项目2</td>
-                <td class="text-muted">202006</td>
-                <td>2020-06-15 15:06:32</td>
-                <td>整租</td>
-                <td>20</td>
-                <td>20</td>
-                <td>20</td>
-                <td>20</td>
-                <td></td>
-            </tr>
-            <tr>
-                <td>
-                    <input class="checkItem" type="checkbox" >
-                </td>
-                <td>3</td>
-                <td>XXX</td>
-                <td>BS</td>
-                <td>
-                    <select class="form-control form-control-sm" >
-                        <option>东浩子项目3</option>
-                    </select></td>
-                <td class="text-muted">202006</td>
-                <td>2020-06-15 15:06:32</td>
-                <td>
-                    <select class="form-control form-control-sm" style="max-width: 100px">
-                        <option>整租</option>
-                    </select>
-                </td>
-                <td><input value="20" class="form-control form-control-sm" style="max-width: 100px"></td>
-                <td><input value="20" class="form-control form-control-sm" style="max-width: 100px"></td>
-                <td><input value="20" class="form-control form-control-sm" style="max-width: 100px"></td>
-                <td>20</td>
-                <td>
-                    <button class="btn btn-sm btn-outline-success">确定</button>
-                    <button class="btn btn-sm btn-outline-danger">取消</button>
-                </td>
-            </tr>
-        </table>
-    </div>
-@endsection
-

resources/views/client/areaCheck/menu.blade.php

@@ -1,16 +0,0 @@
-<div id="nav2">
-    @component('client.menu')
-    @endcomponent
-    <div class="container-fluid nav3">
-        <div class="card menu-third" >
-            <ul class="nav nav-pills">
-                <li class="nav-item">
-                    <a class="nav-link text-dark" href="{{url('client/areaCheck')}}" :class="{active:isActive('',3)}">查询</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link text-dark" href="{{url('client/areaCheck/create')}}" :class="{active:isActive('create',3)}">录入</a>
-                </li>
-            </ul>
-        </div>
-    </div>
-</div>

resources/views/client/base/create.blade.php

@@ -1,50 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-    @component('client.base.menu')@endcomponent
-<form class="card col-md-8 offset-md-2 card-body">
-    <div class="form-inline">
-        <label for="owner" class="col-2 text-primary">客户</label>
-        <select id="owner" class="form-control col-3">
-            <option></option>
-        </select>
-        <label class="col-1 text-primary">税率</label>
-        <div class="input-group-append col-2 p-0">
-            <input class="form-control">
-            <span class="input-group-text">%</span>
-        </div>
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2">销售姓名</label>
-        <input class="form-control col-7">
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2">公司名称</label>
-        <input class="form-control col-7">
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2 text-info">联系人</label>
-        <input class="form-control col-7">
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2 text-info">联系电话</label>
-        <input class="form-control col-7">
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2 text-info">项目小组</label>
-        <select class="form-control col-7">
-            <option></option>
-        </select>
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2">项目描述</label>
-        <input class="form-control col-7">
-    </div>
-    <div class="form-group mt-3">
-        <div class="col-7 offset-2">
-            <input type="submit" class="btn btn-success form-control">
-        </div>
-    </div>
-</form>
-@endsection
-

resources/views/client/base/index.blade.php

@@ -1,162 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-    @component('client.base.menu')@endcomponent
-    <div class="card" id="list">
-        <form>
-            <table class="table table-sm table-bordered  text-nowrap mb-0" style="background: #fff;min-width: 1500px">
-                <tr>
-                    <td colspan="10">
-                        <select name="paginate"  class="form-control-sm" style="vertical-align: middle">
-                            <option value="50">每页显示50行</option>
-                            <option value="100">每页显示100行</option>
-                            <option value="200">每页显示200行</option>
-                            <option value="500">每页显示500行</option>
-                            <option value="1000">每页显示1000行</option>
-                        </select>
-                    </td>
-                </tr>
-                <tr >
-                    <td >
-                        <div class="form-inline">
-                            <select name="owner_id"    class="form-control form-control-sm tooltipTarget "   style="vertical-align: middle;max-width: 100px">
-                                <option value="" class="text-secondary">货主 </option>
-                                <option  class="font-weight-bold"></option>
-                            </select>
-                            <div style="position: relative;">
-                                <button type="button"  style=" max-width: 100px" class="btn btn-sm btn-outline-dark container pull-left">多货主查询</button>
-                            </div>
-                        </div>
-                    </td>
-                    <td >
-                        <input type="text"  placeholder="子项目"
-                               class="form-control form-control-sm  "  style="vertical-align: middle;max-width: 200px" ></td>
-                    <td >
-                        <input type="text"  placeholder="合同号"
-                               class="form-control form-control-sm  "  style="vertical-align: middle;max-width: 200px" ></td>
-                    <td  >
-                        <input type="date" style="max-width: 200px" name="created_at_start" class="form-control form-control-sm "
-                               >
-                    <td colspan="6"></td>
-                </tr>
-                <tr>
-                    <td>
-                        <select name="status"  class="form-control form-control-sm tooltipTarget" style="vertical-align: middle;max-width: 100px" >
-                            <option value="" class="text-secondary">项目小组</option>
-                        </select>
-                    </td>
-                    <td>
-                        <select name="status"  class="form-control form-control-sm tooltipTarget" style="vertical-align: middle;max-width: 100px" >
-                            <option value="" class="text-secondary">激活状态</option>
-                        </select>
-                    </td>
-                    <td>
-                        <input type="text" style="max-width: 200px" class="form-control form-control-sm " placeholder="销售名称">
-                    </td>
-                    <td >
-                        <input type="date" style="max-width: 200px" class="form-control form-control-sm" name="created_at_end"></td>
-                    <td colspan="6"></td>
-                </tr>
-                <tr>
-                    <td colspan="10">
-                        <span class="dropdown">
-                            <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle "
-                                    data-toggle="dropdown" >
-                                导出Excel
-                            </button>
-                            <div class="dropdown-menu">
-                                <a class="dropdown-item" @click="waybillExport(1)" href="javascript:">导出勾选内容</a>
-                                <a class="dropdown-item" @click="waybillExport(2)" href="javascript:">导出所有页</a>
-                            </div>
-                        </span>
-                        <button class="btn btn-sm btn-outline-info ml-1">新增客户</button>
-                    </td>
-                </tr>
-            </table>
-        </form>
-        <table class="table table-sm table-hover table-bordered table-striped text-nowrap m-2">
-            <tr>
-                <th>
-                    <label for="all">
-                        <input id="all" type="checkbox" >全选
-                    </label>
-                </th>
-                <th>序号</th>
-                <th>客户(货主)</th>
-                <th>税率%</th>
-                <th>子项目</th>
-                <th>货主代码</th>
-                <th>合同号</th>
-                <th>创建日期</th>
-                <th>销售姓名</th>
-                <th>公司全称</th>
-                <th class="text-danger">联系人</th>
-                <th class="text-danger">联系电话</th>
-                <th class="text-danger">项目小组</th>
-                <th>关联报价</th>
-                <th>月单量预警</th>
-                <th>是否激活</th>
-                <th>项目描述</th>
-            </tr>
-            <tr>
-                <td>
-                    <input class="checkItem" type="checkbox" >
-                </td>
-                <td>1</td>
-                <td rowspan="3" class="text-center" style="vertical-align: middle">东浩</td>
-                <td rowspan="3" class="text-center" style="vertical-align: middle">6</td>
-                <td>东浩子项目1</td>
-                <td>DONGHAO</td>
-                <td>SH0939028329</td>
-                <td>2020/4/26</td>
-                <td>施尧</td>
-                <td>上海东浩国际贸易有限公司</td>
-                <td>余经理</td>
-                <td>13687646665</td>
-                <td>葛付晖</td>
-                <td></td>
-                <td></td>
-                <td><b  class="font-weight-bold text-info font-italic" style="cursor:pointer;text-decoration: underline;">激活</b></td>
-                <td></td>
-            </tr>
-            <tr>
-                <td>
-                    <input class="checkItem" type="checkbox" >
-                </td>
-                <td>2</td>
-                <td>东浩子项目2</td>
-                <td>DONGHAO</td>
-                <td>SH0939028329</td>
-                <td>2020/4/27</td>
-                <td>施尧</td>
-                <td>上海东浩国际贸易有限公司</td>
-                <td>余经理</td>
-                <td>13687646666</td>
-                <td>邓婷婷</td>
-                <td></td>
-                <td></td>
-                <td><b class="font-weight-bold text-danger font-italic" style="cursor:pointer;text-decoration: underline;">冻结</b></td>
-                <td></td>
-            </tr>
-            <tr>
-                <td>
-                    <input class="checkItem" type="checkbox" >
-                </td>
-                <td>3</td>
-                <td>东浩子项目3</td>
-                <td>DONGHAO</td>
-                <td>SH0939028329</td>
-                <td>2020/4/28</td>
-                <td>施尧</td>
-                <td>上海东浩国际贸易有限公司</td>
-                <td>余经理</td>
-                <td>13687646667</td>
-                <td>张书恒</td>
-                <td></td>
-                <td></td>
-                <td><b  class="font-weight-bold text-info font-italic" style="cursor:pointer;text-decoration: underline;">激活</b></td>
-                <td></td>
-            </tr>
-        </table>
-    </div>
-@endsection

resources/views/client/base/menu.blade.php

@@ -1,16 +0,0 @@
-<div id="nav2">
-    @component('client.menu')
-    @endcomponent
-    <div class="container-fluid nav3">
-        <div class="card menu-third" >
-            <ul class="nav nav-pills">
-                <li class="nav-item">
-                    <a class="nav-link text-dark" href="{{url('client/base')}}" :class="{active:isActive('',3)}">查询</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link text-dark" href="{{url('client/base/create')}}" :class="{active:isActive('create',3)}">添加子项</a>
-                </li>
-            </ul>
-        </div>
-    </div>
-</div>

resources/views/client/billCheck/create.blade.php

@@ -1,47 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-    @component('client.billCheck.menu')@endcomponent
-<form class="card col-md-8 offset-md-2 card-body">
-    <div class="form-inline mt-3">
-        <label class="col-2 text-info">项目小组</label>
-        <select class="form-control col-7">
-            <option></option>
-        </select>
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2 text-info">货主</label>
-        <select class="form-control col-7">
-            <option></option>
-        </select>
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2 text-info">子项目</label>
-        <select class="form-control col-7">
-            <option></option>
-        </select>
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2 text-info">结算月</label>
-        <input class="form-control col-7">
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2">原始账单金额</label>
-        <input class="form-control col-7">
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2 ">账单确认金额</label>
-        <input class="form-control col-7">
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2 ">差额</label>
-        <input class="form-control col-7">
-    </div>
-    <div class="form-group mt-3">
-        <div class="col-7 offset-2">
-            <input type="submit" class="btn btn-success form-control">
-        </div>
-    </div>
-</form>
-@endsection
-

resources/views/client/billCheck/index.blade.php

@@ -1,107 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-    @component('client.billCheck.menu')@endcomponent
-    <div class="card m-2">
-        <form>
-            <table class="table table-sm table-bordered  text-nowrap mb-0" style="background: #fff;min-width: 1500px">
-                <tr>
-                    <td colspan="10">
-                        <select name="paginate"  class="form-control-sm" style="vertical-align: middle">
-                            <option value="50">每页显示50行</option>
-                            <option value="100">每页显示100行</option>
-                            <option value="200">每页显示200行</option>
-                            <option value="500">每页显示500行</option>
-                            <option value="1000">每页显示1000行</option>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="width: 300px">
-                        <div class="form-inline">
-                            <select name="owner_id"    class="form-control form-control-sm tooltipTarget "   style="vertical-align: middle;max-width: 100px" :class="filterData.owner_id?'bg-warning':''">
-                                <option value="" class="text-secondary">货主 </option>
-                                <option  class="font-weight-bold"></option>
-                            </select>
-                            <div style="position: relative;">
-                                <button type="button"  style=" max-width: 100px" class="btn btn-sm btn-outline-dark container pull-left">多货主查询</button>
-                            </div>
-                        </div>
-                    </td>
-                    <td style="width: 300px">
-                            <input class="form-control form-control-sm" placeholder="结算月(示例：202001)" style="max-width: 200px">
-                    </td>
-                    <td style="width: 300px">
-                        <input class="form-control form-control-sm" type="date" style="max-width: 200px">
-                    </td>
-                    <td colspan="7"></td>
-                </tr>
-                <tr>
-                    <td>
-                        <select  name="status"  class="form-control form-control-sm " style="vertical-align: middle;max-width: 100px" >
-                            <option value="" class="text-secondary">子项目</option>
-                        </select>
-                    </td>
-                    <td>
-                        <select name="status"  class="form-control form-control-sm " style="vertical-align: middle;max-width: 100px" >
-                            <option value="" class="text-secondary">项目组</option>
-                        </select>
-                    </td>
-                    <td>
-                        <input class="form-control form-control-sm" type="date" style="max-width: 200px">
-                    </td>
-                    <td colspan="7"></td>
-                </tr>
-                <tr>
-                    <td colspan="10">
-                        <span class="dropdown">
-                            <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle "
-                                    data-toggle="dropdown" >
-                                导出Excel
-                            </button>
-                            <div class="dropdown-menu">
-                                <a class="dropdown-item" @click="waybillExport(1)" href="javascript:">导出勾选内容</a>
-                                <a class="dropdown-item" @click="waybillExport(2)" href="javascript:">导出所有页</a>
-                            </div>
-                        </span>
-                    </td>
-                </tr>
-            </table>
-        </form>
-        <table class="table table-sm table-hover table-bordered table-striped text-nowrap m-2">
-            <tr>
-                <th>
-                    <label for="all">
-                        <input id="all" type="checkbox" >全选
-                    </label>
-                </th>
-                <th>序号</th>
-                <th>项目组</th>
-                <th>货主</th>
-                <th>子项目</th>
-                <th>结算月</th>
-                <th>录入日期</th>
-                <th>原始账单金额</th>
-                <th>账单确认金额</th>
-                <th>差额</th>
-                <th>操作</th>
-            </tr>
-            <tr>
-                <td>
-                    <input class="checkItem" type="checkbox" >
-                </td>
-                <td>1</td>
-                <td>XXX</td>
-                <td>BS</td>
-                <td>东浩子项目1</td>
-                <td class="text-muted">202006</td>
-                <td>2020-06-15 15:06:32</td>
-                <td>200</td>
-                <td>400</td>
-                <td>200</td>
-                <td><button class="btn btn-sm btn-outline-info">确认开票</button></td>
-            </tr>
-        </table>
-    </div>
-@endsection
-

resources/views/client/billCheck/menu.blade.php

@@ -1,16 +0,0 @@
-<div id="nav2">
-    @component('client.menu')
-    @endcomponent
-    <div class="container-fluid nav3">
-        <div class="card menu-third" >
-            <ul class="nav nav-pills">
-                <li class="nav-item">
-                    <a class="nav-link text-dark" href="{{url('client/billCheck')}}" :class="{active:isActive('',3)}">查询</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link text-dark" href="{{url('client/billCheck/create')}}" :class="{active:isActive('create',3)}">录入</a>
-                </li>
-            </ul>
-        </div>
-    </div>
-</div>

resources/views/client/instantBill/index.blade.php

@@ -1,145 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-    @component('client.menu')@endcomponent
-    <div class="card m-2">
-        <form>
-            <table class="table table-sm table-bordered  text-nowrap mb-0" style="background: #fff;min-width: 1500px">
-                <tr>
-                    <td colspan="10">
-                        <select name="paginate"  class="form-control-sm" style="vertical-align: middle">
-                            <option value="50">每页显示50行</option>
-                            <option value="100">每页显示100行</option>
-                            <option value="200">每页显示200行</option>
-                            <option value="500">每页显示500行</option>
-                            <option value="1000">每页显示1000行</option>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="width: 300px">
-                        <select name="owner_id"    class="form-control form-control-sm tooltipTarget "   style="vertical-align: middle;max-width: 100px" :class="filterData.owner_id?'bg-warning':''">
-                            <option value="" class="text-secondary">店铺 </option>
-                            <option  class="font-weight-bold"></option>
-                        </select>
-                    </td>
-                    <td style="width: 300px">
-                        <input class="form-control form-control-sm" placeholder="结算月(示例：202001)" style="max-width: 200px">
-                    </td>
-                    <td style="width: 300px">
-                        <input class="form-control form-control-sm" type="date" style="max-width: 200px">
-                    </td>
-                    <td colspan="7"></td>
-                </tr>
-                <tr>
-                    <td>
-                        <select  name="status"  class="form-control form-control-sm " style="vertical-align: middle;max-width: 100px" >
-                            <option value="" class="text-secondary">作业类型</option>
-                        </select>
-                    </td>
-                    <td style="width: 300px">
-                        <input class="form-control form-control-sm" placeholder="物流单号" style="max-width: 200px">
-                    </td>
-                    <td>
-                        <input class="form-control form-control-sm" type="date" style="max-width: 200px">
-                    </td>
-                    <td colspan="7"></td>
-                </tr>
-                <tr>
-                    <td colspan="10">
-                        <span class="dropdown">
-                            <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle "
-                                    data-toggle="dropdown" >
-                                导出Excel
-                            </button>
-                            <div class="dropdown-menu">
-                                <a class="dropdown-item" @click="waybillExport(1)" href="javascript:">导出勾选内容</a>
-                                <a class="dropdown-item" @click="waybillExport(2)" href="javascript:">导出所有页</a>
-                            </div>
-                        </span>
-                    </td>
-                </tr>
-            </table>
-        </form>
-        <table class="table table-sm table-hover table-bordered table-striped text-nowrap m-2">
-            <tr>
-                <th colspan="2"></th>
-                <th colspan="6" class="text-center" style="background-color: #2894FF"><span class="fa fa-file-text-o m-1"></span>订单信息</th>
-                <th colspan="5" class="text-center" style="background-color: #DAB1D5"><span class="fa fa-truck m-1"></span>物流信息</th>
-                <th colspan="3" class="text-center" style="background-color: #FF5809"><span class="fa fa-rmb m-1"></span>费用信息</th>
-                <th colspan="4" style="background-color: #D8D8D8"></th>
-            </tr>
-            <tr>
-                <th>
-                    <label for="all">
-                        <input id="all" type="checkbox" >全选
-                    </label>
-                </th>
-                <th>序号</th>
-                <th style="background-color: #2894FF">作业日期</th>
-                <th style="background-color: #2894FF">作业类型</th>
-                <th style="background-color: #2894FF">店铺</th>
-                <th style="background-color: #2894FF">发/退/提货单号</th>
-                <th style="background-color: #2894FF">收件人</th>
-                <th style="background-color: #2894FF">电话</th>
-                <th style="background-color: #DAB1D5">物流单号</th>
-                <th style="background-color: #DAB1D5">商品数量</th>
-                <th style="background-color: #DAB1D5">体积</th>
-                <th style="background-color: #DAB1D5">重量</th>
-                <th style="background-color: #DAB1D5">承运商</th>
-                <th style="background-color: #FF5809">操作费</th>
-                <th style="background-color: #FF5809">物流费用</th>
-                <th style="background-color: #FF5809">合计</th>
-                <th style="background-color: #D8D8D8">结算月</th>
-                <th style="background-color: #D8D8D8">当前订单总数</th>
-                <th style="background-color: #D8D8D8">计费总额</th>
-                <th style="background-color: #D8D8D8">平均单费用</th>
-            </tr>
-            <tr>
-                <td>
-                    <input class="checkItem" type="checkbox" >
-                </td>
-                <td>1</td>
-                <td style="background-color: #2894FF">2017/12/6</td>
-                <td style="background-color: #2894FF">发货</td>
-                <td style="background-color: #2894FF">店铺a</td>
-                <td style="background-color: #2894FF">OSS017120023</td>
-                <td style="background-color: #2894FF"></td>
-                <td style="background-color: #2894FF"></td>
-                <td style="background-color: #DAB1D5">32561515</td>
-                <td style="background-color: #DAB1D5">49</td>
-                <td style="background-color: #DAB1D5">3.2</td>
-                <td style="background-color: #DAB1D5">5</td>
-                <td style="background-color: #DAB1D5">中通</td>
-                <td style="background-color: #FF5809">200</td>
-                <td style="background-color: #FF5809">736</td>
-                <td style="background-color: #FF5809">936</td>
-                <td style="background-color: #D8D8D8;vertical-align: middle" rowspan="2" class="text-center">202003</td>
-                <td style="background-color: #D8D8D8;vertical-align: middle" rowspan="2" class="text-center">2654</td>
-                <td style="background-color: #D8D8D8;vertical-align: middle" rowspan="2" class="text-center">36651</td>
-                <td style="background-color: #D8D8D8;vertical-align: middle" rowspan="2" class="text-center">13.842415</td>
-            </tr>
-            <tr>
-                <td>
-                    <input class="checkItem" type="checkbox" >
-                </td>
-                <td>2</td>
-                <td style="background-color: #2894FF">2017/12/6</td>
-                <td style="background-color: #2894FF">发货</td>
-                <td style="background-color: #2894FF">店铺a</td>
-                <td style="background-color: #2894FF">OSS017120023</td>
-                <td style="background-color: #2894FF"></td>
-                <td style="background-color: #2894FF"></td>
-                <td style="background-color: #DAB1D5">32561515</td>
-                <td style="background-color: #DAB1D5">49</td>
-                <td style="background-color: #DAB1D5">3.2</td>
-                <td style="background-color: #DAB1D5"></td>
-                <td style="background-color: #DAB1D5">中通</td>
-                <td style="background-color: #FF5809">200</td>
-                <td style="background-color: #FF5809">736</td>
-                <td style="background-color: #FF5809">936</td>
-            </tr>
-        </table>
-    </div>
-@endsection
-

resources/views/client/menu.blade.php

@@ -1,28 +0,0 @@
-
-<div class="container-fluid nav2" id="nav2">
-    <div class="card">
-        <ul class="nav nav-pills">
-            <li class="nav-item">
-                <a class="nav-link" href="{{url('client/base')}}" :class="{active:isActive('base',2)}">基础资料</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{url('client/areaCheck')}}" :class="{active:isActive('areaCheck',2)}">面积盘点</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{url('client/billCheck')}}" :class="{active:isActive('billCheck',2)}">账单确认</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{url('client/performanceReport')}}" :class="{active:isActive('performanceReport',2)}">绩效报表</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{url('client/instantBill')}}" :class="{active:isActive('instantBill',2)}">即时账单</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{url('client/valueAddedService')}}" :class="{active:isActive('valueAddedService',2)}">增值服务</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link text-muted" href="{{url('client/relating')}}" :class="{active:isActive('relating',2)}">相关设置</a>
-            </li>
-        </ul>
-    </div>
-</div>

resources/views/client/menuRelating.blade.php

@@ -1,28 +0,0 @@
-<div class="container-fluid nav3">
-    <div class="card" >
-        <ul class="nav">
-
-            <li class="nav-item">
-                <a class="nav-link text-dark" href="{{url('maintenance/priceModel/storage')}}" :class="{active:isActive('storage',3)}">仓储费计价模型</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link text-dark" href="{{url('maintenance/priceModel/task')}}" :class="{active:isActive('task',3)}">作业费计价模型</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link text-dark" href="{{url('maintenance/priceModel/expressage')}}" :class="{active:isActive('expressage',3)}">快递费计价模型</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link text-dark" href="{{url('maintenance/priceModel/logistic')}}" :class="{active:isActive('logistic',3)}">物流费计价模型</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link text-dark" href="{{url('maintenance/priceModel/Nonstop')}}" :class="{active:isActive('Nonstop',3)}">直发车计价模型</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link text-dark" href="{{url('maintenance/jobType')}}" :class="{active:isActive('jobType',2)}">类型</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link text-dark" href="{{url('maintenance/unit')}}" :class="{active:isActive('unit',3)}">单位</a>
-            </li>
-        </ul>
-    </div>
-</div>

resources/views/client/performanceReport/index.blade.php

@@ -1,154 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-    @component('client.menu')@endcomponent
-    <div class="card m-2">
-        <form>
-            <table class="table table-sm table-bordered  text-nowrap mb-0" style="background: #fff;min-width: 1500px">
-                <tr>
-                    <td colspan="10">
-                        <select name="paginate"  class="form-control-sm" style="vertical-align: middle">
-                            <option value="50">每页显示50行</option>
-                            <option value="100">每页显示100行</option>
-                            <option value="200">每页显示200行</option>
-                            <option value="500">每页显示500行</option>
-                            <option value="1000">每页显示1000行</option>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="width: 300px">
-                        <div class="form-inline">
-                            <select name="owner_id"    class="form-control form-control-sm tooltipTarget "   style="vertical-align: middle;max-width: 100px" :class="filterData.owner_id?'bg-warning':''">
-                                <option value="" class="text-secondary">货主 </option>
-                                <option  class="font-weight-bold"></option>
-                            </select>
-                            <div style="position: relative;">
-                                <button type="button"  style=" max-width: 100px" class="btn btn-sm btn-outline-dark container pull-left">多货主查询</button>
-                            </div>
-                        </div>
-                    </td>
-                    <td style="width: 300px">
-                            <input class="form-control form-control-sm" placeholder="结算月(示例：202001)" style="max-width: 200px">
-                    </td>
-                    <td style="width: 300px">
-                        <select    class="form-control form-control-sm " style="vertical-align: middle;max-width: 100px" >
-                            <option value="" class="text-secondary">子项目</option>
-                        </select>
-                    </td>
-                    <td style="width: 300px">
-                        <select   class="form-control form-control-sm " style="vertical-align: middle;max-width: 100px" >
-                            <option value="" class="text-secondary">项目组</option>
-                        </select>
-                    </td>
-                    <td colspan="6"></td>
-                </tr>
-                <tr>
-                    <td colspan="10">
-                        <span class="dropdown">
-                            <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle "
-                                    data-toggle="dropdown" >
-                                导出Excel
-                            </button>
-                            <div class="dropdown-menu">
-                                <a class="dropdown-item" @click="waybillExport(1)" href="javascript:">导出勾选内容</a>
-                                <a class="dropdown-item" @click="waybillExport(2)" href="javascript:">导出所有页</a>
-                            </div>
-                        </span>
-                    </td>
-                </tr>
-            </table>
-        </form>
-        <table class="table table-sm table-hover table-bordered table-striped text-nowrap m-2">
-            <tr>
-                <th >
-                    <label for="all">
-                        <input id="all" type="checkbox" >全选
-                    </label>
-                </th>
-                <th style="background-color: #D2B48C">项目小组</th>
-                <th style="background-color: #D2B48C">客户(货主)</th>
-                <th style="background-color: #D2B48C">子项目</th>
-                <th style="background-color: #D2B48C">状态</th>
-                <th style="background-color: #D2B48C">创建日期</th>
-                <th style="background-color: #D2B48C">在库时长</th>
-                <th style="background-color: #6A5ACD">结算月</th>
-                <th style="background-color: #6A5ACD">日均单量</th>
-                <th style="background-color: #6A5ACD">上月盘点面积</th>
-                <th style="background-color: #6A5ACD">本月盘点面积</th>
-                <th style="background-color: #FF7F50">初始账单金额</th>
-                <th style="background-color: #FF7F50">账单确认金额</th>
-                <th style="background-color: #FF7F50">账单确认日期</th>
-            </tr>
-            <tr>
-                <td >
-                    <input class="checkItem" type="checkbox" >
-                </td>
-                <td rowspan="4" class="text-center" style="vertical-align: middle;background-color: #D2B48C" >项目小组A</td>
-                <td style="background-color: #D2B48C">货主A</td>
-                <td style="background-color: #D2B48C">子项目1</td>
-                <td style="background-color: #D2B48C">激活</td>
-                <td style="background-color: #D2B48C">2018.07.06</td>
-                <td style="background-color: #D2B48C">458天</td>
-                <td style="background-color: #6A5ACD">202003</td>
-                <td style="background-color: #6A5ACD">55</td>
-                <td style="background-color: #6A5ACD">695</td>
-                <td style="background-color: #6A5ACD">695</td>
-                <td style="background-color: #FF7F50"></td>
-                <td style="background-color: #FF7F50">100000</td>
-                <td style="background-color: #FF7F50"></td>
-            </tr>
-            <tr>
-                <td >
-                    <input class="checkItem" type="checkbox" >
-                </td>
-                <td rowspan="2"  style="vertical-align: middle;background-color: #D2B48C">货主B</td>
-                <td style="background-color: #D2B48C">子项目1</td>
-                <td style="background-color: #D2B48C">激活</td>
-                <td style="background-color: #D2B48C">2018.07.06</td>
-                <td style="background-color: #D2B48C">458天</td>
-                <td style="background-color: #6A5ACD">202003</td>
-                <td style="background-color: #6A5ACD">778</td>
-                <td style="background-color: #6A5ACD">7878</td>
-                <td style="background-color: #6A5ACD">45</td>
-                <td style="background-color: #FF7F50"></td>
-                <td style="background-color: #FF7F50"></td>
-                <td style="background-color: #FF7F50"></td>
-            </tr>
-            <tr>
-                <td >
-                    <input class="checkItem" type="checkbox" >
-                </td>
-                <td style="background-color: #D2B48C">子项目2</td>
-                <td style="background-color: #D2B48C">冻结</td>
-                <td style="background-color: #D2B48C">2018.07.06</td>
-                <td style="background-color: #D2B48C">458天</td>
-                <td style="background-color: #6A5ACD">258</td>
-                <td style="background-color: #6A5ACD">98</td>
-                <td style="background-color: #6A5ACD">456</td>
-                <td style="background-color: #6A5ACD">45</td>
-                <td style="background-color: #FF7F50"></td>
-                <td style="background-color: #FF7F50"></td>
-                <td style="background-color: #FF7F50"></td>
-            </tr>
-            <tr>
-                <td >
-                    <input class="checkItem" type="checkbox" >
-                </td>
-                <td style="background-color: #D2B48C">货主C</td>
-                <td style="background-color: #D2B48C">子项目1</td>
-                <td style="background-color: #D2B48C">冻结</td>
-                <td style="background-color: #D2B48C">2018.07.06</td>
-                <td style="background-color: #D2B48C">458天</td>
-                <td style="background-color: #6A5ACD">8</td>
-                <td style="background-color: #6A5ACD">75</td>
-                <td style="background-color: #6A5ACD">12</td>
-                <td style="background-color: #6A5ACD">24</td>
-                <td style="background-color: #FF7F50"></td>
-                <td style="background-color: #FF7F50"></td>
-                <td style="background-color: #FF7F50"></td>
-            </tr>
-        </table>
-    </div>
-@endsection
-

resources/views/client/relating.blade.php

@@ -1,9 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-    <div id="nav2">
-    @component('client.menu')@endcomponent
-    @component('client.menuRelating')@endcomponent
-    </div>
-@endsection
-

resources/views/client/valueAddedService/create.blade.php

@@ -1,41 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-    @component('client.valueAddedService.menu')@endcomponent
-<form class="card col-md-8 offset-md-2 card-body">
-    <div class="form-inline mt-3">
-        <label class="col-2 text-info">货主</label>
-        <select class="form-control col-7">
-            <option></option>
-        </select>
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2 text-info">子项目</label>
-        <select class="form-control col-7">
-            <option></option>
-        </select>
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2 text-info">类型</label>
-        <select class="form-control col-7">
-            <option></option>
-        </select>
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2 text-info">单位</label>
-        <select class="form-control col-7">
-            <option></option>
-        </select>
-    </div>
-    <div class="form-inline mt-3">
-        <label class="col-2">单价</label>
-        <input class="form-control col-7">
-    </div>
-    <div class="form-group mt-3">
-        <div class="col-7 offset-2">
-            <input type="submit" class="btn btn-success form-control">
-        </div>
-    </div>
-</form>
-@endsection
-

resources/views/client/valueAddedService/index.blade.php

@@ -1,51 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-    @component('client.valueAddedService.menu')@endcomponent
-    <div class="card m-2">
-        <table class="table table-sm table-hover table-bordered table-striped text-nowrap m-2">
-            <tr>
-                <th>货主名</th>
-                <th>子项目</th>
-                <th>类型</th>
-                <th>单位</th>
-                <th>单价</th>
-                <th>操作</th>
-            </tr>
-            <tr>
-                <td rowspan="4" style="vertical-align: middle">货主1</td>
-                <td rowspan="3" style="vertical-align: middle">子项目1</td>
-                <td>卸货费</td>
-                <td>T/m³</td>
-                <td>5.8</td>
-                <td>
-                    <button class="btn btn-sm btn-outline-info">改</button>
-                    <button class="btn btn-sm btn-outline-danger">删</button>
-                </td>
-            </tr>
-            <tr>
-                <td>集装箱掏箱费</td>
-                <td>个</td>
-                <td>200</td>
-                <td><button class="btn btn-sm btn-outline-info">改</button>
-                    <button class="btn btn-sm btn-outline-danger">删</button></td>
-            </tr>
-            <tr>
-                <td>打托</td>
-                <td>个</td>
-                <td>500</td>
-                <td><button class="btn btn-sm btn-outline-info">改</button>
-                    <button class="btn btn-sm btn-outline-danger">删</button></td>
-            </tr>
-            <tr>
-                <td>子项目2</td>
-                <td>贴标/制标</td>
-                <td>件</td>
-                <td>0.8</td>
-                <td><button class="btn btn-sm btn-outline-info">改</button>
-                    <button class="btn btn-sm btn-outline-danger">删</button></td>
-            </tr>
-        </table>
-    </div>
-@endsection
-

resources/views/client/valueAddedService/menu.blade.php

@@ -1,16 +0,0 @@
-<div id="nav2">
-    @component('client.menu')
-    @endcomponent
-    <div class="container-fluid nav3">
-        <div class="card menu-third" >
-            <ul class="nav nav-pills">
-                <li class="nav-item">
-                    <a class="nav-link text-dark" href="{{url('client/valueAddedService')}}" :class="{active:isActive('',3)}">查询</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link text-dark" href="{{url('client/valueAddedService/create')}}" :class="{active:isActive('create',3)}">录入</a>
-                </li>
-            </ul>
-        </div>
-    </div>
-</div>

resources/views/maintenance/priceModel/create.blade.php

@@ -1,53 +0,0 @@
-@extends('layouts.app')
-@section('title')录入计价模型@endsection
-@section('content')
-<span id="nav2">
-    @component('maintenance.menu')@endcomponent
-    @component('maintenance.priceModel.menu')@endcomponent
-</span>
-
-<div class="col col-md-8 offset-2 card card-body mt-3">
-    <form >
-        <div  class="form-group row">
-            <div class="col-8 offset-2">
-                <button class="btn btn-outline-info">承运商</button>
-                <button class="btn btn-info">仓储费</button>
-                <button class="btn btn-outline-info">作业费</button>
-                <button class="btn btn-outline-info">快递费</button>
-                <button class="btn btn-outline-info">物流费</button>
-                <button class="btn btn-outline-info">直发车</button>
-            </div>
-        </div>
-        <div class="form-group row">
-            <label class="col-2">项目</label>
-            <input class="form-control col-8">
-        </div>
-        <div class="form-group row">
-            <label class="col-2">用仓类型</label>
-            <input class="form-control col-8">
-        </div>
-        <div class="form-group row">
-            <label class="col-2">最低起租面积</label>
-            <input class="form-control col-8">
-        </div>
-        <div class="form-group row">
-            <label class="col-2">单价</label>
-            <input class="form-control col-8">
-        </div>
-        <div class="form-group row">
-            <label class="col-2">减免类型</label>
-            <input class="form-control col-8">
-        </div>
-        <div class="form-group row">
-            <label class="col-2">减免方法</label>
-            <input class="form-control col-8">
-        </div>
-        <div class="form-group row">
-            <div class="col-7 offset-2">
-                <input type="submit" class="btn btn-success form-control">
-            </div>
-        </div>
-    </form>
-</div>
-
-@endsection

resources/views/maintenance/priceModel/expressage/index.blade.php

@@ -1,199 +0,0 @@
-
-@extends('layouts.app')
-@section('title')仓储价格模型@endsection
-
-@section('content')
-    <div id="list">
-        <span id="nav2">
-            @component('maintenance.menu')@endcomponent
-            @component('maintenance.priceModel.menu')@endcomponent
-        </span>
-        <span class="dropdown ml-3">
-            <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget mt-2"
-                    data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
-                导出Excel
-            </button>
-            <div class="dropdown-menu">
-                <a class="dropdown-item">导出勾选内容</a>
-                <a class="dropdown-item">导出所有页</a>
-            </div>
-        </span>
-        <table class="table table-sm table-hover table-bordered table-striped text-nowrap m-2" >
-            <tr>
-                <th>
-                    <label for="all">
-                        <input id="all" type="checkbox" >全选
-                    </label>
-                </th>
-                <th>序号</th>
-                <th>价格编号</th>
-                <th>客户(货主)</th>
-                <th>首重(kg)</th>
-                <th>续重(续重单位)</th>
-                <th>承运商</th>
-                <th>操作</th>
-            </tr>
-            <tr>
-                <td>
-                    <input class="checkItem" type="checkbox" >
-                </td>
-                <td>1</td>
-                <td rowspan="2" style="vertical-align: middle">
-                    <b data-toggle="modal" data-target="#staticBackdrop"
-                       style="cursor: pointer;color: #4aa0e6;text-decoration: underline">SHKD20092201</b>
-                </td>
-                <td>项目1</td>
-                <td>3</td>
-                <td>1</td>
-                <td>圆通</td>
-                <td>
-                    <button class="btn btn-sm btn-outline-info">改</button>
-                    <button class="btn btn-sm btn-outline-danger">删</button>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input class="checkItem" type="checkbox" >
-                </td>
-                <td>2</td>
-                <td>项目2</td>
-                <td>2</td>
-                <td>1.5</td>
-                <td>中通</td>
-                <td>
-                    <button class="btn btn-sm btn-outline-info">改</button>
-                    <button class="btn btn-sm btn-outline-danger">删</button>
-                </td>
-            </tr>
-        </table>
-
-        <!-- Modal -->
-        <div class="modal fade" id="staticBackdrop"  tabindex="-1" role="dialog"  >
-            <div class="modal-dialog modal-dialog-centered modal-dialog-scrollable">
-                <div class="modal-content" style="max-height: 500px;overflow-y:scroll; overflow-x:hidden;">
-                    <div class="modal-header form-inline ">
-                        <label class="text-center text-primary">SHKD20092201
-                            <input placeholder="省" class="form-control form-control-sm ml-2" style="max-width: 100px;">
-                        </label>
-
-                    </div>
-                    <table class="table table-sm m-2 table-striped table-hover">
-                        <tr>
-                            <th>省</th>
-                            <th>首重单价</th>
-                            <th>续重单价</th>
-                            <th>操作</th>
-                        </tr>
-                        <tr class="text-success font-weight-bold" {{--使用MAP进行哈希对比--}}>
-                            <td>上海</td>
-                            <td>4</td>
-                            <td>1</td>
-                            <td>
-                                <button class="btn btn-sm btn-outline-info">改</button>
-                                <button class="btn btn-sm btn-outline-danger">删</button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>浙江</td>
-                            <td>4</td>
-                            <td>1</td>
-                            <td>
-                                <button class="btn btn-sm btn-outline-info">改</button>
-                                <button class="btn btn-sm btn-outline-danger">删</button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>江苏</td>
-                            <td>4</td>
-                            <td>1</td>
-                            <td>
-                                <button class="btn btn-sm btn-outline-info">改</button>
-                                <button class="btn btn-sm btn-outline-danger">删</button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>安徽</td>
-                            <td>4</td>
-                            <td>1</td>
-                            <td>
-                                <button class="btn btn-sm btn-outline-info">改</button>
-                                <button class="btn btn-sm btn-outline-danger">删</button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>北京</td>
-                            <td>4.5</td>
-                            <td>3</td>
-                            <td>
-                                <button class="btn btn-sm btn-outline-info">改</button>
-                                <button class="btn btn-sm btn-outline-danger">删</button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>天津</td>
-                            <td>4.5</td>
-                            <td>3</td>
-                            <td>
-                                <button class="btn btn-sm btn-outline-info">改</button>
-                                <button class="btn btn-sm btn-outline-danger">删</button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>天津</td>
-                            <td>4.5</td>
-                            <td>3</td>
-                            <td>
-                                <button class="btn btn-sm btn-outline-info">改</button>
-                                <button class="btn btn-sm btn-outline-danger">删</button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>天津</td>
-                            <td>4.5</td>
-                            <td>3</td>
-                            <td>
-                                <button class="btn btn-sm btn-outline-info">改</button>
-                                <button class="btn btn-sm btn-outline-danger">删</button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>天津</td>
-                            <td>4.5</td>
-                            <td>3</td>
-                        </tr>
-                        <tr>
-                            <td>天津</td>
-                            <td>4.5</td>
-                            <td>3</td>
-                        </tr>              <tr>
-                            <td>天津</td>
-                            <td>4.5</td>
-                            <td>3</td>
-                        </tr>
-                        <tr>
-                            <td>天津</td>
-                            <td>4.5</td>
-                            <td>3</td>
-                        </tr>
-                        <tr>
-                            <td>河北</td>
-                            <td>4.5</td>
-                            <td>3</td>
-                        </tr>
-                        <tr>
-                            <td>河北</td>
-                            <td>4.5</td>
-                            <td>3</td>
-                        </tr>
-                        <tr>
-                            <td>河北</td>
-                            <td>4.5</td>
-                            <td>3</td>
-                        </tr>
-
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-@endsection

resources/views/maintenance/priceModel/import.blade.php

@@ -1,66 +0,0 @@
-@extends('layouts.app')
-@section('title')导入计价模型@endsection
-
-@section('content')
-    <div id="nav2">
-        @component('maintenance.menu')@endcomponent
-        @component('maintenance.priceModel.menu')@endcomponent
-    </div>
-    <div class="container-fluid">
-        <div class="card col-md-8 offset-md-2">
-            <div class="card-body">
-                <form method="POST" action="{{ url('waybillPriceModel/excel/import') }}" enctype="multipart/form-data" target="_blank">
-                    <div  class="form-group row">
-                        <div class="col-8 offset-2">
-                            <button class="btn btn-info">承运商</button>
-                            <button class="btn btn-outline-info">快递费</button>
-                            <button class="btn btn-outline-info">物流费</button>
-                            <button class="btn btn-outline-info">直发车</button>
-                        </div>
-                    </div>
-                    @csrf
-                    <div class="form-group row text-center">
-                        <div class="col-12 text-danger">
-
-                            注意：请保证表第一行有以下对应的字段名<br>(可不按顺序,承运商，计数单位，省份，单价为必填项，其余字段不填或填入错误数据则导入默认值0)：<br>
-                            承运商，计数单位，计数区间，省份，单价，市，起步费，最低计数<br>
-                        </div>
-                        <div class="col-12 text-info ">
-                            导入时间随文件大小可能达数十分钟以上，请耐心等候
-                            <hr>
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label for="sku" class="col-2 col-form-label text-right">选择EXCEL</label>
-                        <div class="col-8">
-                            <div class="form-control">
-                                <input type="file" class="form-control-file @error('file') is-invalid @enderror"
-                                       name="file" value="{{ old('file') }}" required>
-                                @error('file')
-                                <span class="invalid-feedback" role="alert">
-                                <strong>{{ $message }}</strong>
-                            </span>
-                                @enderror
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label for="sku" class="col-2 col-form-label text-right">是否覆盖</label>
-                        <div class="col-8">
-                            <select name="isOverride" id="isOverride" class="form-control" >
-                                <option value="0">仅新增</option>
-                                <option value="1">新增且覆盖</option>
-                            </select>
-                            <p class="text-muted">覆盖会以承运商，计数单位，计数区间，省份为依据，覆盖其余字段</p>
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <div class="col-8 offset-2">
-                            <input type="submit" class="btn btn-success form-control" value="执行导入">
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
-@endsection

resources/views/maintenance/priceModel/logistic/index.blade.php

@@ -1,57 +0,0 @@
-
-@extends('layouts.app')
-@section('title')仓储价格模型@endsection
-
-@section('content')
-    <div id="list">
-        <span id="nav2">
-            @component('maintenance.menu')@endcomponent
-            @component('maintenance.priceModel.menu')@endcomponent
-        </span>
-        <table class="table table-sm table-hover table-bordered table-striped text-nowrap m-2">
-            <tr>
-                <th>价格名称</th>
-                <th>价格编号</th>
-                <th>项目</th>
-                <th>单位1</th>
-                <th>单位2</th>
-                <th>提货费</th>
-                <th>燃油附加费</th>
-                <th>信息服务费</th>
-                <th>承运商</th>
-                <th>操作</th>
-            </tr>
-            <tr>
-                <td rowspan="3" style="vertical-align: middle">快递价格1</td>
-                <td rowspan="3" style="vertical-align: middle">SHKD20092201</td>
-                <td>项目1</td>
-                <td rowspan="3" style="vertical-align: middle">T</td>
-                <td rowspan="3" style="vertical-align: middle">m3</td>
-                <td rowspan="3" style="vertical-align: middle">0</td>
-                <td rowspan="3" style="vertical-align: middle">9</td>
-                <td rowspan="3" style="vertical-align: middle">6</td>
-                <td>圆通</td>
-                <td>
-                    <button class="btn btn-sm btn-outline-info">改</button>
-                    <button class="btn btn-sm btn-outline-danger">删</button>
-                </td>
-            </tr>
-            <tr>
-                <td>项目2</td>
-                <td>中通</td>
-                <td>
-                    <button class="btn btn-sm btn-outline-info">改</button>
-                    <button class="btn btn-sm btn-outline-danger">删</button>
-                </td>
-            </tr>
-            <tr>
-                <td>项目3</td>
-                <td>韵达</td>
-                <td>
-                    <button class="btn btn-sm btn-outline-info">改</button>
-                    <button class="btn btn-sm btn-outline-danger">删</button>
-                </td>
-            </tr>
-        </table>
-    </div>
-@endsection

resources/views/maintenance/priceModel/menu.blade.php

@@ -1,31 +0,0 @@
-
-<div class="container-fluid nav3">
-    <div class="card menu-third" >
-        <ul class="nav nav-pills">
-            <li class="nav-item">
-                <a class="nav-link" href="{{url('maintenance/waybillPriceModel')}}" :class="{active:isActive('',3)}">承运商</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{url('maintenance/priceModel/storage')}}" :class="{active:isActive('storage',3)}">仓储费</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{url('maintenance/priceModel/task')}}" :class="{active:isActive('task',3)}">作业费</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{url('maintenance/priceModel/expressage')}}" :class="{active:isActive('expressage',3)}">快递费</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{url('maintenance/priceModel/logistic')}}" :class="{active:isActive('logistic',3)}">物流费</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href='{{url('maintenance/priceModel/nonstop')}}' :class="{active:isActive('nonstop',3)}">直发车</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link text-muted" href='{{url('maintenance/priceModel/create')}}' :class="{active:isActive('create',3)}">录入</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link text-muted" href='{{url('maintenance/priceModel/import')}}' :class="{active:isActive('import',3)}">导入</a>
-            </li>
-        </ul>
-    </div>
-</div>

resources/views/maintenance/priceModel/nonstop/index.blade.php

@@ -1,126 +0,0 @@
-
-@extends('layouts.app')
-@section('title')仓储价格模型@endsection
-
-@section('content')
-    <div id="list">
-        <span id="nav2">
-            @component('maintenance.menu')@endcomponent
-            @component('maintenance.priceModel.menu')@endcomponent
-        </span>
-        <table class="table table-sm table-hover table-bordered table-striped text-nowrap m-2">
-            <tr>
-                <th>价格名称</th>
-                <th>价格编号</th>
-                <th>项目</th>
-                <th>起步公里数</th>
-                <th>承运商</th>
-                <th>操作</th>
-            </tr>
-            <tr>
-                <td>直发车价格1</td>
-                <td style="vertical-align: middle">
-                    <b data-toggle="modal" data-target="#staticBackdrop"
-                       style="cursor: pointer;color: #4aa0e6;text-decoration: underline">SHKD20092201</b>
-                </td>
-                <td>项目1</td>
-                <td>10</td>
-                <td>宝时直发车，宝时直发车到付</td>
-                <td>
-                    <button class="btn btn-sm btn-outline-info">改</button>
-                    <button class="btn btn-sm btn-outline-danger">删</button>
-                </td>
-            </tr>
-        </table>
-        <!-- Modal -->
-        <div class="modal fade" id="staticBackdrop"  tabindex="-1" role="dialog"  >
-            <div class="modal-dialog modal-dialog-centered modal-dialog-scrollable">
-                <div class="modal-content" style="max-height: 500px;overflow-y:scroll; overflow-x:hidden;">
-                    <div class="modal-header form-inline">
-                        <label class="text-center text-primary  m-auto">SHKD20092201</label>
-                    </div>
-                    <table class="table table-sm m-2 table-striped table-hover">
-                        <tr>
-                            <th>车型</th>
-                            <th>起步费</th>
-                            <th>续费(元/KM)</th>
-                            <th>操作</th>
-                        </tr>
-                        <tr>
-                            <td>面包车</td>
-                            <td>140</td>
-                            <td>6</td>
-                            <td>
-                                <button class="btn btn-sm btn-outline-info">改</button>
-                                <button class="btn btn-sm btn-outline-danger">删</button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>金杯车</td>
-                            <td>4</td>
-                            <td>1</td>
-                            <td>
-                                <button class="btn btn-sm btn-outline-info">改</button>
-                                <button class="btn btn-sm btn-outline-danger">删</button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>依维柯</td>
-                            <td>4</td>
-                            <td>1</td>
-                            <td>
-                                <button class="btn btn-sm btn-outline-info">改</button>
-                                <button class="btn btn-sm btn-outline-danger">删</button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>4.2米箱车</td>
-                            <td>4</td>
-                            <td>1</td>
-                            <td>
-                                <button class="btn btn-sm btn-outline-info">改</button>
-                                <button class="btn btn-sm btn-outline-danger">删</button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>6.8米箱车</td>
-                            <td>4.5</td>
-                            <td>3</td>
-                            <td>
-                                <button class="btn btn-sm btn-outline-info">改</button>
-                                <button class="btn btn-sm btn-outline-danger">删</button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>8米</td>
-                            <td>4.5</td>
-                            <td>3</td>
-                            <td>
-                                <button class="btn btn-sm btn-outline-info">改</button>
-                                <button class="btn btn-sm btn-outline-danger">删</button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>9.6米箱车</td>
-                            <td>4.5</td>
-                            <td>3</td>
-                            <td>
-                                <button class="btn btn-sm btn-outline-info">改</button>
-                                <button class="btn btn-sm btn-outline-danger">删</button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>13米5箱车</td>
-                            <td>4.5</td>
-                            <td>3</td>
-                            <td>
-                                <button class="btn btn-sm btn-outline-info">改</button>
-                                <button class="btn btn-sm btn-outline-danger">删</button>
-                            </td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-@endsection

resources/views/maintenance/priceModel/storage/index.blade.php

@@ -1,49 +0,0 @@
-
-@extends('layouts.app')
-@section('title')仓储价格模型@endsection
-
-@section('content')
-    <div id="list">
-        <span id="nav2">
-            @component('maintenance.menu')@endcomponent
-            @component('maintenance.priceModel.menu')@endcomponent
-        </span>
-        <table class="table table-sm table-hover table-bordered table-striped text-nowrap m-2">
-            <tr>
-                <th>项目</th>
-                <th>计费类型</th>
-                <th>用仓类型</th>
-                <th>最低起租面积</th>
-                <th>单价</th>
-                <th>减免类型</th>
-                <th>减免方法</th>
-                <th>操作</th>
-            </tr>
-            <tr>
-                <td rowspan="2" style="vertical-align: middle">项目1</td>
-                <td>包仓1</td>
-                <td>常温</td>
-                <td>14/m²</td>
-                <td>1.4</td>
-                <td>无减免</td>
-                <td>/</td>
-                <td>
-                    <button class="btn btn-sm btn-outline-info">改</button>
-                    <button class="btn btn-sm btn-outline-danger">删</button>
-                </td>
-            </tr>
-            <tr>
-                <td>包仓1</td>
-                <td>常温</td>
-                <td>10/m²</td>
-                <td>1.4</td>
-                <td>无减免</td>
-                <td>/</td>
-                <td>
-                    <button class="btn btn-sm btn-outline-info">改</button>
-                    <button class="btn btn-sm btn-outline-danger">删</button>
-                </td>
-            </tr>
-        </table>
-    </div>
-@endsection

resources/views/maintenance/priceModel/task/index.blade.php

@@ -1,47 +0,0 @@
-
-@extends('layouts.app')
-@section('title')仓储价格模型@endsection
-
-@section('content')
-    <div id="list">
-        <span id="nav2">
-            @component('maintenance.menu')@endcomponent
-            @component('maintenance.priceModel.menu')@endcomponent
-        </span>
-        <table class="table table-sm table-hover table-bordered table-striped text-nowrap m-2">
-            <tr>
-                <th>类型</th>
-                <th>计费策略</th>
-                <th>作业费类型</th>
-                <th>费用名称</th>
-                <th>起步数</th>
-                <th>单位</th>
-                <th>单价</th>
-                <th>特征类型</th>
-                <th colspan="2" class="text-center">字段特征</th>
-            </tr>
-            <tr>
-                <td rowspan="2" style="vertical-align: middle">出库</td>
-                <td>默认</td>
-                <td>订单起步费1</td>
-                <td rowspan="2" style="vertical-align: middle">B2C订单处理费</td>
-                <td>起步数</td>
-                <td>件</td>
-                <td>2.5</td>
-                <td>/</td>
-                <td>/</td>
-                <td>/</td>
-            </tr>
-            <tr>
-                <td>默认</td>
-                <td>订单起步费1</td>
-                <td>起步数</td>
-                <td>件</td>
-                <td>2.5</td>
-                <td>/</td>
-                <td>/</td>
-                <td>/</td>
-            </tr>
-        </table>
-    </div>
-@endsection

resources/views/maintenance/tutorial/show.blade.php

@@ -23,7 +23,6 @@
                 content:{!! $tutorial !!},
             },
             mounted(){
-                console.log(this.content.trix_rich_text.content);
             }
         });
     </script>

resources/views/order/index/delivering.blade.php

@@ -61,6 +61,7 @@
                                     <option value="">快递获取标记</option>
                                     <option value="Y">是</option>
                                     <option value="N">否</option>
+                                    <option value="W">错误</option>
                                 </select>
                             </td>
                         </tr>
@@ -196,7 +197,7 @@
                         <td class="text-muted">@{{ order.c_address1 }}</td>
                         <td class="text-nowrap">@{{ order.waveno }}</td>
                         <td class="text-nowrap"> @{{ order.warehouseid }}</td>
-                        <td class="text-nowrap"><span v-if="order.edisendflag2=='Y'">是</span><span v-else>否</span></td>
+                        <td class="text-nowrap"><span v-if="order.edisendflag2=='Y'">是</span><span v-if="order.edisendflag2=='N'">否</span><span v-if="order.edisendflag2=='W'">错误</span></td>
                         <td class="text-nowrap">@{{ order.edisendtime2 }}</td>
                         <td colspan="5" class="text-center">
                             <table v-if="commodities[order.orderno]&&commodities[order.orderno].length==1 || isBtn[order.orderno]" class="table text-nowrap table-sm">

resources/views/personnel/laborReport/index.blade.php

@@ -112,7 +112,7 @@
                             <td >
                                 @can('人事管理-门卫审核')
                                  <span >
-                                <b v-if="laborReport.userDutyCheckVerifyUserId"  class="text-success">已审核</b>
+                                <b v-if="laborReport.userDutyCheckVerifyUserId"  class="text-success">门卫已审核</b>
                                 <button v-else class="btn btn-sm btn-outline-secondary"  @click="guardClockAudit(laborReport.userDutyCheckId,laborReport.userDutyCheckType)">门卫审核</button>
                                 </span>
                                 @else

resources/views/process/index.blade.php

@@ -254,7 +254,7 @@
                     <th>提交日期</th>
                     <th style="min-width: 200px">单据类型</th>
                     <th style="min-width: 200px">单据号</th>
-                    <th style="min-width: 200px">本单数量</th>
+                    <th style="min-width: 100px">本单数量</th>
                     <th style="min-width: 200px">商品条码</th>
                     <th style="min-width: 200px">商品名称 </th>
                     <th>备注</th>
@@ -374,8 +374,8 @@
                             <tr v-for="processesContent in processOne.processesContents"
                                 v-if="processOne.is_multi_row || !processOne.id ? !processOne.id  ? processesContent.type=='成品单' :processesContent.type=='原料单' : true">
                                 <td style="width: 190px" class="text-muted" :class="processesContent.type=='原料单'?'td-warm':'td-cool'">@{{ processesContent.bill_type }} <span style="opacity: 0.75">(@{{ processesContent.type }})</span></td>
-                                <td style="width: 190px" class="text-muted" :class="processesContent.type=='原料单'?'td-warm':'td-cool'">@{{ processesContent.wms_code }}</td>
-                                <td style="width: 200px" class="text-muted" :class="processesContent.type=='原料单'?'td-warm':'td-cool'">@{{ processesContent.amount }}</td>
+                                <td style="width: 210px" class="text-muted" :class="processesContent.type=='原料单'?'td-warm':'td-cool'">@{{ processesContent.wms_code }}</td>
+                                <td style="width: 100px" class="text-muted" :class="processesContent.type=='原料单'?'td-warm':'td-cool'">@{{ processesContent.amount }}</td>
                                 <td style="width: 180px" class="text-muted" :class="processesContent.type=='原料单'?'td-warm':'td-cool'">
                                     <ul class="p-0 m-0 list-unstyled list-inline" v-if="processesContent.commodity">
                                         <li v-for="barcode in processesContent.commodity.barcodes"><small>@{{ barcode.code }}</small></li>
@@ -423,7 +423,15 @@
                     <td colspan="16">
                         <table class="table-sm table-bordered table-condensed">
                             <tr class="text-success">
-                                <td>日期</td><td>当日产量</td>
+                                <td>
+                                    <button v-if="!is_update_start_date" @click="is_update_start_date=true;start_date=''" type="button" class="btn btn-sm btn-outline-primary">设定起始日期</button>
+                                    <div v-else>
+                                        <input type="date" class="form-control form-control-sm" style="width: 137px" v-model="start_date">
+                                        <button type="button" @click="update_process_start_date(processDailyParticipants[0])" class="btn btn-sm btn-outline-success">确定</button>
+                                        <button type="button" @click="is_update_start_date=false;" class="btn btn-sm btn-outline-danger">取消</button>
+                                    </div>
+                                </td>
+                                <td>当日产量</td>
                                 <td>当日剩余</td>
                                 <td colspan="2">操作</td>
                                 <td>参与者</td>
@@ -520,7 +528,6 @@
             </table>
             {{$processes->appends($request)->links()}}
         </div>
-    </div>
 </div>
 
 
@@ -564,6 +571,8 @@
                 processUnfold:[],
                 processFullSum:[],
                 signs:[],
+                is_update_start_date:false,
+                start_date:'',
             },
             watch:{
                 checkData:{
@@ -694,8 +703,6 @@
                         _this.processes.every(function (process) {
                             if (process.openProcessHour) {
                                 process.openProcessHour = false;
-                                _this.processDailies = [];
-                                _this.processDailyParticipants = [];
                                 return false;
                             }
                             return true;
@@ -706,55 +713,7 @@
                     axios.post("{{url("process/getDailyParticipant")}}", {id: e, amount: process.amount})
                         .then(function (response) {
                             let processDailies = response.data;
-                            for (let i = 0; i < processDailies.length; i++) {
-                                let processDailyParticipants = processDailies[i].process_daily_participants;
-                                if (processDailyParticipants.length <= 0) {
-                                    let data = {};
-                                    data['daily_id'] = processDailies[i].id;
-                                    data['date'] = processDailies[i].date;
-                                    data['output'] = processDailies[i].output;
-                                    data['remain'] = processDailies[i].remain;
-                                    data['rowspan'] = 1;
-                                    data['readonly'] = "true";
-                                    data['isAddProcessDailyParticipant'] = "true";
-                                    data['isConfirmBtn'] = "true";
-                                    data['submitOutput'] = processDailies[i].output;
-                                    _this.processDailyParticipants.push(data);
-                                    continue;
-                                }
-                                for (let j = 0; j < processDailyParticipants.length; j++) {
-                                    let data = {};
-                                    data['id'] = processDailyParticipants[j].id;
-                                    data['status'] = processDailyParticipants[j].status;
-                                    data['started_at'] = processDailyParticipants[j].started_at;
-                                    data['user_detail_full_name'] = processDailyParticipants[j].user_detail_full_name;
-                                    data['user_id'] = processDailyParticipants[j].user_id;
-                                    data['ended_at'] = processDailyParticipants[j].ended_at;
-                                    data['hour_price'] = processDailyParticipants[j].hour_price;
-                                    data['unit_price'] = processDailyParticipants[j].unit_price;
-                                    data['dinner_duration'] = processDailyParticipants[j].dinner_duration;
-                                    data['hour_count'] = processDailyParticipants[j].hour_count;
-                                    data['remark'] = processDailyParticipants[j].remark;
-                                    data['hour'] = processDailyParticipants[j].hour;
-                                    data['diff'] = processDailyParticipants[j].diff;
-                                    data['billingHour'] = processDailyParticipants[j].billingHour;
-                                    data['unit_count'] = processDailyParticipants[j].unit_count;
-                                    data['process_id'] = processDailies[i].process_id;
-                                    data['readonly'] = "true";
-                                    if (!_this.processDailies[processDailies[i].id]) {
-                                        data['rowspan'] = processDailyParticipants.length;
-                                        data['daily_id'] = processDailies[i].id;
-                                        data['date'] = processDailies[i].date;
-                                        data['output'] = processDailies[i].output;
-                                        data['remain'] = processDailies[i].remain;
-                                        data['submitOutput'] = processDailies[i].output;
-                                        data['isAddProcessDailyParticipant'] = "true";
-                                        data['isConfirmBtn'] = "true";
-                                        _this.processDailies[processDailies[i].id] = processDailies[i].id;
-                                    }
-                                    _this.processDailyParticipants.push(data);
-                                }
-                            }
+                            _this.resetProcessDaily(processDailies,e);
                         }).catch(function (err) {
                         tempTip.setDuration(5000);
                         tempTip.show('获取登记工时数据发生了一些严重错误：' + err);
@@ -763,6 +722,64 @@
                     if (process.is_multi_row) $("#" + e + "-2").after(processDailyParticipantsHtml);
                     else $("#" + e).after(processDailyParticipantsHtml)
                 },
+
+                //重组加工单加工日记录数据
+                resetProcessDaily(processDailies,process_id){
+                    let _this=this;
+                    _this.processDailies = [];
+                    _this.processDailyParticipants = [];
+                    for (let i = 0; i < processDailies.length; i++) {
+                        let processDailyParticipants = processDailies[i].process_daily_participants;
+                        if (processDailyParticipants.length <= 0) {
+                            let data = {};
+                            data['process_id'] = process_id;
+                            data['daily_id'] = processDailies[i].id;
+                            data['date'] = processDailies[i].date;
+                            data['output'] = processDailies[i].output;
+                            data['remain'] = processDailies[i].remain;
+                            data['rowspan'] = 1;
+                            data['readonly'] = "true";
+                            data['isAddProcessDailyParticipant'] = "true";
+                            data['isConfirmBtn'] = "true";
+                            data['submitOutput'] = processDailies[i].output;
+                            _this.processDailyParticipants.push(data);
+                            continue;
+                        }
+                        for (let j = 0; j < processDailyParticipants.length; j++) {
+                            let data = {};
+                            data['id'] = processDailyParticipants[j].id;
+                            data['status'] = processDailyParticipants[j].status;
+                            data['started_at'] = processDailyParticipants[j].started_at;
+                            data['user_detail_full_name'] = processDailyParticipants[j].user_detail_full_name;
+                            data['user_id'] = processDailyParticipants[j].user_id;
+                            data['ended_at'] = processDailyParticipants[j].ended_at;
+                            data['hour_price'] = processDailyParticipants[j].hour_price;
+                            data['unit_price'] = processDailyParticipants[j].unit_price;
+                            data['dinner_duration'] = processDailyParticipants[j].dinner_duration;
+                            data['hour_count'] = processDailyParticipants[j].hour_count;
+                            data['remark'] = processDailyParticipants[j].remark;
+                            data['hour'] = processDailyParticipants[j].hour;
+                            data['diff'] = processDailyParticipants[j].diff;
+                            data['billingHour'] = processDailyParticipants[j].billingHour;
+                            data['unit_count'] = processDailyParticipants[j].unit_count;
+                            data['process_id'] = processDailies[i].process_id;
+                            data['readonly'] = "true";
+                            if (!_this.processDailies[processDailies[i].id]) {
+                                data['rowspan'] = processDailyParticipants.length;
+                                data['process_id'] = process_id;
+                                data['daily_id'] = processDailies[i].id;
+                                data['date'] = processDailies[i].date;
+                                data['output'] = processDailies[i].output;
+                                data['remain'] = processDailies[i].remain;
+                                data['submitOutput'] = processDailies[i].output;
+                                data['isAddProcessDailyParticipant'] = "true";
+                                data['isConfirmBtn'] = "true";
+                                _this.processDailies[processDailies[i].id] = processDailies[i].id;
+                            }
+                            _this.processDailyParticipants.push(data);
+                        }
+                    }
+                },
                 //删除工时显示
                 closeProcessHour(e) {
                     this.processDailies = [];
@@ -1513,7 +1530,32 @@
                     setTimeout( res=>{
                         this.submit();
                     },1);
-                }
+                },
+                update_process_start_date(processDailyParticipant){
+                    let start_date=this.start_date;
+                    let _this=this;
+                    if (!start_date){
+                        tempTip.show('未输入起始日期!');
+                        return;
+                    }
+                    if (!confirm('确定要设定“'+start_date+'”为新的起始日期吗？以往记录将被删除!'))return;
+                    axios.post('{{url('process/updateStartDate')}}',{process_id:processDailyParticipant.process_id,start_date:start_date})
+                        .then(function (response) {
+                            if(response.data.success){
+                                _this.resetProcessDaily(response.data.data,processDailyParticipant.process_id);
+                                _this.is_update_start_date=false;
+                                tempTip.setDuration(2000);
+                                tempTip.showSuccess('成功修改“'+start_date+'”为新的起始时间!');
+                                return;
+                            }
+                            tempTip.setDuration(3000);
+                            tempTip.show(err);
+                        }).catch(function (err) {
+                            console.log(err);
+                            tempTip.setDuration(3000);
+                            tempTip.show('网络错误：'+err);
+                        })
+                },
             },
         });
     </script>

resources/views/waybill/edit.blade.php

@@ -173,9 +173,10 @@
                                 <button type="button" class="btn btn-outline-info btn-sm" @click="addCounty" style="transform: scale(0.9)">添加市/县</button>
                             </div>
                         </div>
+                    </div>
                         <div class="form-group row">
-                            <label for="warehouse_weight" class="col-2 col-form-label text-right ">仓库计抛</label>
-                            <div class="col-2">
+                            <label for="warehouse_weight" class="col-2 col-form-label text-right " v-if="type=='专线'">仓库计抛</label>
+                            <div class="col-2" v-if="type=='专线'">
                                 <input type="text"  class="form-control @error('warehouse_weight') is-invalid @enderror"
                                        name="warehouse_weight" autocomplete="off" value="@if(old('warehouse_weight')){{ old('warehouse_weight') }}@else{{$waybill->warehouse_weight}}@endif"  >
                                 @error('warehouse_weight')
@@ -184,15 +185,14 @@
                                     </span>
                                 @enderror
                             </div>
-                            <label for="warehouse_weight_unit_id" class=" col-form-label text-right ">单位：</label>
-                            <div class="col-1.5">
+                            <label for="warehouse_weight_unit_id" class=" col-form-label text-right " v-if="type=='专线'">单位：</label>
+                            <div class="col-1.5" v-if="type=='专线'">
                                 <select class="form-control @error('warehouse_weight_unit_id') is-invalid @enderror" name="warehouse_weight_unit_id" v-model="waybillPriceModel.warehouse_weight_unit_id">
                                     <option :value="unit.id" v-for="unit in units" >@{{ unit.name }}</option>
                                 </select>
                             </div>
-
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                            <label for="warehouse_weight_other" class="col-form-label text-right ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;仓库重</label>
+                            <span v-if="type=='专线'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                            <label for="warehouse_weight_other" class="col-form-label text-right " :class="type=='专线' ? '' : 'col-2'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;仓库重</label>
                             <div class="col-2">
                                 <input type="text" class="form-control @error('warehouse_weight_other') is-invalid @enderror"
                                        name="warehouse_weight_other" autocomplete="off" value="@if(old('warehouse_weight_other')){{ old('warehouse_weight_other') }}@else{{$waybill->warehouse_weight_other}}@endif"  >
@@ -209,6 +209,7 @@
                                 </select>
                             </div>
                         </div>
+                    <div v-if="type=='专线'">
                         <div class="form-group row">
                             <label for="carrier_weight" class="col-2 col-form-label text-right ">承运商计抛</label>
                             <div class="col-2">

resources/views/waybill/index.blade.php

@@ -303,7 +303,7 @@
                         <td class="td-helpful">@{{waybill.other_fee}}</td>
                     @endcan
                     <td class="td-helpful">@{{waybill.deliver_at}}</td>
-                    <td class="td-helpful">@{{waybill.dispatch_remark}}</td>
+                    <td class="td-helpful"><span v-html="waybill.dispatch_remark"></td>
                     @can('运输管理-删除')
                         <td class="td-operation">
                             <button type="button" class="btn btn-outline-danger btn-sm" @click="waybillDestroy(waybill.id,waybill.waybill_number)">删</button>

routes/web.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\Auth;
 /*
 |--------------------------------------------------------------------------
 | Web Routes
@@ -230,6 +232,8 @@ Route::group(['prefix'=>'process'],function(){
     Route::post('workGroupVerify','ProcessController@workGroupVerify');
     //财务审核
     Route::post('accountantVerify','ProcessController@accountantVerify');
+    //修改起始日期
+    Route::post('updateStartDate','ProcessController@updateStartDate');
 });
 //process主方法 restful
 Route::resource('process','ProcessController');
@@ -307,55 +311,3 @@ Route::group(['prefix'=>'order'],function(){
     //批量取消分配
     Route::post('deAllocationAll','OrderController@deAllocationAll');
 });
-
-
-
-/**
- * 客户
- */
-Route::group(['prefix'=>'client'],function(){
-    //基础资料
-    Route::resource('base','ClientController');
-    //面积盘点
-    Route::get('areaCheck','ClientController@areaCheckIndex');
-    //面积盘点录入
-    Route::get('areaCheck/create','ClientController@areaCheckCreate');
-    //账单确认
-    Route::get('billCheck','ClientController@billCheckIndex');
-    //账单确认录入
-    Route::get('billCheck/create','ClientController@billCheckCreate');
-    //绩效报表
-    Route::get('performanceReport','ClientController@performanceReportIndex');
-    //即时账单
-    Route::get('instantBill','ClientController@instantBillIndex');
-    //增值服务
-    Route::get('valueAddedService','ClientController@valueAddedServiceIndex');
-    //增值服务录入
-    Route::get('valueAddedService/create','ClientController@valueAddedServiceCreate');
-    //相关设置
-    Route::get('relating','ClientController@relating');
-});
-
-/**
- * 计价模型
- */
-Route::group(['prefix'=>'maintenance/priceModel'],function(){
-    //仓储
-    Route::resource('storage','PriceModelStorageController');
-    //作业
-    Route::resource('task','PriceModelTaskController');
-    //快递
-    Route::resource('expressage','PriceModelExpressageController');
-    //物流
-    Route::resource('logistic','PriceModelLogisticController');
-    //直发车
-    Route::resource('nonstop','PriceModelNonstopController');
-    //录入
-    Route::get('create',function (){
-        return view('maintenance.priceModel.create');
-    });
-    //导入
-    Route::get('import',function (){
-        return view('maintenance.priceModel.import');
-    });
-});

tests/package.http

@@ -0,0 +1,4 @@
+POST http://bswas/api/thirdPart/weight/new
+Content-Type: application/json
+
+{"id": "abc","barcode": "546642250091","weight": "3","length": 3,"width": 1,"height": 2}