商品默认仓库逻辑以及提取公共仓库配置以及卖家云配置到配置文件

app/Http/Controllers/Admin/FxOrderController.php

 
 class FxOrderController extends Controller
 {
+    protected $warehouse = [];
+
+    public function __construct()
+    {
+        $this->warehouse = config('constants.WAREHOUSE');
+        $is_fx = env('IS_FX');
+        if($is_fx > 0) {
+            unset($this->warehouse[1]);
+            unset($this->warehouse[2]);
+        }
+    }
+
 	public function orderindex(Request $request){
         $page = (int)$request->input('page');
         $pageSize = 20;
             $v['receiverMobile'] = substr($v['receiverMobile'], 0, 3).'****'.substr($v['receiverMobile'], 7);
             $v['status_name'] = $status_arr[$v['status']];   
             $v['address'] = $v['receiverState'].$v['receiverCity'].$v['receiverDistrict'].$v['receiverStreet'].$v['receiverAddress'];   
-            $v['warehouse'] = $v['warehouse'] == 1? 'A仓库':'B仓库';      
+            $v['warehouse'] = $this->warehouse[$v['warehouse']];
             $v['is_fugou'] = $v['is_fugou'] == 1? '是':'否';      
             $v['is_refund'] = $v['is_refund'] == 1? '是':'否'; 
             $v['payment_type'] = $payArr[$v['payment_type']];    

app/Http/Controllers/Admin/FxStatisticsController.php

 
 class FxStatisticsController extends Controller
 {
+    protected $warehouse = [];
+
+    public function __construct()
+    {
+        $this->warehouse = config('constants.WAREHOUSE');
+        $is_fx = env('IS_FX');
+        if($is_fx > 0) {
+            unset($this->warehouse[1]);
+            unset($this->warehouse[2]);
+        }
+    }
+
      /**
      * 发货财务明细
      */
         
         $result = json_decode(json_encode($result), true);
         $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
-        $wareArr = array(
-            0 => '其他',
-            1 => 'A仓',
-            2 => 'B仓',
-            3 => 'C仓',
-        );
+        $wareArr = $this->warehouse;
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;            
             $v['payment_type'] = $payArr[$v['payment_type']];
         
         $result = json_decode(json_encode($result), true);
         $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
-        $wareArr = array(
-            0 => '其他',
-            1 => 'A仓',
-            2 => 'B仓',
-            3 => 'C仓',
-        );
+        $wareArr = $this->warehouse;
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;            
             $v['payment_type'] = $payArr[$v['payment_type']];

app/Http/Controllers/Admin/GoodsController.php

 
 class GoodsController extends Controller
 {
+    protected $warehouse = [];
+
+    public function __construct()
+    {
+        $this->warehouse = config('constants.WAREHOUSE');
+        $is_fx = env('IS_FX');
+        if($is_fx > 0) {
+            unset($this->warehouse[1]);
+            unset($this->warehouse[2]);
+        }
+    }
+
 	public function index(Request $request){
         $page = (int)$request->input('page');
         $pageSize = 20;
             echo '0';die;
         }
         $is_fx = env('IS_FX');
-        $result = Goods::select('gs.id as sku_id', 'goods.id as goods_id', 'goods.name', 'gs.propsName', 'gs.price', 'gs.is_weigh', 'gs.quantity', 'gs.is_white', 'gs.is_not_fx')->leftJoin('goods_skus as gs', 'gs.goodsCode', '=', 'goods.id')->where('goods.name', 'like', '%'.$name.'%')->where('goods.is_del', 0)->where('gs.is_del', 0)->orderBy('goods.id', 'desc')->get();
+        $result = Goods::select('gs.id as sku_id', 'goods.id as goods_id', 'goods.name', 'gs.propsName', 'gs.price',
+            'gs.is_weigh', 'gs.quantity', 'gs.is_white', 'gs.is_not_fx', 'gs.warehouse')->leftJoin('goods_skus as gs',
+            'gs.goodsCode', '=', 'goods.id')->where('goods.name', 'like', '%'.$name.'%')->where('goods.is_del', 0)
+            ->where('gs.is_del', 0)->orderBy('goods.id', 'desc')->get();
         $result = json_decode(json_encode($result), true);
         foreach($result as $k=>&$v){
             //计算实际库存 -还未到卖家云的量
                     unset($result[$k]); 
                 }
             }
+
+            $v['warehouse_name'] = $this->warehouse[$v['warehouse']];
         }
 
         $result = array_values($result); 

app/Http/Controllers/Admin/OrderController.php

 
 class OrderController extends Controller
 {
-	public function orderindex(Request $request){
+    protected $warehouse = [];
+
+    public function __construct()
+    {
+        $this->warehouse = config('constants.WAREHOUSE');
+        $is_fx = env('IS_FX');
+        if($is_fx > 0) {
+            unset($this->warehouse[1]);
+            unset($this->warehouse[2]);
+        }
+    }
+
+    public function orderindex(Request $request){
         $page = (int)$request->input('page');
         $pageSize = 20;
         if($page<=0){
                 $v['pre_cost'] = 0;
                 foreach($goods as $item){
                     $goods_name = Goods::where('id', $item->goods_id)->pluck('name');
-                    $goods_sku_info = GoodsSkus::select('propsName', 'is_weigh', 'referenceCost', 'is_not_fx')->where('id', $item->sku_id)->first();
+                    $goods_sku_info = GoodsSkus::select('propsName', 'is_weigh', 'referenceCost', 'is_not_fx', 'warehouse')->where('id', $item->sku_id)->first();
                     if(!empty($goods_sku_info)){
                         $props_name = $goods_sku_info->propsName;
                         $is_weigh = $goods_sku_info->is_weigh;
                         $weigh_note = $is_weigh==1 ? '重量(斤)':'数量';
                         if(!$item->gift_id) $v['pre_cost'] += $goods_sku_info->referenceCost * $item->num;
 
-                        if( $goods_sku_info->is_not_fx == 1 && $v['warehouse']==3 && $v['is_not_fx'] == 0 ){
+                        //若有商品不属于C仓并且现在所属仓库是C仓,审核时提醒转仓
+                        if( $goods_sku_info->warehouse != 3 && $v['warehouse']==3 && $v['is_not_fx'] == 0 ){
+//                        if( $goods_sku_info->is_not_fx == 1 && $v['warehouse']==3 && $v['is_not_fx'] == 0 ){
                             $v['is_not_fx'] = 1;
                         }
                     }else{
                         $props_name = '';
                         $weigh_note = '数量';
                     }
+                    $goodsWarehouse = isset($this->warehouse[$goods_sku_info->warehouse]) ? $this->warehouse[$goods_sku_info->warehouse] : '';
                     
-                    $v['goods'][] = $goods_name.'('.$props_name.')&nbsp; '.$weigh_note.':'.$item->num.'';
+                    $v['goods'][] = $goods_name.'('.$props_name.')&nbsp; '.$weigh_note.':'.$item->num.' '.$goodsWarehouse;
                 }
                 $v['pre_cost'] = round($v['pre_cost'], 2);
 
 
         $is_fx = env('IS_FX');
         return view('order/orderlist', ['result' =>$result,
-            'page'              =>$page,
-            'count'             =>$count,
-            'pages'             =>$pages,
-            'admin_id'          =>$admin_id,
-            'team_id'           =>$team_id,
-            'stime'             =>$stime,
-            'etime'             =>$etime,
-            'adminlist'         =>$adminList,
-            'search_admin'      =>$search_admin,
-            'self_role'         =>$self_role,
-            'receiverName'         =>$receiverName,
-            'receiverMobile'       =>$receiverMobile,
-            'status'            =>$status,
-            'id'            =>$id,
-            'last_url'      => 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'],
-            'overtime'      => $overtime,
-            'warehouse'      => $warehouse,
-            'is_fx'      => $is_fx,
-            'thisTime'      => date('Y-m-d H:i:s'),
+            'page'                  => $page,
+            'count'                 => $count,
+            'pages'                 => $pages,
+            'admin_id'              => $admin_id,
+            'team_id'               => $team_id,
+            'stime'                 => $stime,
+            'etime'                 => $etime,
+            'adminlist'             => $adminList,
+            'search_admin'          => $search_admin,
+            'self_role'             => $self_role,
+            'receiverName'          => $receiverName,
+            'receiverMobile'        => $receiverMobile,
+            'status'                => $status,
+            'id'                    => $id,
+            'last_url'              => 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'],
+            'overtime'              => $overtime,
+            'warehouse'             => $warehouse,
+            'is_fx'                 => $is_fx,
+            'thisTime'              => date('Y-m-d H:i:s'),
+            'warehouseArr'          => $this->warehouse,
             ]);
     }
 
         })->where('id','>', 1)->where('is_use', 1)->get();
         $adminList = json_decode(json_encode($adminList), true);
         return view('order/predictorderlist', ['result' =>$result,
-            'page'              =>$page,
-            'count'             =>$count,
-            'pages'             =>$pages,
-            'admin_id'          =>$admin_id,
-            'team_id'           =>$team_id,
-            'stime'             =>$stime,
-            'etime'             =>$etime,
-            'adminlist'         =>$adminList,
-            'search_admin'      =>$search_admin,
-            'self_role'         =>$self_role,
-            'receiverName'         =>$receiverName,
-            'receiverMobile'       =>$receiverMobile,
-            'status'            =>$status,
-            'if_all'            =>$if_all,
-            'last_url'      => 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'],
+            'page'              => $page,
+            'count'             => $count,
+            'pages'             => $pages,
+            'admin_id'          => $admin_id,
+            'team_id'           => $team_id,
+            'stime'             => $stime,
+            'etime'             => $etime,
+            'adminlist'         => $adminList,
+            'search_admin'      => $search_admin,
+            'self_role'         => $self_role,
+            'receiverName'      => $receiverName,
+            'receiverMobile'    => $receiverMobile,
+            'status'            => $status,
+            'if_all'            => $if_all,
+            'last_url'          => 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'],
+            'warehouseArr'      => $this->warehouse,
             ]);
     }
 
             }
         }
 
-        return view('order/ordercreate', ['categorylist' => $catelist, 'adminlist'=>$adminList, 'teamlist'=>$teamList, 'self_role'=>$self_role, 'createTime'=>$createTime, 'm_gift'=>$m_gift, 'b_gift'=>$b_gift]);
+        return view('order/ordercreate', [
+            'categorylist'  => $catelist,
+            'adminlist'     => $adminList,
+            'teamlist'      => $teamList,
+            'self_role'     => $self_role,
+            'createTime'    => $createTime,
+            'm_gift'        => $m_gift,
+            'b_gift'        => $b_gift,
+            'warehouseArr'  => $this->warehouse,
+            ]);
     }
     /**
      * 分组管理-进行添加操作
         }
 
         return view('order/orderedit', [       
-            'order' => $order,
+            'order'         => $order,
             //'categorylist' => $catelist,
-            'adminlist'=>$adminList,
-            'teamlist'=>$teamList,
-            'self_role'=>$self_role,
-            'str_query'=> 'page='.$page.'&admin_id='.$admin_id.'&stime='.$stime.'&etime='.$etime.'&receiverName='.$receiverName.'&receiverMobile='.$receiverMobile,
-            'last_url' => $last_url,
+            'adminlist'     => $adminList,
+            'teamlist'      => $teamList,
+            'self_role'     => $self_role,
+            'str_query'     => 'page='.$page.'&admin_id='.$admin_id.'&stime='.$stime.'&etime='.$etime.'&receiverName='.$receiverName.'&receiverMobile='.$receiverMobile,
+            'last_url'      => $last_url,
             'deposit_phone' => $deposit_phone,
-            'm_gift' => $m_gift,
-            'b_gift' => $b_gift,
+            'm_gift'        => $m_gift,
+            'b_gift'        => $b_gift,
             'order_m_gifts' => $order_m_gifts,
             'order_b_gifts' => $order_b_gifts,
-            'cust_info' => $cust_info,
+            'cust_info'     => $cust_info,
+            'warehouseArr'  => $this->warehouse,
         ]);
 
     }
             $v['receiverMobile'] = substr($v['receiverMobile'], 0, 3).'****'.substr($v['receiverMobile'], 7);
             $v['status_name'] = $status_arr[$v['status']];   
             $v['address'] = $v['receiverState'].$v['receiverCity'].$v['receiverDistrict'].$v['receiverStreet'].$v['receiverAddress'];   
-            $v['warehouse'] = $v['warehouse'] == 1? 'A仓库':'B仓库';      
+            $v['warehouse'] = $this->warehouse[$v['warehouse']];
             $v['is_fugou'] = $v['is_fugou'] == 1? '是':'否';      
             $v['is_refund'] = $v['is_refund'] == 1? '是':'否'; 
             $v['payment_type'] = $payArr[$v['payment_type']];    
         }
 
         return view('order/customerServiceAfterSaleCreate',[
-            'order'=>$order,
+            'order'         => $order,
             'deposit_phone' => $deposit_phone,
-            'self_role' => $self_role,
-            'm_gift' => $m_gift,
-            'b_gift' => $b_gift,
+            'self_role'     => $self_role,
+            'm_gift'        => $m_gift,
+            'b_gift'        => $b_gift,
             'order_m_gifts' => $order_m_gifts,
             'order_b_gifts' => $order_b_gifts,
-            'cust_info' => $cust_info,
+            'cust_info'     => $cust_info,
+            'warehouseArr'  => $this->warehouse,
             ]);
     }
 
         }
 
         return view('order/customerServiceAfterSaleEdit',[
-            'order' => $order,
+            'order'         => $order,
             'deposit_phone' => $deposit_phone,
-            'self_role' => $self_role,
-            'm_gift' => $m_gift,
-            'b_gift' => $b_gift,
+            'self_role'     => $self_role,
+            'm_gift'        => $m_gift,
+            'b_gift'        => $b_gift,
             'order_m_gifts' => $order_m_gifts,
             'order_b_gifts' => $order_b_gifts,
-            'cust_info' => $cust_info,
-            'id'=>$id,
+            'cust_info'     => $cust_info,
+            'id'            => $id,
+            'warehouseArr'  => $this->warehouse,
         ]);
     }
 

app/Http/Controllers/Admin/StatisticsController.php

 
 class StatisticsController extends Controller
 {
+
+    protected $warehouse = [];
+
+    public function __construct()
+    {
+        $this->warehouse = config('constants.WAREHOUSE');
+    }
+
     /**
      * 当日数据统计
      */
         
         $result = json_decode(json_encode($result), true);
         $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
