Merge branch 'waybill_ZD'

# Conflicts:
#	composer.lock

app/BillingModel.php

@@ -6,7 +6,6 @@ use Illuminate\Database\Eloquent\Model;
 
 class BillingModel extends Model
 {
-
     protected $fillable=[
         'carrier_id','province_id','city_id','unit_id','range_min','range_max','unit_price','initial_weight'
     ];

app/Carrier.php

@@ -6,7 +6,6 @@ use Illuminate\Database\Eloquent\Model;
 
 class Carrier extends Model
 {
-
     protected $fillable=[
         'name','mobile','delivery_fee','remark'
     ];

app/Http/Controllers/TestController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 
 use App\Authority;
+use App\OracleBas_SKU;
 use App\Batch;
 use App\Carrier;
 use App\Commodity;
@@ -33,6 +34,7 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Gate;
 use Zttp\Zttp;
 
@@ -141,10 +143,28 @@ class TestController extends Controller
     }
 
     public function test1(){
-        $processDailiesStatistic=ProcessDaily::where('process_id',6)->get();
-        $a=$processDailiesStatistic->max('output');
-        $b=$processDailiesStatistic->min('output');
-        $c=$processDailiesStatistic->avg('output');
-        dd($a,$b,$c);
+        $a=OracleBas_SKU::limit(10)->get();
+        dd($a);
+        /*$pdo= new PDO("oci:dbname=106.14.148.85:1521/orcl","viewer","viewer");
+dd($pdo);*/
+        $db="(DESCRIPTION =
+        (ADDRESS_LIST =
+          (ADDRESS = (PROTOCOL = TCP)(HOST = 106.14.148.85)(PORT = 1521))
+        )
+        (CONNECT_DATA =
+          (SERVER = DEDICATED)
+          (SERVICE_NAME = orcl)
+        ))";
+        $conn = oci_connect('viewer', 'viewer', '106.14.148.85:1521/orcl');
+        if (!$conn) {
+            $e = oci_error();
+            print htmlentities($e['message']);
+            exit;
+        }else {
+            echo "连接oracle成功！";
+        }
+        $basSku=oci_parse($conn, 'select * from "OracleBas_SKU"');
+        //$basSku=$conn->select('select * from "OracleBas_SKU"');
+        dd(oci_execute($basSku));
     }
 }

app/Http/Controllers/WaybillsController.php

@@ -376,6 +376,8 @@ class WaybillsController extends Controller
      *              城市价格区间不为空，城市价格区间都为空，城市为空，价格区间为空
      * */
     public function isWaybillPriceModel(Request $request){
+        $errors=$this->validatorWaybillZX($request,null)->errors();
+        if (count($errors)>0)return ['error'=>$errors];
         $carrier_id=$request->input('carrier_id');
         $destination_city_id=$request->input('destination_city_id');
         $carrier_weight=$request->input('carrier_weight');
@@ -698,48 +700,52 @@ class WaybillsController extends Controller
             ]);
             return $validator;
         }else if ($request->input('type')=='专线'){
-            $validator=Validator::make($request->input(),[
-                'carrier_bill'=>"nullable|max:50|unique:waybills,carrier_bill,$id",
-                'pick_up_fee'=>'nullable|min:0|numeric|max:999999',
-                'other_fee'=>'nullable|min:0|numeric|max:999999',
-                'carrier_id'=>'required|integer',
-                'destination_city_id'=>'required|integer',
-                'warehouse_weight'=>'nullable|min:0|numeric|max:999999',
-                'carrier_weight'=>'nullable|min:0|numeric|max:999999',
-                'warehouse_weight_unit_id'=>'required_with:warehouse_weight|integer',
-                'carrier_weight_unit_id'=>'required_with:carrier_weight|integer',
-                'warehouse_weight_other'=>'nullable|min:0|numeric|max:999999',
-                'carrier_weight_other'=>'nullable|min:0|numeric|max:999999',
-                'warehouse_weight_unit_id_other'=>'required_with:warehouse_weight_other|integer',
-                'carrier_weight_unit_id_other'=>'required_with:carrier_weight_other|integer',
-                'charge'=>'nullable|min:0|numeric|max:999999',
-            ],[
-                'required'=>':attribute 为必填项',
-                'alpha_num'=>':attribute 应为字母或数字',
-                'max'=>':attribute 字符过多或输入值过大',
-                'min'=>':attribute 不得为负',
-                'numeric'=>':attribute 应为数字',
-                'unique'=>':attribute 已存在',
-                'required_with'=>':attribute 未填',
-            ],[
-                'carrier_bill'=>'承运商单号',
-                'warehouse_weight'=>'仓库计数(抛)',
-                'carrier_weight'=>'承运商计数(抛)',
-                'pick_up_fee'=>'提货费',
-                'other_fee'=>'其他费用',
-                'carrier_id'=>'承运商',
-                'destination_city_id'=>'目的市',
-                'carrier_weight_unit_id'=>'承运商计数单位',
-                'charge'=>'收费',
-                'warehouse_weight_unit_id'=>'仓库计数单位',
-                'warehouse_weight_other'=>'仓库计数二',
-                'carrier_weight_other'=>'承运商计数二',
-                'warehouse_weight_unit_id_other'=>'仓库技数单位二',
-                'carrier_weight_unit_id_other'=>'承运商计数单位二',
-            ]);
-            return $validator;
+            return $this->validatorWaybillZX($request,$id);
         }else{
             return false;
         }
     }
