称重系统补全

app/Http/Controllers/Auth/LoginController.php

@@ -43,7 +43,7 @@ class LoginController extends Controller
      */
     public function __construct()
     {
-//        $this->middleware('guest')->except('logout');
+        $this->middleware('guest')->except('logout');
     }
     public function username()
     {

app/Http/Controllers/PackageController.php

@@ -322,7 +322,7 @@ class PackageController extends Controller
             'length'=>'长(CM)',
             'width'=>'宽(CM)',
             'height'=>'高(CM)',
-            'bulk'=>'体积(CM³)',
+            'bulk'=>'体积(DM³)',
             'paperBox_name'=>'纸箱',
             'status'=>'状态',
         ]];
@@ -342,10 +342,10 @@ class PackageController extends Controller
                 'logistic_name'=>isset($package->logistic_name)?$package->logistic_name:'',
                 'measuringMachine_name'=>isset($package->measuringMachine_name)?$package->measuringMachine_name:'',
                 'weight'=>isset($package->weight)?$package->weight:'',
-                'length'=>isset($package->length)?$package->length:'',
-                'width'=>isset($package->width)?$package->width:'',
-                'height'=>isset($package->height)?$package->height:'',
-                'bulk'=>isset($package->bulk)?$package->bulk:'',
+                'length'=>isset($package->length)?$package->length/10:'',
+                'width'=>isset($package->width)?$package->width/10:'',
+                'height'=>isset($package->height)?$package->height/10:'',
+                'bulk'=>isset($package->bulk)?round($package->bulk/10000)/100:'',//立方毫米到立方分米带双小数
                 'paperBox_name'=>isset($package->paperBox_name)?$package->paperBox_name:'',
                 'status'=>isset($package->status)?$package->status:''
             ];

app/Http/Controllers/TestController.php

@@ -32,7 +32,9 @@ use App\WMSReflectReceive;
 use Carbon\Carbon;
 use Endroid\QrCode\Response\QrCodeResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
+use Ramsey\Uuid\Uuid;
 use function PHPSTORM_META\map;
 use Zttp\Zttp;
 
@@ -122,31 +124,10 @@ class TestController extends Controller
     }
     function t1(Request $request)
     {
-        {
-            $username=config('database.connections.oracle.username');
-            $password=config('database.connections.oracle.password');
-            $host=config('database.connections.oracle.host');
-            $service_name=config('database.connections.oracle.service_name');
-            $conn=oci_connect($username,$password,$host.'/'.$service_name); //连接oracle数据库
-            $IN_WarehouseID='';
-            $IN_TraceID='' ;
-            $IN_WavenNo='';
-            $IN_UserID='';
-            $IN_Language='';
-            $OUT_Return_Code='';
-            $sql_sp="begin SPCUS_EDI_WCS001(:IN_WarehouseID,:IN_Process_Action_C,:IN_Process_By_C,
-        :IN_WaveNO_C,:IN_OrderNO_C,:IN_OrderLineNO_C,:IN_AllocationDetailsID,:IN_Language,:IN_UserID,:OUT_Return_Code); end;";
-            $stmt = oci_parse($conn, $sql_sp);
-            oci_bind_by_name($stmt,':IN_Warehouse',$IN_WarehouseID);
-            oci_bind_by_name($stmt,':IN_TraceID',$IN_TraceID);
-            oci_bind_by_name($stmt,':IN_WavenNo',$IN_WavenNo);
-            oci_bind_by_name($stmt,':IN_Language',$IN_Language);
-            oci_bind_by_name($stmt,':IN_UserID',$IN_UserID);
-            oci_bind_by_name($stmt,':OUT_Return_Code',$OUT_Return_Code);
-            return oci_execute($stmt);
-
-        }
-
+        $package=Package::first();
+        $package->length=31;
+        $package->save();
+        dd($package);
 
     }
 
@@ -193,27 +174,20 @@ class TestController extends Controller
 
     public function delme()
     {
-
-
-        $fields = [
-            'doc_order_header.userdefine1',
-            'doc_order_header.userdefine2',
-            'doc_order_header.SOReference5',
-            'doc_order_header.waveno',
-            'doc_order_header.orderno',
-            'doc_order_header.customerid',
-            'doc_order_header.Consigneename'
-        ];
-        if(''){
-            $resultOracleObj=OracleDOCOrderHeader::select($fields)->where('orderno','SO200603004708');
-        }else{
-            $resultOracleObj=OracleActAllocationDetails::select($fields);
-            $resultOracleObj->where('picktotraceid','546152742096');
-            $resultOracleObj->leftJoin('DOC_Order_Header','act_allocation_details.orderno','doc_order_header.orderno');
-        }
-        $_temOracleInfo=$resultOracleObj->first();
-
-        dd($_temOracleInfo);
+        $package=new Package([
+            'logistic_number'=>'546683955954',
+            'delivery_number'=>'546683955954',
+            'measuring_machine_id'=>'mm',
+            'weight'=>12,
+            'length'=>33,
+            'width'=>22,
+            'height'=>11,
+            'weighed_at'=>now(),
+            'status'=>"无",
+        ]);
+        $package->fetchAllFromOracle();
+        dd($package->toJson());
+        $package->fetchPaperBox();
     }
     public function excelIt()
     {

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

@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Store;
 use App\WMSReflectReceive;
 use App\WMSReflectReceiveSku;
+use Illuminate\Support\Facades\Auth;
 use Zttp\Zttp;
 
 class StoreController extends Controller
@@ -21,6 +22,7 @@ class StoreController extends Controller
     {
         $METHOD=__METHOD__;
         $FUNCTION=__FUNCTION__;
+        Controller::logS(__METHOD__, __FUNCTION__, '快递入库进入WMS接口：' . $store['asn_code']);
         $wmsReceiveds=WMSReflectReceive::where('ASNNO',$store['asn_code'])->get();
         if($wmsReceiveds->isEmpty()){
             (new Controller())->log(__METHOD__,'error_'.__FUNCTION__,'没有本地WMS入库单');
@@ -89,6 +91,7 @@ class StoreController extends Controller
 
             $sendingJson = json_decode($json,true);
             $url=url(config('api.flux.receive.new'));
+//            (new Controller())->log($METHOD,$FUNCTION,$store['asn_code'].'||' .json_encode($sendingJson));
             $response = Zttp::post($url, $sendingJson);
             $noIssues=true;
             $json = $response->json();
@@ -98,7 +101,7 @@ class StoreController extends Controller
             }
             if($json&&isset($json['Response'])){
                 if($json['Response']['return']['returnFlag']=='2'){
-                    (new Controller())->log($METHOD,'error_'.$FUNCTION,$response->body());
+                    (new Controller())->log($METHOD,'error_'.$FUNCTION,$store['asn_code'].'||' . $response->body());
                     return true;
                 }
 //                if(isset($json['Response']['return']['returnDesc'])&&strpos($json['Response']['return']['returnDesc'],'唯一约束')!==false){
@@ -106,18 +109,18 @@ class StoreController extends Controller
 //                    return true;
 //                }
                 if(isset($json['Response']['return']['errordescr'])&&strpos($json['Response']['return']['errordescr'],'已完成')!==false){
-                    (new Controller())->log($METHOD,'error_'.$FUNCTION,$response->body());
+                    (new Controller())->log($METHOD,'error_'.$FUNCTION,$store['asn_code'].'||' . $response->body());
                     return true;
                 }
             }
             if($noIssues&&$json['Response']['return']['returnFlag']=='1'){
                 $wmsReceived['is_uploaded']=1;
                 $wmsReceived->save();
-                (new Controller())->log($METHOD, 'success_' . $FUNCTION, $response->body());
+                (new Controller())->log($METHOD, 'success_' .$FUNCTION,  $store['asn_code'].'||' .$response->body());
                 return true;
             }else {
                 $success = false;
-                (new Controller())->log($METHOD, 'error_' . $FUNCTION, $response->body());
+                (new Controller())->log($METHOD, 'error_'.$FUNCTION, $store['asn_code'].'||' . $response->body());
             }
         });
 

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

@@ -185,14 +185,15 @@ class PackageController extends Controller
         rsort($edges);
         $fluxController=new \App\Http\Controllers\Api\thirdPart\flux\PackageController();
         if ($package){
-            $package->fetchPaperBox($edges[0],$edges[1],$edges[2]);
-            $package['bulk']=$edges[0]*$edges[1]*$edges[2];
             $package['measuring_machine_id']=$measuringMachine->id;
             $package['weight']=$request['weight'];
             $package['length']=$edges[0];
             $package['width']=$edges[1];
             $package['height']=$edges[2];
             $package['weighed_at']=$reqDate;
+            $package->fetchAllFromOracle();
+            $package->fetchPaperBox();
+            $package['bulk']=$edges[0]*$edges[1]*$edges[2];
             if ($package->isActivityBatch()){//处理活动波次
                 $this->log(__METHOD__,__FUNCTION__,"依波次号同步所有包裹：".json_encode($package),null);
                 $package->unifyThisMeasureUnderSameBatch();
@@ -230,7 +231,14 @@ class PackageController extends Controller
                 'status'=>"无",
             ]);
             $package->fetchAllFromOracle();
