Commit 89169587 authored by 冯超鹏's avatar 冯超鹏

提交工单模块

parent 91dedef5
Pipeline #211 canceled with stages
...@@ -176,8 +176,8 @@ class AlarmOrderController extends Controller ...@@ -176,8 +176,8 @@ class AlarmOrderController extends Controller
} }
//获取当前订单为第几步 //获取当前订单为第几步
public function orderin(Request $request){ public function orderin(Request $request){
$orderid = $request->input('oid'); $orderid = $request->input('id');
$status = AlarmOrder::where('id','=',$orderid)->value('isorderone'); $status = AlarmOrder::where('id','=',$orderid)->select('isorderone','id')->first();
return $this->jsonSuccessData($status); return $this->jsonSuccessData($status);
} }
} }
...@@ -33,6 +33,7 @@ class ZehongTcpController extends Controller ...@@ -33,6 +33,7 @@ class ZehongTcpController extends Controller
$devicezijian = substr($data, 21, 1); $devicezijian = substr($data, 21, 1);
$devicecrc = substr($data, 22, 4); $devicecrc = substr($data, 22, 4);
$isdata = substr($data, 0, 22); $isdata = substr($data, 0, 22);
// return $this->jsonSuccessData([$this->getPrc($isdata),$devicecrc]);
if($this->getPrc($isdata) == $devicecrc){ if($this->getPrc($isdata) == $devicecrc){
$data = ['id'=>$deviceId,'status'=>$status,'np'=>$devicenp,'famen'=>$devicefamen,'chongqi'=>$devicechongqi,'zijian'=>$devicezijian]; $data = ['id'=>$deviceId,'status'=>$status,'np'=>$devicenp,'famen'=>$devicefamen,'chongqi'=>$devicechongqi,'zijian'=>$devicezijian];
$totcp = json_decode($this->mysqldb($data),true); $totcp = json_decode($this->mysqldb($data),true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment