包裹跳过WMS接口的逻辑和BUG修复

app/Http/Controllers/LaborReportController.php

@@ -68,7 +68,7 @@ class LaborReportController extends Controller
         if (!$user)return redirect('/');
         $userWorkgroupIds=$user->getPermittingWorkgroupIds();
         $permittingWorkgroups=UserWorkgroup::whereIn('id',$userWorkgroupIds)->get();
-        if($permittingWorkgroups->isEmpty())$permittingWorkgroups="\'\'";
+        if($permittingWorkgroups->isEmpty())$permittingWorkgroups="[]";
         $laravelEchoPrefix = config('database.redis.options.prefix');
         if (!Gate::allows('人事管理-临时工报表')){return redirect(url('/')); }
         if ($request->input()){
@@ -162,7 +162,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/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;
@@ -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);
+        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/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/TestController.php

@@ -11,8 +11,10 @@ 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;
@@ -109,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)
     {
@@ -148,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)
@@ -168,9 +166,8 @@ 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));
+        $a=OracleDocOrderPackingSummary::create(['traceid'=>'test333','orderno'=>'so333','grossweight'=>'35.32','addwho'=>'WAS','addtime'=>Carbon::now(),'editwho'=>'WAS','edittime'=>Carbon::now()]);
+        dd($a);
     }
 
     public function excelIt()

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

@@ -7,7 +7,9 @@ use App\Jobs\MarkPackageExcepted;
 use App\Logistic;
 use App\OracleDOCOrderDetail;
 use App\OracleDOCOrderHeader;
+use App\OracleDocOrderPackingSummary;
 use App\OracleDOCWaveHeader;
+use App\OracleIdxAsrsReceive;
 use App\Owner;
 use App\Package;
 use App\WMSReflectPackage;
@@ -21,122 +23,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,82 +168,89 @@ 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'];
-        }catch (\Exception $exception){
-            Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'请求异常：'.$exception->getMessage(),null);
-            return ['result'=>'false'];
-        }
-    }
-    public function accomplishToWMS2(Package $package)
-    {
-        try{
-            $package['logistic_number'];
-
-            $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'];
+//            $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){
+        $batchNumber = strtoupper($batchNumber);
         $docWaveHeader=OracleDOCWaveHeader::where('waveno',$batchNumber)->first();
         if(!$docWaveHeader){
             {return ['result'=>false,'message'=>'波次不存在'];}
@@ -252,6 +260,7 @@ class PackageController extends Controller
         })->get();
         if($unpackedOrders->isNotEmpty()){return ['result'=>false,'message'=>'有未装箱或完成的订单在该波次，不能批量记录重量'];}
         OracleDOCWaveHeader::where('waveno',$batchNumber)->update(['userdefine3'=>'Y']);
+        //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,6 @@ namespace App\Http\Controllers\api\thirdPart\jianshang;
 
 
 use App\Http\Controllers\Controller;
-use App\Rejected;
 use App\RejectedBill;
 use App\RejectedBillItem;
 use Carbon\Carbon;
@@ -16,7 +15,7 @@ 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'] ?? '';

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

@@ -67,18 +67,11 @@ class PackageController extends Controller
         }
         $apiController=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($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,$paperBox_id);
+                $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,7 +80,6 @@ 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();
@@ -127,6 +119,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 +129,14 @@ class PackageController extends Controller
                 'weighed_at'=>$reqDate,
                 'status'=>"未下发",
             ]);
-            $result=$apiController->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=$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));
@@ -171,6 +155,7 @@ 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);

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

@@ -7,6 +7,9 @@ use Illuminate\Database\Eloquent\Model;
 class OracleDocOrderPackingSummary extends Model
 {
     protected $connection="oracle";
-    protected $primaryKey="ORDERNO";
+    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

@@ -7,7 +7,9 @@ use Illuminate\Database\Eloquent\Model;
 class OracleIdxAsrsReceive extends Model
 {
     protected $connection="oracle";
-    protected $primaryKey="ORDERNO";
-    protected $timestamps=false;
+    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,64 @@ 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);
+        parent::save($options);
+    }
+
+    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'];
+        $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 +121,21 @@ class Package extends Model
 
 
     //寻找相近纸箱ID
-    public  function checkPaperBox($max,$centre,$min,$owner_id){
+    public  function fetchPaperBox($max, $centre, $min, $owner_id=null){
         $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 +145,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'];
     }
 }

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
@@ -130,7 +130,7 @@
                                 <button v-else-if="laborReport.userWorkGroupId" @click="groupClockAudit(laborReport.id)" class="btn btn-sm btn-outline-primary">组长审核</button>
                                 </span>
                                 @else
-                                    <span  v-if="laborReport.groupUserId"><p style="color: green">在场</p></span>
+{{--                                    <span  v-if="laborReport.groupUserId"><p style="color: green">在场</p></span>--}}
                                     <span class="text-center"><p style="color: red">组长未审核</p></span>
                                 @endcan
 

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}