-            $package->fetchPaperBox($edges[0], $edges[1], $edges[2]);
+            $package->fetchPaperBox();
+            try{
+                $package->save();
+            }catch (\Exception $e){
+                $response=["msg"=>"保存时发生错误（未下发）!","code"=>500,"data"=>null];
+                $this->log(__METHOD__,'weightApi(ERROR)'.__FUNCTION__,json_encode($request).'||'.json_encode($response).'||'.json_encode($e),null);
+                return json_encode($response,JSON_UNESCAPED_UNICODE);
+            }
             $result=$fluxController->accomplishToWMS($package);
             if(!$package['batch_number'])
                 FetchPackageFromOracle::dispatch($package)->delay(Carbon::now()->addMinutes(1440));
@@ -239,13 +247,6 @@ class PackageController extends Controller
                 $response=["msg"=>"写入WMS失败!","code"=>500,"data"=>null];
                 return json_encode($response,JSON_UNESCAPED_UNICODE);
             }
-            try{
-                $package->save();
-            }catch (\Exception $e){
-                $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);
-            }
         }
         if(!empty($package->order_code))
             Waybill::setWeightByOrderCode($package->order_code,$package->weight);

app/OracleDocOrderPackingSummary.php

@@ -20,7 +20,7 @@ class OracleDocOrderPackingSummary extends Model
             ->leftJoin('act_allocation_details','doc_wave_details.orderno','act_allocation_details.orderno')->get();
         $numbersesOfBatch=$numbersesOfBatch->unique('logistic_number');
         $numbersUseful=$numbersesOfBatch->map(function($numbers){return $numbers['logistic_number'];});
