update

application/index/controller/Cabinet.php

@@ -76,19 +76,20 @@ class Cabinet extends Base
     public function OpenBox()
     {
         $params['id']                 = $this->getid();
-        $params['cabinet_code']       = input('param.cabinet_number');
+        $cabinet_code                 = input('param.cabinet_number');
         $box_number                   = input('param.box_number');
         $box_position_list[]          = $box_number;
         $params['box_position_list']  = $box_position_list;
         $params['delay_time']         = 0;
 
-        $cabinet = $this->get_cabinet($params['cabinet_code']);
+        $cabinet = $this->get_cabinet($cabinet_code);
         if($cabinet == false){
             return json(json_error_exception('1008'));
         }
         $params['ret_queue']          = 'RET' . session_id();
         $params['req_url']            = $cabinet['req_url'];
         $params['key']                = $cabinet['login_key'];
+        $params['cabinet_code']       = $cabinet['number'];
         $params['method']             = 'OpenBoxR';
 
         $result = $this->proc_request(self::queue_name,'OpenBox',$params);
@@ -103,9 +104,9 @@ class Cabinet extends Base
     public function LockCabinet()
     {
         $params['id']                 = $this->getid();
-        $params['cabinet_code']     = input('param.cabinet_number');
+        $cabinet_code                 = input('param.cabinet_number');
 
-        $cabinet = $this->get_cabinet($params['cabinet_code']);
+        $cabinet = $this->get_cabinet($cabinet_code);
         $params['delay_time']         = 0;
         if($cabinet == false){
             return json(json_error_exception('1008'));
@@ -114,6 +115,7 @@ class Cabinet extends Base
         $params['ret_queue']          = 'RET' . session_id();
         $params['req_url']            = $cabinet['req_url'];
         $params['key']                = $cabinet['login_key'];
+        $params['cabinet_code']       = $cabinet['number'];
         $params['method']             = 'LockCabinetR';
 
         $result = $this->proc_request(self::queue_name,'LockCabinet',$params);
@@ -127,9 +129,9 @@ class Cabinet extends Base
     public function UnLockCabinet()
     {
         $params['id']                 = $this->getid();
-        $params['cabinet_code']     = input('param.cabinet_number');
+        $cabinet_code                 = input('param.cabinet_number');
 
-        $cabinet = $this->get_cabinet($params['cabinet_code']);
+        $cabinet = $this->get_cabinet($cabinet_code);
         $params['delay_time']         = 0;
         if($cabinet == false){
             return json(json_error_exception('1008'));
@@ -138,6 +140,7 @@ class Cabinet extends Base
         $params['ret_queue']          = 'RET' . session_id();
         $params['req_url']            = $cabinet['req_url'];
         $params['key']                = $cabinet['login_key'];
+        $params['cabinet_code']       = $cabinet['number'];
         $params['method']             = 'UnLockCabinetR';
 
         $result = $this->proc_request(self::queue_name,'UnLockCabinet',$params);
@@ -151,10 +154,10 @@ class Cabinet extends Base
     public function ReleaseAlarm()
     {
         $params['id']               = $this->getid();
-        $params['cabinet_code']     = input('param.cabinet_number');
+        $cabinet_code                 = input('param.cabinet_number');
         $params['delay_time']         = 0;
 
-        $cabinet = $this->get_cabinet($params['cabinet_code']);
+        $cabinet = $this->get_cabinet($cabinet_code);
         if($cabinet == false){
             return json(json_error_exception('1008'));
         }
@@ -162,6 +165,7 @@ class Cabinet extends Base
         $params['ret_queue']          = 'RET' . session_id();
         $params['req_url']            = $cabinet['req_url'];
         $params['key']                = $cabinet['login_key'];
+        $params['cabinet_code']       = $cabinet['number'];
         $params['method']             = 'ReleaseAlarmR';
 
         $result = $this->proc_request(self::queue_name,'ReleaseAlarm',$params);
@@ -175,10 +179,10 @@ class Cabinet extends Base
     public function Reboot()
     {
         $params['id']               = $this->getid();
-        $params['cabinet_code']     = input('param.cabinet_number');
+        $cabinet_code                 = input('param.cabinet_number');
         $params['delay_time']         = 0;
 
-        $cabinet = $this->get_cabinet($params['cabinet_code']);
+        $cabinet = $this->get_cabinet($cabinet_code);
         if($cabinet == false){
             return json(json_error_exception('1008'));
         }
@@ -186,6 +190,7 @@ class Cabinet extends Base
         $params['ret_queue']          = 'RET' . session_id();
         $params['req_url']            = $cabinet['req_url'];
         $params['key']                = $cabinet['login_key'];
+        $params['cabinet_code']       = $cabinet['number'];
         $params['method']             = 'RebootR';
 
         $result = $this->proc_request(self::queue_name,'Reboot',$params);
@@ -199,10 +204,10 @@ class Cabinet extends Base
     public function QueryState()
     {
         $params['id']               = $this->getid();
-        $params['cabinet_code']     = input('param.cabinet_number');
+        $cabinet_code                 = input('param.cabinet_number');
         $params['delay_time']         = 0;
 
-        $cabinet = $this->get_cabinet($params['cabinet_code']);
+        $cabinet = $this->get_cabinet($cabinet_code);
         if($cabinet == false){
             return json(json_error_exception('1008'));
         }
@@ -210,6 +215,7 @@ class Cabinet extends Base
         $params['ret_queue']          = 'RET' . session_id();
         $params['req_url']            = $cabinet['req_url'];
         $params['key']                = $cabinet['login_key'];
+        $params['cabinet_code']       = $cabinet['number'];
         $params['method']             = 'RebootR';
 
         $result = $this->proc_request(self::queue_name,'QueryState',$params);
@@ -240,7 +246,7 @@ class Cabinet extends Base
             json_error(1007 , '柜子号码不能为空');
         }
         $BoxModel = new BoxModel();
-        $where['cabinet_number'] = $cabinet_number;
+        $where['sc_box.cabinet_number'] = $cabinet_number;
         $selectResult = $BoxModel->getBoxsByWhere($where);
         $box_status = ['1' => '空闲' , '2' => '已使用' , '3' => '锁定中'];
         // 拼装参数

application/index/model/BoxModel.php

@@ -9,6 +9,11 @@ class BoxModel extends Model {
     // 确定链接表名
     protected $name = 'box';
 
+    public function Order()
+    {
+        return $this->hasOne('OrderModel', 'order_sn', 'order_sn')->joinType('LEFT');
+    }
+
     /**
      * 根据柜号箱号获取箱子信息
      * @cabinet_number $param
@@ -47,7 +52,7 @@ class BoxModel extends Model {
      */
     public function getBoxsByWhere($where)
     {
-        return $this->where($where)->order('box_number asc')->select();
+        return $this->Order()->haswhere($where)->order('sc_box.box_number asc')->field('sc_box.*,OrderModel.enter_time')->select();
     }
 
     /**