-        $wareArr = array(
-            0 => '其他',
-            1 => 'A仓',
-            2 => 'B仓',
-            3 => 'C仓',
-            4 => 'D仓',
-        );
+        $wareArr = $this->warehouse;
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
             //$v['true_amount'] = $v['receivedAmount'] + $v['refund_price'] - $v['aftersale_fee'];
         $teamList = json_decode(json_encode($teamList), true);
 
         return view('/statistics/aftersaleFinanceList',[
-            'result'   =>   $result,
-            'team_id'   =>   $team_id,
-            'stime'   =>   $stime,
-            'etime'   =>   $etime,
-            'page'   =>   $page,
-            'count'   =>   $count,
-            'pages'   =>   $pages,
-            'teamlist'   =>   $teamList,
-            'warehouse'   =>   $warehouse,
+            'result'        => $result,
+            'team_id'       => $team_id,
+            'stime'         => $stime,
+            'etime'         => $etime,
+            'page'          => $page,
+            'count'         => $count,
+            'pages'         => $pages,
+            'teamlist'      => $teamList,
+            'warehouse'     => $warehouse,
+            'warehouseArr'  => $this->warehouse,
         ]);
     } 
 
         
         $result = json_decode(json_encode($result), true);
         $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
-        $wareArr = array(
-            0 => '其他',
-            1 => 'A仓',
-            2 => 'B仓',
-            3 => 'C仓',
-            4 => 'D仓',
-        );
+        $wareArr = $this->warehouse;
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;            
             $v['payment_type'] = $payArr[$v['payment_type']];
         $teamList = json_decode(json_encode($teamList), true);
 
         return view('/statistics/refundFinanceList',[
-            'result'   =>   $result,
-            'team_id'   =>   $team_id,
-            'stime'   =>   $stime,
-            'etime'   =>   $etime,
-            'page'   =>   $page,
-            'count'   =>   $count,
-            'pages'   =>   $pages,
-            'teamlist'   =>   $teamList,
-            'warehouse'   =>   $warehouse,
+            'result'        => $result,
+            'team_id'       => $team_id,
+            'stime'         => $stime,
+            'etime'         => $etime,
+            'page'          => $page,
+            'count'         => $count,
+            'pages'         => $pages,
+            'teamlist'      => $teamList,
+            'warehouse'     => $warehouse,
+            'warehouseArr'  => $this->warehouse
         ]);
     } 
 
         
         $result = json_decode(json_encode($result), true);
         $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