+
+    protected function validatorWaybillZX(Request $request,$id){
+        $validator=Validator::make($request->input(),[
+            'carrier_bill'=>"nullable|max:50|unique:waybills,carrier_bill,$id",
+            'pick_up_fee'=>'nullable|min:0|numeric|max:999999',
+            'other_fee'=>'nullable|min:0|numeric|max:999999',
+            'carrier_id'=>'required|integer',
+            'destination_city_id'=>'required|integer',
+            'warehouse_weight'=>'nullable|min:0|numeric|max:999999',
+            'carrier_weight'=>'nullable|min:0|numeric|max:999999',
+            'warehouse_weight_unit_id'=>'required_with:warehouse_weight|integer',
+            'carrier_weight_unit_id'=>'required_with:carrier_weight|integer',
+            'warehouse_weight_other'=>'nullable|min:0|numeric|max:999999',
+            'carrier_weight_other'=>'nullable|min:0|numeric|max:999999',
+            'warehouse_weight_unit_id_other'=>'required_with:warehouse_weight_other|integer',
+            'carrier_weight_unit_id_other'=>'required_with:carrier_weight_other|integer',
+            'charge'=>'nullable|min:0|numeric|max:999999',
+        ],[
+            'required'=>':attribute 为必填项',
+            'alpha_num'=>':attribute 应为字母或数字',
+            'max'=>':attribute 字符过多或输入值过大',
+            'min'=>':attribute 不得为负',
+            'numeric'=>':attribute 应为数字',
+            'unique'=>':attribute 已存在',
+            'required_with'=>':attribute 未填',
+        ],[
+            'carrier_bill'=>'承运商单号',
+            'warehouse_weight'=>'仓库计数(抛)',
+            'carrier_weight'=>'承运商计数(抛)',
+            'pick_up_fee'=>'提货费',
+            'other_fee'=>'其他费用',
+            'carrier_id'=>'承运商',
+            'destination_city_id'=>'目的市',
+            'carrier_weight_unit_id'=>'承运商计数单位',
+            'charge'=>'收费',
+            'warehouse_weight_unit_id'=>'仓库计数单位',
+            'warehouse_weight_other'=>'仓库计数二',
+            'carrier_weight_other'=>'承运商计数二',
+            'warehouse_weight_unit_id_other'=>'仓库技数单位二',
+            'carrier_weight_unit_id_other'=>'承运商计数单位二',
+        ]);
+        return $validator;
+    }
 }

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

@@ -3,43 +3,129 @@
 namespace App\Http\Controllers\Api\thirdPart\flux;
 
 
+use App\Commodity;
+use App\CommodityBarcode;
+use App\OracleBasSKU;
+use App\OracleDOCASNDetail;
+use App\OracleDOCMovementDetail;
+use App\OracleDOCMovementHeader;
+use App\OracleDOCOrderDetail;
 use App\Http\Controllers\Controller;