-        $oneIdxAsrsReceive=OracleDocOrderPackingSummary::whereIn('traceid',$numbersUseful)->first();
+        $oneIdxAsrsReceive=OracleDocOrderPackingSummary::whereIn('traceid',$numbersUseful)->get();
         if($oneIdxAsrsReceive->count()<$numbersesOfBatch->count()){
             $numbersUseful=[];
             foreach($numbersesOfBatch as $numbers){//跳过idx_asrs_receive已有快递单号

app/Package.php

@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
+use Illuminate\Support\Arr;
 
 class Package extends Model
 {
@@ -24,14 +25,16 @@ class Package extends Model
         'WMSReflectPackage_name'
     ];
     static protected $oracleOrderHeaderFields = [
-    'doc_order_header.userdefine1',
-    'doc_order_header.userdefine2',
-    'doc_order_header.soreference5',
-    'doc_order_header.waveno',
-    'doc_order_header.orderno',
-    'doc_order_header.customerid',
-    'doc_order_header.consigneename',
-    'doc_order_header.carrierid'
+        'doc_order_header.userdefine1',
+        'doc_order_header.soreference5',
+        'doc_order_header.waveno',
+        'doc_order_header.orderno',
+        'doc_order_header.customerid',
+        'doc_order_header.consigneename',
+        'doc_order_header.carrierid',
+        'doc_order_header.c_tel1',
+        'doc_order_header.c_tel2',
+        'doc_wave_header.descr',
     ];
     protected $tempFields=[
         'temOracleInfo','temOwner','temLogistic',
@@ -55,18 +58,22 @@ class Package extends Model
     public function WMSReflectPackage(){
         return $this->hasOne('App\WMSReflectPackage','SOReference5','logistic_number');
     }
-    public function save(array $options=[]){
-        foreach ($this->tempFields as $field){
-            unset($this->$field);
-        }
-        parent::save($options);
-    }
 
-    public function update(array $attributes=[],array $options=[]){
-        foreach ($this->tempFields as $field){
-            unset($this->$field);
-        }
-        parent::update($attributes,$options);
+    public function setLengthAttribute($value){
+        if(empty((int)($value)))return;
+        $this->attributes['length'] = $value;
+    }
+    public function setWidthAttribute($value){
+        if(empty((int)($value)))return;
+        $this->attributes['width'] = $value;
+    }
+    public function setHeightAttribute($value){
+        if(empty((int)($value)))return;
+        $this->attributes['height'] = $value;
+    }
+    public function setBulkAttribute($value){
+        if(empty((int)($value)))return;
+        $this->attributes['bulk'] = $value;
     }
 
     public function isActivityBatch(){
@@ -103,58 +110,67 @@ class Package extends Model
     }
 
     public function fetchLogisticFromOracle(){
-        if(!$this['oracleInfo'])return null;
-        if($this['temLogistic'])return $this['temLogistic'];
-        Controller::logs(__METHOD__, __FUNCTION__, "tempPackage:{$this['oracleInfo']['carrierid']}||SOR:{$this['oracleInfo']['SOReference5']}||sor:{$this['oracleInfo']['soreference5']}||orderno:{$this['orderno']}" , null);
-        if(!$this['oracleInfo']['carrierid'])return null;
-        $logistic= Logistic::where('code',$this['oracleInfo']['carrierid'])->first();
+        if(empty($this->oracleInfo))return null;
+        if(Arr::exists($this->tempFields,'temLogistic'))return $this->tempFields['temLogistic'];
+        Controller::logs(__METHOD__, __FUNCTION__, "tempPackage:{$this->oracleInfo['carrierid']}||SOR:{$this->oracleInfo['SOReference5']}||sor:{$this->oracleInfo['soreference5']}||orderno:{$this['orderno']}" , null);
+        if(!$this->oracleInfo['carrierid'])return null;
+        $logistic= Logistic::where('code',$this->oracleInfo['carrierid'])->first();
         if(!$logistic){
-            Logistic::create(['code'=>$this['oracleInfo']['carrierid'],'name'=>$this['oracleInfo']['carrierid']]);
-            Controller::logs(__METHOD__, __FUNCTION__, "富勒下发找不到快递公司，添加{$this['oracleInfo']['carrierid']}" , null);
+            $logistic=Logistic::create(['code'=>$this->oracleInfo['carrierid'],'name'=>$this->oracleInfo['carrierid']]);
+            Controller::logs(__METHOD__, __FUNCTION__, "富勒下发找不到快递公司，添加{$this->oracleInfo['carrierid']}" , null);
         }
         Controller::logs(__METHOD__, __FUNCTION__, "tempPackage2:{$logistic->id}" , null);
         if(!$logistic)return null;
-        $this['temLogistic']=$logistic;
+        $this->tempFields['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(empty($this->oracleInfo))return null;
+        if(Arr::exists($this->tempFields,'temOwner'))return $this->tempFields['temOwner'];
+        $owner= Owner::where('code',$this->oracleInfo['customerid'])->first();
         if(!$owner){
-            Owner::create(['code'=>$this['oracleInfo']['customerid'],'name'=>$this['oracleInfo']['customerid']]);
-            Controller::logs(__METHOD__, __FUNCTION__, "富勒下发找不到货主，添加{$this['oracleInfo']['customerid']}" , null);
+            $owner=Owner::create(['code'=>$this->oracleInfo['customerid'],'name'=>$this->oracleInfo['customerid']]);
+            Controller::logs(__METHOD__, __FUNCTION__, "富勒下发找不到货主，添加{$this->oracleInfo['customerid']}" , null);
         }
         if(!$owner)return null;
-        $this['temOwner']=$owner;
+        $this->tempFields['temOwner']=$owner;
         $this['owner_id'] = $owner['id'];
         return $owner;
     }
     public function fetchAllFromOracle(){
-        if(!$this['oracleInfo'])return null;
+        if(empty($this->oracleInfo))return null;
         $this->fetchOwnerFromOracle();
         $this->fetchLogisticFromOracle();
-        $this['recipient'] = $this['oracleInfo']['consigneename'];
-        if($this['oracleInfo']['SOReference5'])
-            $this['logistic_number'] = $this['oracleInfo']['SOReference5'];
-        $this['batch_rule'] = $this['oracleInfo']['userdefine2']??null;
-        $this['batch_number'] = $this['oracleInfo']['waveno']??null;
+        $this['recipient'] = $this->oracleInfo['consigneename'];
+        $this['order_code'] = $this->oracleInfo['orderno'];
+        $this['batch_rule'] = $this->oracleInfo['descr'];
+        $this['recipient_mobile'] = $this->oracleInfo['c_tel2']??$this->oracleInfo['c_tel1'];
+        if($this->oracleInfo['soreference5'])
+            $this['logistic_number'] = $this->oracleInfo['soreference5'];
+        $this['batch_number'] = $this->oracleInfo['waveno']??null;
     }
 
     public function getOracleInfoAttribute()
     {
-        if(isset($this->temOracleInfo)&&$this->temOracleInfo)return $this->temOracleInfo;
-        if(!$this['logistic_number']&&!$this['order_code'])return '';
+        if(isset($this->tempFields['temOracleInfo']))return $this->tempFields['temOracleInfo'];
+        if(empty($this['logistic_number'])&&empty($this['order_code']))return '';
         if($this['order_code']){
             $resultOracleObjs=OracleDOCOrderHeader::select(self::$oracleOrderHeaderFields)->where('orderno',$this['order_code']);
+            $resultOracleObjs->leftJoin('doc_wave_header','doc_wave_header.waveno','doc_order_header.waveno');
         }else{
             $resultOracleObjs=OracleActAllocationDetails::select(self::$oracleOrderHeaderFields);
             $resultOracleObjs->where('picktotraceid',$this['logistic_number']);
             $resultOracleObjs->leftJoin('DOC_Order_Header','act_allocation_details.orderno','doc_order_header.orderno');
+            $resultOracleObjs->leftJoin('doc_wave_header','doc_wave_header.waveno','doc_order_header.waveno');
+        }
+        $this->tempFields['temOracleInfo']=$resultOracleObjs->first();
+        if(empty($this->tempFields['temOracleInfo'])) {
+            $resultOracleObjs=OracleDOCOrderHeader::select(self::$oracleOrderHeaderFields)->where('soreference5',$this['logistic_number']);
+            $resultOracleObjs->leftJoin('doc_wave_header','doc_wave_header.waveno','doc_order_header.waveno');
         }
-        $this->temOracleInfo=$resultOracleObjs->first();
-        return $this->temOracleInfo;
+        $this->tempFields['temOracleInfo']=$resultOracleObjs->first();
+        return $this->tempFields['temOracleInfo'];
     }
     public function getOwnerNameAttribute()
     {
@@ -178,11 +194,14 @@ class Package extends Model
 
 
     //寻找相近纸箱ID
-    public  function fetchPaperBox($max, $centre, $min, $owner_id=null){
+    public  function fetchPaperBox($max=null, $centre=null, $min=null, $owner_id=null){
         if($this['paper_box_id'])return $this['paper_box_id'];
         $sumDiffer=0;
         $maxDiffer=0;
         $paperBox_id=null;
+        if(!$max)$max=$this['length'];
+        if(!$centre)$centre=$this['width'];
+        if(!$min)$min=$this['height'];
         if(!$owner_id) $owner_id = $this['owner_id'];
         if(!$owner_id) {
             $owner = $this->fetchOwnerFromOracle();

database/migrations/2020_02_10_103905_change_package_column.php

@@ -26,9 +26,9 @@ class ChangePackageColumn extends Migration
             $table->bigInteger('logistic_id')->nullable()->index()->comment('外键物流公司');
             $table->bigInteger('measuring_machine_id')->nullable()->index()->comment('外键设备');
             $table->decimal('weight')->nullable()->comment('重KG');
-            $table->decimal('length')->nullable()->index()->comment('长(cm)');
-            $table->decimal('width')->nullable()->index()->comment('宽(cm)');
-            $table->decimal('height')->nullable()->index()->comment('高(cm)');
+            $table->decimal('length')->nullable()->comment('长(cm)');
+            $table->decimal('width')->nullable()->comment('宽(cm)');
+            $table->decimal('height')->nullable()->comment('高(cm)');
             $table->decimal('bulk')->nullable()->comment('体积(cm³)');
             $table->bigInteger('paper_box_id')->nullable()->index()->comment('外键纸箱');
             $table->dateTime('weighed_at')->nullable()->comment('称重时间');

database/migrations/2020_07_21_104613_change_package_columns_decimal.php

@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ChangePackageColumnsDecimal extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('packages',function (Blueprint $table){
+            $table->decimal('weight',10,2)->comment('重KG')->change();
+            $table->decimal('length',10,2)->comment('长(cm)')->change();
+            $table->decimal('width',10,2)->comment('宽(cm)')->change();
+            $table->decimal('height',10,2)->comment('高(cm)')->change();
+            $table->decimal('bulk',16,2)->nullable()->comment('体积(cm³)')->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('packages', function (Blueprint $table) {
+            $table->decimal('weight',8,2)->nullable()->comment('重KG')->change();
+            $table->decimal('length',8,2)->nullable()->comment('长(cm)')->change();
+            $table->decimal('width',8,2)->nullable()->comment('宽(cm)')->change();
+            $table->decimal('height',8,2)->nullable()->comment('高(cm)')->change();
+            $table->decimal('bulk',8,2)->nullable()->comment('体积(cm³)')->change();
+        });
+    }
+}

public/t.php

@@ -1,7 +1,11 @@
 <?php
 ;
-
-$str = '123';
-var_dump(json_encode($str));
-$i = 222;
-var_dump(json_encode($i));
+$arr=['a'=>'1', 'b',
+];
+var_dump(empty((int)('0.00')));
+var_dump((int)('0.00'));
+var_dump(empty((int)('1.00')));
+var_dump((int)('1.00'));
+var_dump(empty(0));
+var_dump(empty(0.00));
+var_dump(empty(1));

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

@@ -44,7 +44,7 @@
                             </td>
                             <td style="width: 300px">
                                 <div class="form-inline">
-                                    <input style="max-width: 200px" name="notes" title="右侧选择查询范围，默认为一天内" v-model="filterData.notes" class="form-control form-control-sm tooltipTarget" placeholder="备注" autocomplete="off" :class="filterData.notes?'bg-warning':''">
+                                    <input style="max-width: 200px" name="notes" title="右侧选择查询范围，默认为一月内" v-model="filterData.notes" class="form-control form-control-sm tooltipTarget" placeholder="备注" autocomplete="off" :class="filterData.notes?'bg-warning':''">
                                     <select style="max-width: 100px" title="查询范围，范围越短搜索越快"  name="addtime" v-model="filterData.addtime" class="form-control form-control-sm tooltipTarget">
                                         <option value="1">一天内</option>
                                         <option value="31">近一月</option>
@@ -270,7 +270,7 @@
             data:{
                 filterData:{
                     paginate:50,ordertime_start:'',orderdate_start:'',orderdate_end:'',ordertime_end:'',customerid:'',orderno:'',soreference5:'',codename_c:'',
-                    carriername:'',issuepartyname:'',soreference1:'',notes:'',addtime:'1',alternate_sku1:'',waveno:'',edisendflag2:'',
+                    carriername:'',issuepartyname:'',soreference1:'',notes:'',addtime:'31',alternate_sku1:'',waveno:'',edisendflag2:'',
                 },
                 page:Number('{{$page}}'),
                 maxPage:1,

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

@@ -99,7 +99,7 @@
                             <th>设备</th>
                             <th>重(KG)</th>
                             <th>长*宽*高(cm)</th>
-                            <th>体积(cm³)</th>
+                            <th>体积(dm³)</th>
                             <th>纸箱</th>
                             <th>状态</th>
                             <th>波次规则</th>
@@ -120,8 +120,8 @@
                             <td class="text-muted">@{{package.logisticName}}</td>
                             <td class="text-muted">@{{package.measuringMachineName}}</td>
                             <td>@{{package.weight}}</td>
-                            <td>@{{package.length}}<a v-if="package.length" class="text-primary">*</a>@{{package.width}}<a class="text-primary" v-if="package.width">*</a>@{{package.height}}</td>
-                            <td>@{{package.bulk}}</td>
+                            <td>@{{package.length|mmToCm}}<a v-if="package.length" class="text-primary">*</a>@{{package.width|mmToCm}}<a class="text-primary" v-if="package.width">*</a>@{{package.height|mmToCm}}</td>
+                            <td>@{{package.bulk|volumeMmToDm}}</td>
                             <td>@{{package.paperBoxName}}</td>
                             <td :class="[package.status==='已上传'?'text-success':'']">@{{package.status}}</td>
                             <td class="text-muted">@{{package.batchRule}}</td>
@@ -266,6 +266,16 @@
                         });
                 },
             },
+            filters:{
+                mmToCm:function (val) {
+                    if(!parseInt(val))return val;
+                    return parseInt(val)/10
+                },
+                volumeMmToDm:function (val) {
+                    if(!parseInt(val))return val;
+                    return Math.round(parseInt(val)/10000)/100;
+                },
+            }
         });
     </script>
 @endsection