-        $wareArr = array(
-            0 => '其他',
-            1 => 'A仓',
-            2 => 'B仓',
-            3 => 'C仓',
-            4 => 'D仓',
-        );
+        $wareArr = $this->warehouse;
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;            
             $v['payment_type'] = $payArr[$v['payment_type']];
         $teamList = json_decode(json_encode($teamList), true);
 
         return view('/statistics/sendFinanceList',[
-            'result'   =>   $result,
-            'team_id'   =>   $team_id,
-            'stime'   =>   $stime,
-            'etime'   =>   $etime,
-            'page'   =>   $page,
-            'count'   =>   $count,
-            'pages'   =>   $pages,
-            'teamlist'   =>   $teamList,
-            'warehouse'   =>   $warehouse,
+            'result'        => $result,
+            'team_id'       => $team_id,
+            'stime'         => $stime,
+            'etime'         => $etime,
+            'page'          => $page,
+            'count'         => $count,
+            'pages'         => $pages,
+            'teamlist'      => $teamList,
+            'warehouse'     => $warehouse,
+            'warehouseArr'  => $this->warehouse,
         ]);
     } 
 
         
         $result = json_decode(json_encode($result), true);
         $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
-        $wareArr = array(
-            0 => '其他',
-            1 => 'A仓',
-            2 => 'B仓',
-            3 => 'C仓',
-            4 => 'D仓',
-        );
+        $wareArr = $this->warehouse;
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
             //$v['true_amount'] = $v['receivedAmount'] + $v['refund_price'] - $v['aftersale_fee'];
         
         $result = json_decode(json_encode($result), true);
         $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
