样式BUG

app/Http/Controllers/WaybillsController.php

@@ -667,6 +667,9 @@ class WaybillsController extends Controller
             'source_bill'=>'上游单号',
             'wms_bill_number'=>'wms订单号',
             'waybill_number'=>'运单号',
+            'charge'=>'运输收费',
+            'other_charge'=>'其他收费',
+            'other_charge_remark'=>'其他收费备注',
             'origination'=>'始发地',
             'destination'=>'目的地',
             'carrier'=>'承运商',
@@ -710,6 +713,9 @@ class WaybillsController extends Controller
                 'owner'=>isset($waybill->owner->name)?$waybill->owner->name:'',
                 'source_bill'=>isset($waybill->source_bill)?$waybill->source_bill:'',
                 'wms_bill_number'=>isset($waybill->wms_bill_number)?$waybill->wms_bill_number:'',
+                'charge'=>isset($waybill->charge)?$waybill->charge:'',
+                'other_charge'=>isset($waybill->other_charge)?$waybill->other_charge:'',
+                'other_charge_remark'=>isset($waybill->other_charge_remark)?$waybill->other_charge_remark:'',
                 'origination'=>isset($waybill->origination)?$waybill->origination:'',
                 'destination'=>isset($waybill->destination)?$waybill->destination:'',
                 'recipient'=>isset($waybill->recipient)?$waybill->recipient:'',

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

@@ -21,122 +21,122 @@ 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();
+                $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);
         return response()->json(['response'=>['flag'=>'Y','code'=>'0000','message'=>'正确接收']])
             ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
     }
@@ -173,8 +173,9 @@ class PackageController extends Controller
     public function accomplishToWMS(Package $package)
     {
         try{
-//            OracleDOCOrderDetail::where()
+//            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,

resources/views/layouts/app.blade.php

@@ -14,7 +14,7 @@
 </head>
 <body>
 <div id="app">
-    <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm" style="padding: 0;max-height: 80px" >
+    <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm" style="padding: 0;" >
         <div class="container-fluid">
             <a class="navbar-brand" href="{{ url('/') }}" title="宝时 Warehouse Assistance System" style="vertical-align: text-bottom">
                 <img src="{{asset('icon/logo100b.png')}}" alt="宝时 Warehouse Assistance System" height="30" >

resources/views/layouts/menu.blade.php

@@ -1,4 +1,4 @@
-<div class="collapse navbar-collapse" id="navbarSupportedContent" style="max-height: 80px">
+<div class="collapse navbar-collapse" id="navbarSupportedContent">
     <!-- Left Side Of Navbar -->
     <ul class="navbar-nav mr-auto nav-tabs nav font-weight-bold" id="nav1" style="padding-top: 10px">
         @can('退货管理')