+use App\Owner;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 class ProcessController extends Controller
 {
     public function getProcessContent(Request $request){
         $wms_code=$request->input('wms_code');
         if (!$wms_code)return ['error'=>'提交的单据号为空'];
-        $processContent=[
-            'wms_code'=>$wms_code,
-            'owner_name'=>'TestOwner',
-            'owner_id'=>'2',
-            'commodities'=>[[
-                'id'=>'1',
-                'name'=>'TestCommodityName',
-                'barcode'=>'TestCommodityBarcode',
-                'sku'=>'TestCommoditySKU',
-                'barcodes'=>[[
-                    'code'=>'test01',
-                    'commodity_id'=>1
-                ]]
-            ],[
-                'id'=>'2',
-                'name'=>'TestCommodityName1',
-                'barcode'=>'TestCommodityBarcode1',
-                'sku'=>'TestCommoditySKU1',
-                'barcodes'=>[[
-                    'code'=>'asddddddddddddddddddddddddddddddddd',
-                    'commodity_id'=>2
-                ],[
-                    'code'=>'56464899999999999999999999999999',
-                    'commodity_id'=>2
-                ]]
-            ]],
-            'bill_type'=>'移库单',
-            'amount'=>'50',
-        ];
-        return json_encode($processContent);
+        $docASNs=OracleDOCASNDetail::where("ASNNo",$wms_code)->get();   //入库单
+        if (count($docASNs)>0){
+            $owner=Owner::where("code",$docASNs[0]->customerid)->first();
+            if (!$owner)$owner=$this->storeOwner($docASNs[0]->customerid);
+            if (!$owner)return ['error'=>'找到了入库单，但未查询到货主代码！'];
+            $commodities=[];
+            foreach ($docASNs as $docASN){
+                $commodity=Commodity::where('sku',$docASN->sku)->first();
+                if (!$commodity)$commodity = $this->storeCommodity($docASN->customerid,$docASN->sku);
+                if (!$commodity)continue;
+                array_push($commodities,['id'=>$commodity->id,'name'=>$commodity->name,
+                    'barcodes'=>$commodity->barcodes,'sku'=>$commodity->sku,'amount'=>$docASN->expectedqty]);
+            }
+            $processContent=[
+                'wms_code'=>$wms_code,
+                'owner_name'=>$owner->name,
+                'owner_id'=>$owner->id,
+                'commodities'=>$commodities,
+                'bill_type'=>'入库单',
+            ];
+            return json_encode($processContent);
+        }
+        $docOrders=OracleDOCOrderDetail::where("OrderNo",$wms_code)->get();//出库单
+        if (count($docOrders)>0){
+            $owner=Owner::where("code",$docOrders[0]->customerid)->first();
+            if (!$owner)$owner=$this->storeOwner($docOrders[0]->customerid);
+            if (!$owner)return ['error'=>'找到了入库单，但未查询到货主代码！'];
+            $commodities=[];
+            foreach ($docOrders as $docOrder){
+                $commodity=Commodity::where('sku',$docOrder->sku)->first();
+                if (!$commodity)$commodity = $this->storeCommodity($docOrder->customerid,$docOrder->sku);
+                if (!$commodity)continue;
+                array_push($commodities,['id'=>$commodity->id,'name'=>$commodity->name,
+                    'barcodes'=>$commodity->barcodes,'sku'=>$commodity->sku,'amount'=>$docOrder->qtyordered]);
+            }
+            $processContent=[
+                'wms_code'=>$wms_code,
+                'owner_name'=>$owner->name,
+                'owner_id'=>$owner->id,
+                'commodities'=>$commodities,
+                'bill_type'=>'出库单',
+            ];
+            return json_encode($processContent);
+        }
+        $docMovementDetails=OracleDOCMovementDetail::where("MDOCNO",$wms_code)->get();//移库单
+        if (count($docMovementDetails)>0){
+            $docMovementHeader=OracleDOCMovementHeader::select('CustomerID')->find($wms_code);
+            if (!$docMovementHeader)return ['error'=>'找到了移库单，但未查询移库单表头！'];
+            $owner=Owner::where("code",$docMovementHeader->customerid)->first();
+            if (!$owner)$owner=$this->storeOwner($docMovementHeader->customerid);
+            if (!$owner)return ['error'=>'找到了入库单，但未查询到货主代码！'];
+            $commodities=[];
+            foreach ($docMovementDetails as $docMovementDetail){
+                $commodity=Commodity::where('sku',$docMovementDetail->sku)->first();
+                if (!$commodity)$commodity = $this->storeCommodity($owner->code,$docMovementDetail->sku);
+                if (!$commodity)continue;
+                array_push($commodities,['id'=>$commodity->id,'name'=>$commodity->name,
+                    'barcodes'=>$commodity->barcodes,'sku'=>$commodity->sku,'amount'=>$docMovementDetail->toqty]);
+            }
+            $processContent=[
+                'wms_code'=>$wms_code,
+                'owner_name'=>$owner->name,
+                'owner_id'=>$owner->id,
+                'commodities'=>$commodities,
+                'bill_type'=>'移库单',
+            ];
+            return json_encode($processContent);
+        }
+        return ['error'=>'未查到对应单据号'];
+    }
+
+    private function storeCommodity($owner_code,$sku){
+        $oracleBasSku=OracleBasSKU::where("CustomerID",$owner_code)->where("SKU",$sku)->first();
+        if (!$oracleBasSku)return;
+        $owner=Owner::where('code',$owner_code)->first();
+        if (!$owner)$owner=$this->storeOwner($owner_code);
+        $commodity=new Commodity([
+            "name"=>$oracleBasSku->descr_c,
+            "sku"=>$oracleBasSku->sku,
+            "owner_id"=>$owner->id,
+        ]);
+        $commodity->save();
+        if ($oracleBasSku->alternate_sku1){
+            $barcode=$this->storeCommodityBarCode($oracleBasSku->alternate_sku1,$commodity->id);
+            $commodity->barcodes=[[$barcode]];
+        }
+        $this->log(__METHOD__, 'FLUX二次加工单接口录入商品__' . __FUNCTION__, json_encode($commodity), Auth::user()['id']);
+        return $commodity;
+    }
+
+    private function storeCommodityBarCode($code,$commodity_id){
+        $barcode=new CommodityBarcode([
+            'code'=>$code,
+            'commodity_id'=>$commodity_id,
+        ]);
+        $barcode->save();
+        $this->log(__METHOD__, 'FLUX二次加工单接口录入商品条码__' . __FUNCTION__, json_encode($barcode), Auth::user()['id']);
+    }
+
+    private function storeOwner($code){
+        $owner=new Owner([
+            "name"=>$code,
+            "code"=>$code
+        ]);
+        $owner->save();
+        $this->log(__METHOD__, 'FLUX二次加工单接口录入货主__' . __FUNCTION__, json_encode($owner), Auth::user()['id']);
+        return $owner;
     }
 }

app/OracleBasSKU.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * WMS_USER
+ * 产品档案 OracleBas_SKU
+ */
+class OracleBasSKU extends Model
+{
+    protected $connection="oracle";
+    protected $table="BAS_SKU";
+}

app/OracleDOCASNDetail.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OracleDOCASNDetail extends Model
+{
+    protected $connection="oracle";
+    protected $table="Doc_ASN_Details";
+}

app/OracleDOCMovementDetail.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OracleDOCMovementDetail extends Model
+{
+    protected $connection="oracle";
+    protected $table="DOC_Movement_Details";
+}

app/OracleDOCMovementHeader.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OracleDOCMovementHeader extends Model
+{
+    protected $connection="oracle";
+    protected $table="DOC_Movement_Header";
+    protected $primaryKey="MDOCNO";
+}

app/OracleDOCOrderDetail.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OracleDOCOrderDetail extends Model
+{
+    protected $connection="oracle";
+    protected $table="DOC_Order_Details";
+}

bootstrap/cache/packages.php

@@ -74,4 +74,11 @@
       0 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
     ),
   ),
+  'yajra/laravel-oci8' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    ),
+  ),
 );

bootstrap/cache/services.php

@@ -32,11 +32,13 @@
     28 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
     29 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
     30 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