-        $wareArr = array(
-            0 => '其他',
-            1 => 'A仓',
-            2 => 'B仓',
-            3 => 'C仓',
-            4 => 'D仓',
-        );
+        $wareArr = $this->warehouse;
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;            
             $v['payment_type'] = $payArr[$v['payment_type']];
         
         $result = json_decode(json_encode($result), true);
         $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
-        $wareArr = array(
-            0 => '其他',
-            1 => 'A仓',
-            2 => 'B仓',
-            3 => 'C仓',
-            4 => 'D仓',
-        );
+        $wareArr = $this->warehouse;
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;            
             $v['payment_type'] = $payArr[$v['payment_type']];
             if($warehouse>0) $query->where('warehouse', '=', $warehouse);
         })->whereNotNull('send_time')->where('warehouse','>',0)->where('logistics_id','>','')->where('is_del', 0)->groupBy('warehouse')->groupBy('send_time')->orderBy('send_time', 'desc')->offset($offset)->limit($pageSize)->get();
 
-        $wareArr = array(
-            0 => '其他',
-            1 => 'A仓',
-            2 => 'B仓',
-            3 => 'C仓',
-            4 => 'D仓',
-        );
+        $wareArr = $this->warehouse;
         foreach($result as $k=>&$item){
             $item->warehouse = $wareArr[$item->warehouse];
         }
 
 
         return view('statistics/warehouseFinanceList', ['result'=>$result,
-            'page'              =>$page,
-            'count'             =>$count,
-            'pages'             =>$pages,  
-            'warehouse'         =>$warehouse,
-            'stime'             =>$stime,  
-            'etime'             =>$etime,  
-            'total'             =>$total,
+            'page'              => $page,
+            'count'             => $count,
+            'pages'             => $pages,
+            'warehouse'         => $warehouse,
+            'stime'             => $stime,
+            'etime'             => $etime,
+            'total'             => $total,
+            'warehouseArr'      => $this->warehouse,
         ]);
 
     }   
             if($warehouse>0) $query->where('warehouse', '=', $warehouse);
         })->whereNotNull('send_time')->where('warehouse','>',0)->where('logistics_id','>','')->where('is_del', 0)->groupBy('warehouse')->groupBy('send_time')->orderBy('send_time', 'desc')->get();
 
