显示规则限定为：类型=客户，激活=Y

日期范围增加下拉表，一天，三天，七天，一个月
搜索加按钮

app/Http/Controllers/ExitController.php

@@ -58,7 +58,7 @@ class ExitController extends Controller
         }
         if ($request->input())$orders=$this->conditionQuery($request,$orders);
         $orders=$orders->paginate($request->input('paginate')??50);
-        $customers=OracleBasCustomer::select('customerid','descr_c')->get();
+        $customers=OracleBasCustomer::select('customerid','descr_c')->where('customer_type','OW')->where('active_flag','Y')->get();
         $request=$request->input();
         return view('exit/index/forwarding',compact('orders','customers','request'));
     }
@@ -121,7 +121,7 @@ class ExitController extends Controller
         foreach ($orders as $order){
             $data=[
                 'orderno'=>$order->orderno,
-                'sostatus'=>$order->sostatus,
+                'sostatus'=>$order->oracleBASCode_codename_c,
                 'warehouseid'=>$order->warehouseid,
                 'oracleBASCustomer_descr_c'=>$order->oracleBASCustomer_descr_c,
                 'consigneeid'=>$order->consigneeid,

app/Http/Controllers/InventoryController.php

@@ -15,6 +15,7 @@ class InventoryController extends Controller
         if(!Gate::allows("库存管理-动库报表")){ return redirect(url('/'));  }
 
         $date_start=$request->input('date_start');
+        if ($request->input('range'))$date_start=date('Y-m-d',strtotime('-'.$request->input('range')." day"));
         $date_end=$request->input('date_end');
         $TOLocation=$request->input('TOLocation');
         $LotAtt05=$request->input('LotAtt05');
@@ -73,7 +74,7 @@ class InventoryController extends Controller
         $sql.=' ,sku.Descr_C,FMLotNum,lot.LotAtt05,lot.LotAtt08,lot.LotAtt02,lot.LotAtt04 ';
         $sql.=' , storeStatus.QTY, storeStatus.QtyAllocated,stockLog.客户  ';
         $sql.=' )result)  ';
-        if ($page&&$paginate)$sql.="  where rn>'".($page-1)*$paginate."'";
+        if ($page&&$paginate)$sql.="  where rn>'".($page-1)*$paginate."'";dd($sql);
         return DB::connection('oracle')->select($sql);
     }
 
@@ -82,7 +83,7 @@ class InventoryController extends Controller
         $paginate=$request->input('paginate')??50;
         $oracleActTransactingLogs=$this->conditionQuery($request,$page,$paginate);
         $oracleActTransactingLogs=json_encode($oracleActTransactingLogs);
-        $owners=OracleBasCustomer::select('descr_c')->get();
+        $owners=OracleBasCustomer::select('descr_c')->where('customer_type','OW')->where('active_flag','Y')->get();
         return view('inventory.statement.changeInventory',compact('oracleActTransactingLogs','page','owners'));
     }
 

app/OracleBasCode.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * DB:      FLUX/WMS_USER
+ * TABLE:   BAS_Codes
+ * EXPLAIN: 系统代码内容
+ */
+class OracleBasCode extends Model
+{
+    protected $connection="oracle";
+    protected $table="BAS_CODES";
+    /*
+     * column: CodeID=>代码表ID,Code=>代码,CodeName_C=>中文描述
+     * */
+}

app/OracleDOCOrderHeader.php

@@ -11,7 +11,8 @@ class OracleDOCOrderHeader extends Model
     protected $primaryKey="ORDERNO";
     public $timestamps=false;
     protected $appends=[
-        'oracleBASCustomer_descr_c'
+        'oracleBASCustomer_descr_c',
+        'oracleBASCode_codename_c'
     ];
     protected $fillable=[
         'NOTES',
@@ -31,8 +32,14 @@ class OracleDOCOrderHeader extends Model
     public function oracleBASCustomer(){
         return $this->hasOne('App\OracleBasCustomer','customerid','customerid');
     }
+    public function oracleBASCode(){
+        return $this->hasOne('App\OracleBasCode','Code','sostatus')->where('codeid','SO_STS');
+    }
 
     public function getOracleBASCustomerDescrCAttribute(){
         return $this['oracleBASCustomer']? $this['oracleBASCustomer']['descr_c']:null;
     }
+    public function getOracleBASCodeCodenameCAttribute(){
+        return $this['oracleBASCode'] ? $this['oracleBASCode']['codename_c'] : null;
+    }
 }

resources/views/exit/index/forwarding.blade.php

@@ -120,7 +120,7 @@
                 </td>
                 <td>@{{ i+1 }}</td>
                 <td class="text-primary">@{{ order.orderno }}</td>
-                <td class="text-muted">@{{ order.sostatus }}</td>
+                <td class="text-muted">@{{ order.oracleBASCode_codename_c }}</td>
                 <td> @{{ order.warehouseid }}</td>
                 <td >@{{ order.oracleBASCustomer_descr_c }}</td>
                 <td class="text-muted">@{{ order.consigneeid }}</td>

resources/views/inventory/statement/changeInventory.blade.php

@@ -24,6 +24,12 @@
                 <td >
                     <input type="date" name="date_start" class=" form-control-sm tooltipTarget" title="选择显示指定日期的起始时间"
                            v-model="filterData.date_start" :class="filterData.created_at_start?'bg-warning':''">
+                    <select v-model="filterData.range" name="range" @change="submit" title="查询内容的日期范围" class="form-control-sm tooltipTarget m-2">
+                        <option value="1">近一天</option>
+                        <option value="3">近三天</option>
+                        <option value="7">近七天</option>
+                        <option value="30">近三十天</option>
+                    </select>
                 </td>
                 <td>
                     <input name="TOLocation" v-model="filterData.TOLocation" class="form-control-sm tooltipTarget" placeholder="库位" :class="filterData.TOLocation?'bg-warning':''">
@@ -62,7 +68,7 @@
                            v-model="filterData.LotAtt02_end" :class="filterData.LotAtt02_end?'bg-warning':''" >
                 </td>
                 <td colspan="5">
-                    <input hidden type="submit" >
+                    <input type="submit" class="btn btn-sm btn-outline-dark pull-left" value="按条件搜索">
                 </td>
             </tr>
             <tr>
@@ -152,7 +158,7 @@
             data:{
                 oracleActTransactingLogs:{!! $oracleActTransactingLogs !!},
                 page:Number('{{$page}}'),
-                filterData:{date_start:'',date_end:'',SKU:'',paginate:"50",TOLocation:'',
+                filterData:{date_start:'',date_end:'',SKU:'',paginate:"50",TOLocation:'',range:'',
                     LotAtt05:'',LotAtt02_start:'',LotAtt02_end:'',descr_c:'',ALTERNATE_SKU1:'',export:''},
                 owners:[
                     @foreach($owners as $owner)
@@ -235,6 +241,7 @@
                     if (this.filterData.LotAtt02_end)url+="&&LotAtt02_end="+this.filterData.LotAtt02_end;
                     if (this.filterData.ALTERNATE_SKU1)url+="&&ALTERNATE_SKU1="+this.filterData.ALTERNATE_SKU1;
                     if (this.filterData.descr_c)url+="&&descr_c="+this.filterData.descr_c;
+                    if (this.filterData.range)url+="&&range="+this.filterData.range;
                     window.location.href=url;
                 },
                 //提交表单