-    31 => 'App\\Providers\\AppServiceProvider',
-    32 => 'App\\Providers\\AuthServiceProvider',
-    33 => 'App\\Providers\\BroadcastServiceProvider',
-    34 => 'App\\Providers\\EventServiceProvider',
-    35 => 'App\\Providers\\RouteServiceProvider',
+    31 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    32 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    33 => 'App\\Providers\\AppServiceProvider',
+    34 => 'App\\Providers\\AuthServiceProvider',
+    35 => 'App\\Providers\\BroadcastServiceProvider',
+    36 => 'App\\Providers\\EventServiceProvider',
+    37 => 'App\\Providers\\RouteServiceProvider',
   ),
   'eager' => 
   array (
@@ -56,11 +58,13 @@
     13 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
     14 => 'Carbon\\Laravel\\ServiceProvider',
     15 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
-    16 => 'App\\Providers\\AppServiceProvider',
-    17 => 'App\\Providers\\AuthServiceProvider',
-    18 => 'App\\Providers\\BroadcastServiceProvider',
-    19 => 'App\\Providers\\EventServiceProvider',
-    20 => 'App\\Providers\\RouteServiceProvider',
+    16 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    17 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    18 => 'App\\Providers\\AppServiceProvider',
+    19 => 'App\\Providers\\AuthServiceProvider',
+    20 => 'App\\Providers\\BroadcastServiceProvider',
+    21 => 'App\\Providers\\EventServiceProvider',
+    22 => 'App\\Providers\\RouteServiceProvider',
   ),
   'deferred' => 
   array (

composer.json

@@ -12,6 +12,7 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-openssl": "*",
+        "ext-pdo": "*",
         "doctrine/dbal": "^2.10",
         "endroid/qr-code": "^3.7",
         "fideloper/proxy": "^4.0",
@@ -23,7 +24,7 @@
         "predis/predis": "^1.1",
         "pusher/pusher-php-server": "^4.1",
         "te7a-houdini/laravel-trix": "^2.0",
-      "ext-pdo": "*"
+        "yajra/laravel-oci8": "5.8"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.2",

config/app.php

@@ -161,6 +161,7 @@ return [
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
+        Yajra\Oci8\Oci8ServiceProvider::class,
 
         /*
          * Package Service Providers...

config/database.php

@@ -63,6 +63,18 @@ return [
             ]) : [],
         ],
 
+        'oracle' => [
+            'driver' => 'oracle',
+            'host' => '106.14.148.85',
+            'port' => '1521',
+            'database'=> '',
+            'service_name' => 'orcl',
+            'username' => 'WMS_USER',
+            'password' => 'WMS_USER',
+            'charset' => 'utf8',
+            'prefix' => '',
+        ],
+
         'pgsql' => [
             'driver' => 'pgsql',
             'url' => env('DATABASE_URL'),

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

@@ -79,7 +79,6 @@
                         .catch(function (err) {
                             tempTip.setDuration(3000);
                             tempTip.show('删除权限失败!'+'网络错误：' + err)
-                            console.log(err);
                         });
                 },
             }

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

@@ -83,7 +83,6 @@
                         .catch(function (err) {
                             tempTip.setDuration(3000);
                             tempTip.show('删除车辆失败!'+'网络错误：' + err);
-                            console.log(err);
                         });
                 },
             }

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

@@ -84,7 +84,6 @@
                         .catch(function (err) {
                             tempTip.setDuration(3000);
                             tempTip.show('删除承运商失败!'+'网络错误：' + err);
-                            console.log(err);
                         });
                 },
             }

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

@@ -84,7 +84,6 @@
                         .catch(function (err) {
                             tempTip.setDuration(3000);
                             tempTip.show('删除商品信息失败!'+'网络错误：' + err)
-                            console.log(err);
                         });
                 },
             }

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

@@ -77,7 +77,6 @@
                         .catch(function (err) {
                             tempTip.setDuration(3000);
                             tempTip.show('删除物流公司失败!'+'网络错误：' + err)
-                            console.log(err);
                         });
                 },
             }

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

@@ -77,7 +77,6 @@
                         .catch(function (err) {
                             tempTip.setDuration(3000);
                             tempTip.show('删除设备失败!'+'网络错误：' + err);
-                            console.log(err);
                         });
                 },
             }

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

@@ -77,7 +77,6 @@
                         .catch(function (err) {
                             tempTip.setDuration(3000);
                             tempTip.show('删除货主失败!'+'网络错误：' + err);
-                            console.log(err);
                         });
                 },
             }

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

@@ -106,7 +106,6 @@
                         .catch(function (err) {
                             tempTip.setDuration(3000);
                             tempTip.show('删除纸箱失败!'+'网络错误：' + err);
-                            console.log(err);
                         });
                 },
             }

resources/views/maintenance/paperBox/indexOwner.blade.php

@@ -103,7 +103,6 @@
                          .catch(function (err) {
                              tempTip.setDuration(3000);
                              tempTip.show('删除纸箱失败!'+'网络错误：' + err);
-                             console.log(err);
                          });
                  },
             }

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

@@ -75,7 +75,6 @@
                         .catch(function (err) {
                             tempTip.setDuration(3000);
                             tempTip.show('删除省份失败!'+'网络错误：' + err);
-                            console.log(err);
                         });
                 },
             }

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

@@ -75,7 +75,6 @@
                         .catch(function (err) {
                             tempTip.setDuration(3000);
                             tempTip.show('删除品质标签失败!'+'网络错误：' + err)
-                            console.log(err);
                         });
                 },
             }

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

@@ -85,7 +85,6 @@
                         .catch(function (err) {
                             tempTip.setDuration(3000);
                             tempTip.show('删除角色失败!'+'网络错误：' + err)
-                            console.log(err);
                         });
                 },
             }

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

@@ -92,7 +92,6 @@
                         .catch(function (err) {
                             tempTip.setDuration(3000);
                             tempTip.show('删除用户失败!'+'网络错误：' + err)
-                            console.log(err);
                         });
                 },
             }

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

@@ -130,7 +130,6 @@
                         .catch(function (err) {
                             tempTip.setDuration(3000);
                             tempTip.show('删除计费模型失败!'+'网络错误：' + err);
-                            console.log(err);
                         });
                 },
                 initInputs:function(){

resources/views/process/create.blade.php

@@ -26,9 +26,9 @@
                             <span class=" col-9 input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:1.5;text-align: center;">
                                 <ul class="list-group tooltipTarget" title="双击选择商品" style="width: 100%" onselectstart="return false;">
                                     <li v-for="commodity in processContent.commodities" :id="commodity.id" class="list-group-item list-group-item-action p-0 m-0"
-                                        @dblclick="selectedCommodity(commodity,processContent.wms_code)" :class="processContent.commodity_id==commodity.id ? 'active' :''">
-                                        <p class="form-inline" style="cursor: default;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;"><small class="text-left text-info col-6">@{{ commodity.name }}</small>
-                                            <small class="text-left  col-6" >
+                                        @dblclick="selectedCommodity(commodity,processContent.wms_code)" :class="processContent.commodity_id && processContent.commodity_id==commodity.id ? 'active' :''">
+                                        <p class="form-inline" style="cursor: default;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;"><small style="overflow: hidden;" :title="commodity.name" class="text-left text-info col-6">@{{ commodity.name }}</small>
+                                            <small class="text-left  col-6" style="overflow: hidden;">
                                                 <a v-for="barcode in commodity.barcodes">@{{ barcode.code }}&nbsp;&nbsp;&nbsp;</a>
                                             </small></p></li>
                                 </ul>
@@ -181,6 +181,11 @@
                     }
                     axios.post('{{url("api/thirdPart/flux/process/getProcessContent")}}',{wms_code:wms_code})
                         .then(function (response) {
+                            if (response.data.error){
+                                tempTip.setDuration(3000);
+                                tempTip.show(response.data.error);
+                                return;
+                            }
                             let processContent={};
                             processContent['wms_code']=response.data.wms_code;
                             processContent['owner_name']=response.data.owner_name;
@@ -191,7 +196,7 @@
                             processContent['commodity_barcodes']=[];
                             processContent['commodity_sku']='';
                             processContent['bill_type']=response.data.bill_type;
-                            processContent['amount']=response.data.amount;
+                            processContent['amount']='';
                             processContent['addBtnShow']=true;
                             _this.processContents.unshift(processContent);
                         }).catch(function (err) {
@@ -258,6 +263,7 @@
                            processContent.commodity_name=commodity.name;
                            processContent.commodity_barcodes=commodity.barcodes;
                            processContent.commodity_sku=commodity.sku;
+                           processContent.amount=commodity.amount;
                            return false;
                        }
                        return  true;

resources/views/process/edit.blade.php

@@ -35,7 +35,7 @@
                                 <ul class="list-group tooltipTarget" title="双击选择商品" style="width: 100%" onselectstart="return false;">
                                     <li v-for="commodity in processContent.commodities" :id="commodity.id" class="list-group-item list-group-item-action p-0 m-0"
                                          @dblclick="selectedCommodity(commodity,processContent.wms_code)" :class="processContent.commodity_id==commodity.id ? 'active' :''">
-                                        <p class="form-inline" style="cursor: default;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;"><small class="text-left text-info col-6">@{{ commodity.name }}</small>
+                                        <p class="form-inline" style="cursor: default;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;"><small style="overflow: hidden;" :title="commodity.name" class="text-left text-info col-6">@{{ commodity.name }}</small>
                                             <small class="text-left  col-6" >
                                                 <a v-for="barcode in commodity.barcodes">@{{ barcode.code }}&nbsp;&nbsp;&nbsp;</a>
                                             </small></p></li>
@@ -181,6 +181,11 @@
                     }
                     axios.post('{{url("api/thirdPart/flux/process/getProcessContent")}}',{wms_code:wms_code})
                         .then(function (response) {
+                            if (response.data.error){
+                                tempTip.setDuration(3000);
+                                tempTip.show(response.data.error);
+                                return;
+                            }
                             let processContent={};
                             processContent['wms_code']=response.data.wms_code;
                             processContent['owner_name']=response.data.owner_name;
@@ -191,7 +196,7 @@
                             processContent['commodity_barcodes']=[];
                             processContent['commodity_sku']='';
                             processContent['bill_type']=response.data.bill_type;
-                            processContent['amount']=response.data.amount;
+                            processContent['amount']='';
                             processContent['addBtnShow']=true;
                             _this.processContents.unshift(processContent);
                         }).catch(function (err) {
@@ -256,6 +261,7 @@
                            processContent.commodity_name=commodity.name;
                            processContent.commodity_barcodes=commodity.barcodes;
                            processContent.commodity_sku=commodity.sku;
+                           processContent.amount=commodity.amount;
                            return false;
                        }
                        return  true;
@@ -279,7 +285,6 @@
                         owner_id:owner_id,process_method_id:process_method_id,unit_price:unit_price,
                         remark:remark,amount:amount,processContents:_this.processContents
                     }).then(function (response) {
-                        console.log(response.data);
                         if (response.data.error && response.data.data=="process"){
                             _this.error=response.data.error;
                             return;

resources/views/process/index.blade.php

@@ -1155,9 +1155,7 @@
                     let _this=this;
                     axios.post('{{url('process/getTutorials')}}'+"/"+id)
                         .then(function (response) {
-                            console.log(response.data);
                             if(response.data.success){
-
                                 _this.processTutorial.id=id;
                                 _this.processTutorial.tutorials=response.data.data;
                                 $("#addTutorial").modal("show");

resources/views/rejected/recycle.blade.php

@@ -430,7 +430,6 @@
                         alert('网络连接错误：'+e);
                         tempTip.setDuration(2500);
                         tempTip.show('审核勾选内容失败，网络连接错误：'+e);
-                        console.log(e);
                     });
                     $(e.target).val("")
                 },
@@ -475,7 +474,6 @@
                         alert('网络连接错误：'+e);
                         tempTip.setDuration(2500);
                         tempTip.show('恢复勾选内容失败，网络连接错误：'+e);
-                        console.log(e);
                     })
                 },
                 exportExcel:function(e){

resources/views/waybill/billingModel/index.blade.php

@@ -90,7 +90,6 @@
                         .catch(function (err) {
                             tempTip.setDuration(3000);
                             tempTip.show('删除计费模型失败!'+'网络错误：' + err);
-                            console.log(err);
                         });
                 },
             }

resources/views/waybill/edit.blade.php

@@ -86,7 +86,7 @@
                     <div class="form-group row">
                         <label for="carrier_id" class="col-2 col-form-label text-right text-primary">承运商 *</label>
                         <div class="col-8">
-                            <select name="carrier_id" class="form-control @error('carrier_id') is-invalid @enderror" id="carrier_id" v-model="waybillPriceModel.carrier_id" style="width: 30%; ">
+                            <select name="carrier_id" class="form-control @error('carrier_id') is-invalid @enderror" :class="errors['carrier_id'] ? 'is-invalid' :''" id="carrier_id" v-model="waybillPriceModel.carrier_id" style="width: 30%; ">
                                 @foreach($carriers as $carrier)
                                     <option value="{{$carrier->id}}">{{$carrier->name}}</option>
                                 @endforeach
@@ -112,7 +112,7 @@
                     <div class="form-group row">
                         <label for="origination_city_id" class="col-2 col-form-label text-right text-primary">始发市 *</label>
                         <div class="col-8 form-inline">
-                            <select class="form-control" name="origination_city_id" style="width: 30%; " v-model="waybillPriceModel.origination_city_id">
+                            <select class="form-control @error('origination_city_id') is-invalid @enderror" name="origination_city_id" :class="errors['origination_city_id'] ? 'is-invalid' :''" style="width: 30%; " v-model="waybillPriceModel.origination_city_id">
                                 <option v-for="city in cities" :value="city.id">@{{city.name}}</option>
                             </select>
                             <input class="form-control-sm" placeholder="输入关键字定位" @input="origination_city_name">
@@ -121,15 +121,10 @@
                     <div class="form-group row">
                         <label for="destination_city_id" class="col-2 col-form-label text-right text-primary">目的市 *</label>
                         <div class="col-8 form-inline">
-                            <select class="form-control" name="destination_city_id" id="destination_city_id" v-model="waybillPriceModel.destination_city_id" style="width: 30%; " >
+                            <select class="form-control @error('destination_city_id') is-invalid @enderror" name="destination_city_id" :class="errors['destination_city_id'] ? 'is-invalid' :''" id="destination_city_id" v-model="waybillPriceModel.destination_city_id" style="width: 30%; " >
                                 <option v-for="city in cities" :value="city.id">@{{city.name}}</option>
                             </select>
                             <input class="form-control-sm" placeholder="输入关键字定位" @input="destination_city_id">
-                            @error('destination_city_id')
-                            <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $message }}</strong>
-                                    </span>
-                            @enderror
                         </div>
                     </div>
                     <div class="form-group row">
@@ -155,7 +150,7 @@
                         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                         <label for="warehouse_weight_other" class="col-form-label text-right ">&nbsp;&nbsp;&nbsp;仓库计数二</label>
                         <div class="col-2">
-                            <input type="text"  class="form-control @error('warehouse_weight_other') is-invalid @enderror"
+                            <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"  >
                             @error('warehouse_weight_other')
                             <span class="invalid-feedback" role="alert">
@@ -172,15 +167,10 @@
                             </select>
                         </div>
                     </div>
-{{--                    <div class="form-group row">
-                            <p class="form-control-static text-danger small font-weight-bold" style="margin-left: 50%">{{ $errors->first('warehouse_weight_unit_id') }}</p>
-                            <p class="form-control-static text-danger small font-weight-bold" style="margin-left: 50%">{{ $errors->first('warehouse_weight_unit_id_other') }}</p>
-                    </div>--}}
-                    {{--计费模型阶段保留--}}
                     <div class="form-group row">
                         <label for="carrier_weight" class="col-2 col-form-label text-right ">承运商计数(抛)</label>
                         <div class="col-2">
-                            <input type="text" id="carrier_weight"   class="form-control @error('carrier_weight') is-invalid @enderror"
+                            <input type="text" id="carrier_weight" :class="errors['carrier_weight'] ? 'is-invalid' :''"   class="form-control @error('carrier_weight') is-invalid @enderror"
                                    name="carrier_weight" autocomplete="off" value="@if(old('carrier_weight')){{ old('carrier_weight') }}@else{{$waybill->carrier_weight}}@endif"  >
                             @error('carrier_weight')
                             <span class="invalid-feedback" role="alert">
@@ -190,7 +180,7 @@
                         </div>
                         <label for="carrier_weight_unit_id" class=" col-form-label text-right ">单位：</label>
                         <div class="col-1.5">
-                            <select id="carrier_weight_unit_id" class="form-control @error('carrier_weight_unit_id') is-invalid @enderror"  name="carrier_weight_unit_id" v-model="waybillPriceModel.carrier_weight_unit_id">
+                            <select id="carrier_weight_unit_id" :class="errors['carrier_weight_unit_id'] ? 'is-invalid' :''" class="form-control @error('carrier_weight_unit_id') is-invalid @enderror"  name="carrier_weight_unit_id" v-model="waybillPriceModel.carrier_weight_unit_id">
                                 @foreach($units as $unit)
                                     <option value="{{$unit->id}}">{{$unit->name}}</option>
                                 @endforeach
@@ -200,7 +190,7 @@
                         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                         <label for="carrier_weight_other" class="col-form-label text-right ">承运商计数二</label>
                         <div class="col-2">
-                            <input type="text" id="carrier_weight_other"  class="form-control @error('carrier_weight_other') is-invalid @enderror"
+                            <input type="text" id="carrier_weight_other" :class="errors['carrier_weight_other'] ? 'is-invalid' :''"  class="form-control @error('carrier_weight_other') is-invalid @enderror"
                                    name="carrier_weight_other" autocomplete="off" value="@if(old('carrier_weight_other')){{ old('carrier_weight_other') }}@else{{$waybill->carrier_weight_other}}@endif"  >
                             @error('carrier_weight_other')
                             <span class="invalid-feedback" role="alert">
@@ -210,7 +200,7 @@
                         </div>
                         <label for="carrier_weight_unit_id_other" class=" col-form-label text-right ">单位：</label>
                         <div class="col-1.5">
-                            <select id="carrier_weight_unit_id_other" class="form-control @error('carrier_weight_unit_id_other') is-invalid @enderror" name="carrier_weight_unit_id_other" v-model="waybillPriceModel.carrier_weight_unit_id_other" >
+                            <select id="carrier_weight_unit_id_other" :class="errors['carrier_weight_unit_id_other'] ? 'is-invalid' :''" class="form-control @error('carrier_weight_unit_id_other') is-invalid @enderror" name="carrier_weight_unit_id_other" v-model="waybillPriceModel.carrier_weight_unit_id_other" >
                                 @foreach($units as $unit)
                                     <option value="{{$unit->id}}">{{$unit->name}}</option>
                                 @endforeach
@@ -219,14 +209,6 @@
 
                     </div>
                     @endif
-{{--                    <div class="form-group row">
-                        <div class="col-sm-5">
-                            <p class="form-control-static text-danger small font-weight-bold" style="margin-left: 50%">{{ $errors->first('carrier_weight_unit_id') }}</p>
-                        </div>
-                        <div class="col-sm-5">
-                            <p class="form-control-static text-danger small font-weight-bold" style="margin-left: 50%">{{ $errors->first('carrier_weight_unit_id_other') }}</p>
-                        </div>
-                    </div>--}}
                     @if($waybill->type=="直发车")
                     <div class="form-group row">
                         <label for="carType_id" class="col-2 col-form-label text-right text-primary">车型 *</label>
@@ -336,6 +318,7 @@
                         },
                     @endforeach
                 ],
+                errors:[],
             },
             mounted:function(){
                 /*将地址转换为市区，赋给data*/
@@ -375,29 +358,26 @@
             methods:{
                 {{--计费模型阶段保留--}}
                is_waybillPriceModel(carrier_id,carrier_weight,carrier_weight_unit_id,destination_city_id,carrier_weight_other,carrier_weight_unit_id_other){
+                    this.errors=[];
                     let url='{{url('waybill/is/waybillPriceModel')}}';
-                    let one=false;
-                    let two=false;
-                    if (carrier_id&&carrier_weight&&carrier_weight_unit_id&&destination_city_id){one=true;}
-                    if (carrier_id&&carrier_weight_other&&carrier_weight_unit_id_other&&destination_city_id){two=true;}
-                    if (one||two) {
-                        axios.post(url,{carrier_id:carrier_id,carrier_weight:[carrier_weight,carrier_weight_other],
-                            carrier_weight_unit_id:[carrier_weight_unit_id,carrier_weight_unit_id_other],destination_city_id:destination_city_id})
-                            .then(
-                                function (response) {
-                                    if (!response.data.success) {
-                                        document.getElementById('waybillPriceModel').value='';
-                                        tempTip.confirm('该目的地与计量单位对应的计费模型不存在，如录入将会标为异常记录，请通知相关负责人添加计费模型,点击'+'<b class="text-primary">"确定"</b>'+'则确认提交 ',
-                                        function () {
-                                                document.getElementById('waybillForm').submit();
-                                        });
-                                    }else{
-                                        document.getElementById('waybillPriceModel').value=response.data.success;
-                                        document.getElementById('waybillForm').submit();
-                                    }
+                    let _this=this;
+                    axios.post(url,{carrier_id:carrier_id,carrier_weight:[carrier_weight,carrier_weight_other],
+                        carrier_weight_unit_id:[carrier_weight_unit_id,carrier_weight_unit_id_other],destination_city_id:destination_city_id})
+                        .then(
+                            function (response) {
+                                if (response.data.error){_this.errors=response.data.error;return;}
+                                if (!response.data.success) {
+                                    document.getElementById('waybillPriceModel').value='';
+                                    tempTip.confirm('该目的地与计量单位对应的计费模型不存在，如录入将会标为异常记录，请通知相关负责人添加计费模型,点击'+'<b class="text-primary">"确定"</b>'+'则确认提交 ',
+                                    function () {
+                                            document.getElementById('waybillForm').submit();
+                                    });
+                                }else{
+                                    document.getElementById('waybillPriceModel').value=response.data.success;
+                                    document.getElementById('waybillForm').submit();
                                 }
-                            );
-                    }
+                            }
+                        );
                 },
                 submitForm(){
                     let type=document.getElementById('type').value;

resources/views/waybill/index.blade.php

@@ -130,8 +130,8 @@
                     <th>到付金额(元)</th>
                     <th>下单备注</th>
                     <th>运单审核人</th>
-                    @can('运输管理-编辑','运输管理-运单审核','运输管理-调度')
-                        <th>运单操作</th>
+                    @can('运输管理-编辑','运输管理-运单审核','运输管理-调度','运输管理-编辑','运输管理-删除')
+                        <th>操作</th>
                     @endcan
                     <th>承运商</th>
                     <th>承运商单号</th>
@@ -149,9 +149,6 @@
                     <th>调度备注</th>
                     <th>创建时间</th>
                     <th>调度审核人</th>
-                    @can('运输管理-编辑','运输管理-删除')
-                        <th>调度操作</th>
-                    @endcan
                 </tr>
 
                 <tr v-for="waybill in waybills" :style="{color:waybill.status=='待重审'?'red':''||waybill.status=='已完结'?'green':''}">
@@ -187,6 +184,14 @@
                                 <button class="btn btn-outline-secondary" @click="job(waybill.id)">调度</button>
                             @endcan
                         </div>
+                        <div v-if=waybill.status==="待终审">
+                            @can('运输管理-调度审核')
+                                <button class="btn btn-outline-success" @click="waybillEndAudit(waybill.id,waybill.waybill_number)">完结</button>
+                            @endcan
+                            @can('运输管理-调度')
+                                <button class="btn btn-outline-secondary" @click="job(waybill.id)">改调度</button>
+                            @endcan
+                        </div>
                     </td>
                     <td><p>@{{waybill.carrier}}</p></td>
                     <td>@{{waybill.carrier_bill}}</td>
@@ -206,17 +211,6 @@
                     <td>@{{waybill.dispatch_remark}}</td>
                     <td>@{{waybill.created_at}}</td>
                     <td><p v-for="waybillAuditLog in waybill.waybillAuditLogs" v-if=waybillAuditLog.audit_stage==="调度阶段">@{{waybillAuditLog.user.name}}</p></td>
-
-                    <td>
-                        <div v-if=waybill.status==="待终审">
-                            @can('运输管理-调度审核')
-                                <button class="btn btn-outline-success" @click="waybillEndAudit(waybill.id,waybill.waybill_number)">完结</button>
-                            @endcan
-                            @can('运输管理-调度')
-                                <button class="btn btn-outline-secondary" @click="job(waybill.id)">改调度</button>
-                            @endcan
-                        </div>
-                    </td>
                 </tr>
             </table>
             <div class="text-info h5 btn btn">{{$waybills->count()}}/{{$waybills->total()}}</div>
@@ -327,15 +321,15 @@
                                     tempTip.showSuccess('审核'+w+'成功!');
                                 }else if (response.data.exception!=null){
                                     tempTip.setDuration(3000);
-                                    tempTip.showSuccess(response.data.exception);
+                                    tempTip.show(response.data.exception);
                                 }else {
                                     tempTip.setDuration(3000);
-                                    tempTip.showSuccess('审核失败!');
+                                    tempTip.show('审核失败!');
                                 }
                             }
                         ).catch(function (err) {
                         tempTip.setDuration(3000);
-                        tempTip.showSuccess('审核失败,网络连接错误!'+err);
+                        tempTip.show('审核失败,网络连接错误!'+err);
                     });
                 },
                 waybillUpdate(id){
@@ -361,12 +355,12 @@
                                     tempTip.showSuccess(w+'审核驳回成功!');
                                 }else {
                                     tempTip.setDuration(3000);
-                                    tempTip.showSuccess('审核驳回失败!');
+                                    tempTip.show('审核驳回失败!');
                                 }
                             }
                         ).catch(function (err) {
                         tempTip.setDuration(3000);
-                        tempTip.showSuccess('审核驳回失败,网络连接错误!'+err);
+                        tempTip.show('审核驳回失败,网络连接错误!'+err);
                     });
                 },
                 job(id){
@@ -392,15 +386,15 @@
                                     tempTip.showSuccess(w+'终审完毕!');
                                 }else if (response.data.exception!=null){
                                     tempTip.setDuration(3000);
-                                    tempTip.showSuccess(response.data.exception);
+                                    tempTip.show(response.data.exception);
                                 }else {
                                     tempTip.setDuration(3000);
-                                    tempTip.showSuccess('终审失败!');
+                                    tempTip.show('终审失败!');
                                 }
                             }
                         ).catch(function (err) {
                         tempTip.setDuration(3000);
-                        tempTip.showSuccess('终审失败,网络连接错误!'+err);
+                        tempTip.show('终审失败,网络连接错误!'+err);
                     });
                 },
                 setPaginate:function(e){
@@ -442,7 +436,6 @@
                 waybillExport(e){
                     let val=e;
                     let data=this.filterData;
-                    console.log(val)
                     if (val==1) {
                         if (this.checkData.length <= 0) {
                             tempTip.setDuration(4000);

resources/views/waybill/waybillPriceModel/index.blade.php

@@ -129,7 +129,6 @@
                         .catch(function (err) {
                             tempTip.setDuration(3000);
                             tempTip.show('删除计费模型失败!'+'网络错误：' + err);
-                            console.log(err);
                         });
                 },
                 initInputs:function(){

routes/web.php

@@ -122,13 +122,13 @@ Route::resource('store/storeItem','StoreItemsController');
 /**
  * 二次加工单
  */
+//process主方法 restful
+Route::resource('process','ProcessController');
 Route::group(['prefix'=>'process'],function(){
     //相关设置
     Route::get('relating',function (){return view('process.menuProcess');});
     //统计页面
     Route::get('statistic','ProcessStatisticController@index');
-    //process主方法 restful
-    Route::resource('','ProcessController');
     //获取每日参与人
     Route::post('getDailyParticipant','ProcessController@getDailyParticipant');
     //驳回