-        $wareArr = array(
-            0 => '其他',
-            1 => 'A仓',
-            2 => 'B仓',
-            3 => 'C仓',
-            4 => 'D仓',
-        );
+        $wareArr = $this->warehouse;
         foreach($result as $k=>&$item){
             $item->warehouse = $wareArr[$item->warehouse];
         }

app/Order.php

       return $result;
     }
 
-   	public static function mjApi($params = array()){  		
-      $accessKey = "B1E69297B5DA44DAB35099A5F28F41D9"; //erp 生成的 accessKey
-      $accessSecret = "4sN2LbylhOglelMP";
-//   		$accessKey = "F82A757089D84F89B1782EDC3A4DA82A"; //erp 生成的 accessKey
-//        $accessSecret = "wB2ueW8eQOHXNWcN";
+   	public static function mjApi($params = array()){
+        $accessKey = env('ERP_ACCESS_KEY');
+        $accessSecret = env('ERP_ACCESS_SECRET');
 	    $params["timestamp"] = time()."000";
 	    $params["version"] = "v1";
 	    $reqparams = $params;

app/OrderScript.php

       return $result;
     }
 
-   	public static function mjApi($params = array()){  		
-      $accessKey = "B1E69297B5DA44DAB35099A5F28F41D9"; //erp 生成的 accessKey
-      $accessSecret = "4sN2LbylhOglelMP";
-   		//$accessKey = "F82A757089D84F89B1782EDC3A4DA82A"; //erp 生成的 accessKey     
-		  //$accessSecret = "wB2ueW8eQOHXNWcN";
+   	public static function mjApi($params = array()){
+        $accessKey = env('ERP_ACCESS_KEY');
+        $accessSecret = env('ERP_ACCESS_SECRET');
 	    $params["timestamp"] = time()."000";
 	    $params["version"] = "v1";
 	    $reqparams = $params;

resources/views/order/customerServiceAfterSaleCreate.blade.php

                 <font color='red'>* </font>发货仓库：</label>
                 <div class="formControls col-xs-6 col-sm-6">
                     <span>
-                        @if($order['warehouse']=='1') A仓库  @endif
-                        @if($order['warehouse']=='2') B仓库 @endif
-                        @if($order['warehouse']=='3') C仓库 @endif
-                        @if($order['warehouse']=='4') D仓库 @endif
+                        {{$warehouseArr[$order['warehouse']]}}
                     </span>
                 </div>
             </div>

resources/views/order/customerServiceAfterSaleEdit.blade.php

                         <font color='red'>* </font>发货仓库：</label>
                     <div class="formControls col-xs-6 col-sm-6">
                     <span>
-                        @if($order['warehouse']=='1') A仓库  @endif
-                        @if($order['warehouse']=='2') B仓库 @endif
-                        @if($order['warehouse']=='3') C仓库 @endif
-                        @if($order['warehouse']=='4') D仓库 @endif
+                        {{$warehouseArr[$order['warehouse']]}}
                     </span>
                     </div>
                 </div>

resources/views/order/orderedit.blade.php

                     <span class="select-box">
                         <select  size="1" name="warehouse" id='warehouse'>
                             <option value="0" @if($order['warehouse']=='0') selected @endif>- 请选择 -</option>
-                            <option value="1" @if($order['warehouse']=='1') selected @endif>A仓库</option>                            
-                            <option value="2" @if($order['warehouse']=='2') selected @endif>B仓库</option>                            
-                            <option value="3" @if($order['warehouse']=='3') selected @endif>C仓库</option>                            
-                            <option value="4" @if($order['warehouse']=='4') selected @endif>D仓库</option>                            
+                            @foreach($warehouseArr as $warehouseVal=>$warehouseName)
+                                <option value="{{$warehouseVal}}" @if($order['warehouse']==$warehouseVal) selected @endif>{{$warehouseName}}</option>
+                            @endforeach
                         </select>
                     </span>
                 </div>
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
                     <font color='red'>* </font>发货仓库：</label>
-                <div class="formControls col-xs-6 col-sm-6">                        
-                    @if($order['warehouse']=='1') A仓库  @endif                          
-                    @if($order['warehouse']=='2') B仓库 @endif                          
-                    @if($order['warehouse']=='3') C仓库 @endif 
-                    @if($order['warehouse']=='4') D仓库 @endif 
-                    <input type="hidden" name="warehouse" id='warehouse' value="{{$order['warehouse']}}"/>                         
+                <div class="formControls col-xs-6 col-sm-6">
+                    {{$warehouseArr[$order['warehouse']]}}
+                    <input type="hidden" name="warehouse" id='warehouse' value="{{$order['warehouse']}}"/>
 
                 </div>
             </div>

resources/views/order/orderlist.blade.php

                 <input class="input-text" style="width:5%;text-align:center" type="text" value="发货仓库"/>
                 <select style="width:6%;text-align:center" id='warehouse' name="warehouse">
                     <option value="0" @if($warehouse=='0') selected @endif>-- 请选择--</option>
-                    @if($self_role != '分销销售' && $self_role != '分销管理员')
-                    <option value="1" @if($warehouse==1) selected @endif>A仓</option>
-                    <option value="2" @if($warehouse==2) selected @endif>B仓</option>
-                    @endif
-                    <option value="3" @if($warehouse==3) selected @endif>C仓</option>
-                    <option value="4" @if($warehouse==4) selected @endif>D仓</option>
-
+                    @foreach($warehouseArr as $warehouseVal=>$warehouseName)
+                        <option value="$warehouseVal" @if($warehouse==$warehouseVal) selected @endif>{{$warehouseName}}</option>
+                    @endforeach
                 </select> 
                 <div style="float:right">
                     <a class="btn btn-primary radius" onclick="user_search()" href="javascript:;">搜索</a>
                             </td>
                             @endif
                             @endif                          
-                            <td>@if($a['warehouse']==1) A仓库 @elseif($a['warehouse']==2) B仓库 @elseif($a['warehouse']==3) C仓库 @elseif($a['warehouse']==4) D仓库 @else @endif</td>                            
+                            <td>{{$warehouseArr[$a['warehouse']]}}</td>
                             <td>{{$a['receivedAmount']}}</td>                            
                             <td>{{$a['payment_type']}}</td>                            
                             <td>{{$a['createTime']}}</td> 
 
                                 @if($a['status'] >= 3)
 
-                                @elseif($a['status'] == 2 && $self_role !='超级管理员' && $self_role !='售后管理员')
+                                @elseif($a['status'] == 2 && $self_role !='超级管理员')
 
                                 @else
                                 <a style="text-decoration:none" onClick='order_del("删除","{{$a['id']}}","{{$a['is_cannot_del']}}")' href="javascript:;" title="删除"><span class="btn btn-danger radius">删除</span></a>
         function order_del(obj,id,is_cannot_del){
             var msg = '确认要删除吗？';
             if(is_cannot_del){
-                var msg = '该订单已打单待发货，请务必联系仓库管理员确认可以删除该订单，是否继续删除？'
+                var msg = '该订单已打单待发货，请务必联系超级管理员确认可以删除该订单，是否继续删除？'
             }
             layer.confirm(msg,function(index){
                 location.href='/admin/order/delete/'+id;
 
         function order_verify(id, status, name, pre_cost_flag, is_not_fx){
             if( status == 2 && is_not_fx==1){
-                if( !confirm('该订单需要转仓，请联系售后管理员！') ){
-                    return false;
-                }
+                confirm('该订单需要转仓，请联系售后管理员！');
+                return false;
             }
             else if( status == 2 && pre_cost_flag==1){
+                //点击确定后继续向下执行，点击取消则return false
                 if( !confirm('该订单毛利低于<40%, 是否确定订单价格合理？') ){
                     return false;
                 }
             else if( !confirm('确认'+name) ){
                 return false;
             }
+
             var admin_id = $('#admin_id').val();
             var stime = $('#stime').val();
             var etime = $('#etime').val();

resources/views/order/predictorderlist.blade.php

                             </td>
                             @endif
                             @endif                          
-                            <td>@if($a['warehouse']==1) A仓库 @elseif($a['warehouse']==2) B仓库 @elseif($a['warehouse']==3) C仓库 @elseif($a['warehouse']==4) D仓库 @else @endif</td>                            
+                            <td>{{$warehouseArr[$a['warehouse']]}}</td>
                             <td>{{$a['receivedAmount']}}</td>                            
                             <td>{{$a['payment_type']}}</td>                            
                             <td>{{$a['createTime']}}</td> 

resources/views/statistics/aftersaleFinanceList.blade.php

                 <input class="input-text" style="width:6%;text-align:center" type="text" value="所属仓库"/> 
                 <select style="width:10%;text-align:center" id='warehouse' name="warehouse">
                     <option value="0" @if($warehouse==0) selected @endif>-- 选择仓库 --</option>
-                    <option value="1" @if($warehouse==1) selected @endif>A仓库</option>
-                    <option value="2" @if($warehouse==2) selected @endif>B仓库</option>
-                    <option value="3" @if($warehouse==3) selected @endif>C仓库</option>
-                    <option value="4" @if($warehouse==4) selected @endif>D仓库</option>
-                    
+                    @foreach($warehouseArr as $warehouseVal=>$warehouseName)
+                        <option value="{{$warehouseVal}}" @if($warehouse == $warehouseVal) selected @endif >{{$warehouseName}}</option>
+                    @endforeach
                 </select> 
                               
                 <a class="btn btn-primary radius"  style="margin-left: 5px" onclick="user_search()" href="javascript:;">搜索</a>

resources/views/statistics/refundFinanceList.blade.php

                 <input class="input-text" style="width:6%;text-align:center" type="text" value="所属仓库"/> 
                 <select style="width:10%;text-align:center" id='warehouse' name="warehouse">
                     <option value="0" @if($warehouse==0) selected @endif>-- 选择仓库 --</option>
-                    <option value="1" @if($warehouse==1) selected @endif>A仓库</option>
-                    <option value="2" @if($warehouse==2) selected @endif>B仓库</option>
-                    <option value="3" @if($warehouse==3) selected @endif>C仓库</option>
-                    <option value="4" @if($warehouse==4) selected @endif>D仓库</option>
-                    
+                    @foreach($warehouseArr as $warehouseVal=>$warehouseName)
+                        <option value="{{$warehouseVal}}" @if($warehouse == $warehouseVal) selected @endif>{{$warehouseName}}</option>
+                    @endforeach
                 </select> 
                               
                 <a class="btn btn-primary radius"  style="margin-left: 5px" onclick="user_search()" href="javascript:;">搜索</a>

resources/views/statistics/sendFinanceList.blade.php

                 <input class="input-text" style="width:6%;text-align:center" type="text" value="所属仓库"/> 
                 <select style="width:10%;text-align:center" id='warehouse' name="warehouse">
                     <option value="0" @if($warehouse==0) selected @endif>-- 选择仓库 --</option>
-                    <option value="1" @if($warehouse==1) selected @endif>A仓库</option>
-                    <option value="2" @if($warehouse==2) selected @endif>B仓库</option>
-                    <option value="3" @if($warehouse==3) selected @endif>C仓库</option>
-                    <option value="4" @if($warehouse==4) selected @endif>D仓库</option>
-                    
+                    @foreach($warehouseArr as $warehouseVal=>$warehouseName)
+                        <option value="{{$warehouseVal}}" @if($warehouse == $warehouseVal) selected @endif>{{$warehouseName}}</option>
+                    @endforeach
                 </select> 
                               
                 <a class="btn btn-primary radius"  style="margin-left: 5px" onclick="user_search()" href="javascript:;">搜索</a>

resources/views/statistics/warehouseFinanceList.blade.php

                 <input class="input-text" style="width:6%;text-align:center" type="text" value="所属仓库"/> 
                 <select style="width:10%;text-align:center" id='warehouse' name="warehouse">
                     <option value="0" @if($warehouse==0) selected @endif>-- 选择仓库 --</option>
-                    <option value="1" @if($warehouse==1) selected @endif>A仓库</option>
-                    <option value="2" @if($warehouse==2) selected @endif>B仓库</option>
-                    <option value="3" @if($warehouse==3) selected @endif>C仓库</option>
-                    <option value="4" @if($warehouse==4) selected @endif>D仓库</option>
-                    
+                    @foreach($warehouseArr as $warehouseVal=>$warehouseName)
+                        <option value="{{$warehouseVal}}" @if($warehouse == $warehouseVal) selected @endif >{{$warehouseName}}</option>
+                    @endforeach
                 </select>                          
                 <input class="input-text" style="width:6%;text-align:center" type="text" value="开始时间"/>
                 <input id="stime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" autocomplete="off" class="input-text Wdate" style="width:12%;text-align:center;margin-left: -5px" name="stime" value="{{$stime?$stime:''}}">