Skip to content

W
weixiuhui
Commit 17200e18 authored by 蒋林's avatar 蒋林
Browse files
Options

1. 维修单相关删除接口 

2. 派工单接受,保存/拒绝接口
parent 145b59b4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 469 additions and 164 deletions
application/controllers/api/Galanz.php
View file @ 17200e18
......@@ -96,11 +96,10 @@ class Galanz extends BaseController
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getCallOrder($values['out_trade_no'], $sourceGalanzObj);
$order = $obj->SetSaveOrderValues($order, $values);
$result = $sourceGalanzObj->SaveOrder($order['new_id'], $order);
$result = $this->diffCallOrder($result);
//保存订单
//$sourceGalanzObj->SaveOrder($order['new_id'], $order);
$obj->ReturnMessage(true, '', $order);
$obj->ReturnMessage(true, '', $result);
}
......@@ -114,9 +113,14 @@ class Galanz extends BaseController
$obj->SetValues($param);
$obj->CheckRefuseOrderValues();
$values = $obj->GetValues();
$this->saveLog('', 'refuseOrder', $param);
$this->saveLog($values['out_trade_no'], 'refuseOrder', $param);
$obj->ReturnMessage(true, '', $values);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getCallOrder($values['out_trade_no'], $sourceGalanzObj);
$result = $sourceGalanzObj->RefuseOrder($order['new_id'], $order);
$result = $this->diffCallOrder($result);
$obj->ReturnMessage(true, '', $result);
}
//接受订单
......@@ -129,9 +133,14 @@ class Galanz extends BaseController
$obj->SetValues($param);
$obj->CheckAcceptOrderValues();
$values = $obj->GetValues();
$this->saveLog('', 'acceptOrder', $param);
$this->saveLog($values['out_trade_no'], 'acceptOrder', $param);
$obj->ReturnMessage(true, '', $values);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getCallOrder($values['out_trade_no'], $sourceGalanzObj);
$result = $sourceGalanzObj->AcceptOrder($order['new_id'], $order);
$result = $this->diffCallOrder($result);
$obj->ReturnMessage(true, '', $result);
}
//转录维修单
......@@ -289,6 +298,27 @@ class Galanz extends BaseController
$obj->ReturnMessage(true, '', $result);
}
//维修单-删除机器信息
public function delProdWorkOrder()
{
$param = $this->input->post();
//验证参数
$obj = $this->receiveGalanzObj();
$obj->SetValues($param);
$obj->CheckDelProdWorkOrderValues();
$values = $obj->GetValues();
$this->saveLog($values['work_order_no'], 'delProdWorkOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj);
$order = $obj->SetDelProdWorkOrderValues($order, $values);
$result = $sourceGalanzObj->ProdDelWorkOrder($order['new_id'], $order);
$result = $this->diffWorkOrder($result);
$obj->ReturnMessage(true, '', $result);
}
//维修单-添加故障信息
public function addErrorWorkOrder()
{
......@@ -310,6 +340,27 @@ class Galanz extends BaseController
$obj->ReturnMessage(true, '', $result);
}
//维修单-添加故障信息
public function delErrorWorkOrder()
{
$param = $this->input->post();
//验证参数
$obj = $this->receiveGalanzObj();
$obj->SetValues($param);
$obj->CheckDelErrorWorkOrderValues();
$values = $obj->GetValues();
$this->saveLog($values['work_order_no'], 'delErrorWorkOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj);
$order = $obj->SetDelErrorWorkOrderValues($order, $values);
$result = $sourceGalanzObj->ErrorDelWorkOrder($order['new_id'], $order);
$result = $this->diffWorkOrder($result);
$obj->ReturnMessage(true, '', $result);
}
//维修单-添加配件信息
public function addPartsWorkOrder()
{
......@@ -325,7 +376,28 @@ class Galanz extends BaseController
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj);
$order = $obj->SetAddPartsWorkOrderValues($order, $values);
$result = $sourceGalanzObj->PartsAddAddWorkOrder($order['new_id'], $order);
$result = $sourceGalanzObj->PartsAddWorkOrder($order['new_id'], $order);
$result = $this->diffWorkOrder($result);
$obj->ReturnMessage(true, '', $result);
}
//维修单-删除配件信息
public function delPartsWorkOrder()
{
$param = $this->input->post();
//验证参数
$obj = $this->receiveGalanzObj();
$obj->SetValues($param);
$obj->CheckDelPartsWorkOrderValues();
$values = $obj->GetValues();
$this->saveLog($values['work_order_no'], 'delPartsWorkOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj);
$order = $obj->SetDelPartsWorkOrderValues($order, $values);
$result = $sourceGalanzObj->PartsDelWorkOrder($order['new_id'], $order);
$result = $this->diffWorkOrder($result);
$obj->ReturnMessage(true, '', $result);
......
application/controllers/test/Rgalanz.php
View file @ 17200e18
......@@ -24,8 +24,11 @@ class Rgalanz extends BaseController
private function galanzObj()
{
// self::$testu = 'R75510005';
// self::$testp = 'dgqh!769'; //urlencode(str_aes('weixiuhui010'))
self::$testu = 'K75516022';
self::$testp = '123456'; //urlencode(str_aes('weixiuhui010'))
self::$testp = '123456';
$this->load->library('Receive/ReceiveGalanz', null, 'ReceiveGalanz');
return $this->ReceiveGalanz;
......@@ -63,7 +66,7 @@ class Rgalanz extends BaseController
$data['appid'] = '10001';
$data['account'] = self::$testu;
$data['pwd'] = self::$testp;
$data['out_trade_no'] = 'CALL2015100900929';
$data['out_trade_no'] = 'CALL2016091202257';
$data['nonce_str'] = $obj->GetNonceStr();
$obj->SetValues($data);
......@@ -78,6 +81,63 @@ class Rgalanz extends BaseController
$this->show($result);
}
public function acceptOrder()
{
$obj = $this->galanzObj();
$data['appid'] = '10001';
$data['account'] = self::$testu;
$data['pwd'] = self::$testp;
$data['out_trade_no'] = 'CALL2016091202257';
$data['nonce_str'] = $obj->GetNonceStr();
$obj->SetValues($data);
$obj->SetSign();
$values = $obj->GetValues();
$url = self::$apiUrl . "api/galanz/acceptOrder";
$result = $this->curlPost($url, $values);
$result['data'] = json_decode($result['data'], true);
$this->show($result);
}
public function saveOrder()
{
$obj = $this->galanzObj();
$time = strtotime('2016/09/12 16:30');
$data = [
'appid' => '10001',
'account' => self::$testu,
'pwd' => self::$testp,
'out_trade_no' => 'CALL2016091202257',
'sitecontacttime' => $time,
'siteappointmenttime' => $time,
'actualvisittime' => $time,
'isguaranty' => '0',
'finishstatus' => '1',
'unfinishreason' => '',
'complete_reason' => '1',
'sitedealremarks' => urlencode('已完工'),
'servicePersonnel' => urlencode('俞国华'),
];
$data['nonce_str'] = $obj->GetNonceStr();
$obj->SetValues($data);
$obj->SetSign();
$values = $obj->GetValues();
$url = self::$apiUrl . "api/galanz/saveOrder";
$result = $this->curlPost($url, $values);
$result['data'] = json_decode($result['data'], true);
$this->show($result);
}
public function queryWorkOrder()
{
$obj = $this->galanzObj();
......@@ -85,7 +145,7 @@ class Rgalanz extends BaseController
$data['appid'] = '10001';
$data['account'] = self::$testu;
$data['pwd'] = self::$testp;
$data['work_order_no'] = 'WO2016090802059';
$data['work_order_no'] = 'WO2016090703635';
$data['nonce_str'] = $obj->GetNonceStr();
$obj->SetValues($data);
......@@ -146,6 +206,75 @@ class Rgalanz extends BaseController
$this->show($result);
}
public function delPartsWorkOrder()
{
$obj = $this->galanzObj();
$data['appid'] = '10001';
$data['account'] = self::$testu;
$data['pwd'] = self::$testp;
$data['work_order_no'] = 'WO2016090703635';
$data['chk'] = '0436e21c-2ed5-4c52-824e-93a2a5b45108';
$data['nonce_str'] = $obj->GetNonceStr();
$obj->SetValues($data);
$obj->SetSign();
$values = $obj->GetValues();
$url = self::$apiUrl . "api/galanz/delPartsWorkOrder";
$result = $this->curlPost($url, $values);
$result['data'] = json_decode($result['data'], true);
$this->show($result);
}
public function delErrorWorkOrder()
{
$obj = $this->galanzObj();
$data['appid'] = '10001';
$data['account'] = self::$testu;
$data['pwd'] = self::$testp;
$data['work_order_no'] = 'WO2016090703635';
$data['chk'] = 'b66480af-9ebc-4b7b-8308-00cb26efa194';
$data['nonce_str'] = $obj->GetNonceStr();
$obj->SetValues($data);
$obj->SetSign();
$values = $obj->GetValues();
$url = self::$apiUrl . "api/galanz/delErrorWorkOrder";
$result = $this->curlPost($url, $values);
$result['data'] = json_decode($result['data'], true);
$this->show($result);
}
public function delProdWorkOrder()
{
$obj = $this->galanzObj();
$data['appid'] = '10001';
$data['account'] = self::$testu;
$data['pwd'] = self::$testp;
$data['work_order_no'] = 'WO2016090703635';
$data['chk'] = 'b4d19534-53a7-4ba8-9f21-0a82ea28f033';
$data['nonce_str'] = $obj->GetNonceStr();
$obj->SetValues($data);
$obj->SetSign();
$values = $obj->GetValues();
$url = self::$apiUrl . "api/galanz/delProdWorkOrder";
$result = $this->curlPost($url, $values);
$result['data'] = json_decode($result['data'], true);
$this->show($result);
}
public function lookupErrormModule()
{
$obj = $this->galanzObj();
......@@ -243,39 +372,39 @@ class Rgalanz extends BaseController
'appid' => '10001',
'account' => self::$testu,
'pwd' => self::$testp,
'work_order_no' => 'WO2016090802059',
'work_order_no' => 'WO2016090703635',
'custname' => '何先生',
'custmobile' => '',
'address' => urlencode('东莞市,南城街道办事处,大兴厨具1111'),
'broughtdate' => time(),
'installdate' => time(),
'visittime' => time(),
'finishtime' => time(),
'address' => '',
'broughtdate' => '',
'installdate' => '',
'visittime' => '',
'finishtime' => '',
'repairapply' => '',
'fault' => '',
'parts' => '',
];
$fault = [
'chk' => 'de1f6e4c-2947-41dc-91aa-a8b69b384186',
'errormoduleid' => '1fcb2508-d161-e411-80cb-00155d016a1c',
'errormoduleidName' => '不能制冷',
'errorgroupid' => '2c27e484-924e-4168-a01e-3b7ca5a42241',
'errorgroupidName' => '压缩机端子破裂',
'errorsolutionid' => '7797093e-34b2-48b6-a623-df766beb951d',
'errorsolutionidName' => '更换压缩机',
];
// $fault = [
// 'chk' => 'de1f6e4c-2947-41dc-91aa-a8b69b384186',
// 'errormoduleid' => '1fcb2508-d161-e411-80cb-00155d016a1c',
// 'errormoduleidName' => '不能制冷',
// 'errorgroupid' => '2c27e484-924e-4168-a01e-3b7ca5a42241',
// 'errorgroupidName' => '压缩机端子破裂',
// 'errorsolutionid' => '7797093e-34b2-48b6-a623-df766beb951d',
// 'errorsolutionidName' => '更换压缩机',
// ];
$parts = [
'chk' => 'de1f6e4c-2947-41dc-91aa-a8b69b384186',
'chk' => '0436e21c-2ed5-4c52-824e-93a2a5b45108',
'errorpartsid' => '6281df61-575b-46d2-b755-274a7840f75a',
'errorpartsidName' => '1.5P变频松下压缩机\5RS102ZBE21 [R75/6.53/9.7/7.9kg]',
'partsid' => '6281df61-575b-46d2-b755-274a7840f75a',
'partsidName' => '1.5P变频松下压缩机\5RS102ZBE21 [R75/6.53/9.7/7.9kg]',
'qty' => '1',
'qty' => '2',
];
$data['fault'] = urlencode(json_encode($fault));
//$data['fault'] = urlencode(json_encode($fault));
$data['parts'] = urlencode(json_encode($parts));
$data['nonce_str'] = $obj->GetNonceStr();
......
application/libraries/Receive/ReceiveGalanz.php
View file @ 17200e18
......@@ -44,6 +44,7 @@ class ReceiveGalanz extends Receive
$dfields = [
'sitecontacttime',
'siteappointmenttime',
'actualvisittime',
'isguaranty',
'finishstatus',
......@@ -59,13 +60,13 @@ class ReceiveGalanz extends Receive
{
//处理参数
if ($values['sitecontacttime']) {
$order['new_sitecontacttime'] = $values['sitecontacttime'];
$order['new_sitecontacttime'] = date('Y/m/d H:i', $values['sitecontacttime']);
}
if ($values['siteappointmenttime']) {
$order['new_siteappointmenttime'] = $values['siteappointmenttime'];
$order['new_siteappointmenttime'] = date('Y/m/d H:i', $values['siteappointmenttime']);
}
if ($values['actualvisittime']) {
$order['new_actualvisittime'] = $values['actualvisittime'];
$order['new_actualvisittime'] = date('Y/m/d H:i', $values['actualvisittime']);
}
if ($values['isguaranty']) {
$order['new_isguaranty'] = $values['isguaranty'] ? 'True' : 'False';
......@@ -76,6 +77,9 @@ class ReceiveGalanz extends Receive
if ($values['unfinishreason']) {
$order['new_unfinishreason'] = $values['unfinishreason'];
}
if ($values['complete_reason']) {
$order['new_complete_reason'] = $values['complete_reason'];
}
if ($values['sitedealremarks']) {
$order['new_sitedealremarks'] = $values['sitedealremarks'];
}
......@@ -91,8 +95,8 @@ class ReceiveGalanz extends Receive
*/
public function CheckRefuseOrderValues()
{
$this->CheckValues();
$fileds = ['out_trade_no'];
$this->CheckValues($fileds);
}
/**
......@@ -100,7 +104,8 @@ class ReceiveGalanz extends Receive
*/
public function CheckAcceptOrderValues()
{
$this->CheckValues();
$fileds = ['out_trade_no'];
$this->CheckValues($fileds);
}
......@@ -202,7 +207,7 @@ class ReceiveGalanz extends Receive
isset($parts['errorpartsidName']) && $vv['new_errorpartsidName'] = urldecode($parts['errorpartsidName']);
isset($parts['partsid']) && $vv['new_partsid'] = urldecode($parts['partsid']);
isset($parts['partsidName']) && $vv['new_partsidName'] = urldecode($parts['partsidName']);
isset($parts['qty']) && $vv['new_qty'] = $parts['qty'] + 1;
isset($parts['qty']) && $vv['new_qty'] = $parts['qty'] + 0;
$order['parts'][$kk] = $vv;
}
......@@ -276,6 +281,56 @@ class ReceiveGalanz extends Receive
return $order;
}
public function CheckDelProdWorkOrderValues()
{
$fileds = ['work_order_no', 'chk'];
$this->CheckValues($fileds);
}
public function SetDelProdWorkOrderValues($order, $values)
{
if ($values['chk'] && $order['machine']) {
foreach ($order['machine'] as $kk => $vv) {
if ($values['chk'] == $vv['chk']) {
$order['machine'][$kk]['checked'] = 1;
}
}
}
return $order;
}
public function CheckDelErrorWorkOrderValues()
{
$fileds = ['work_order_no', 'chk'];
$this->CheckValues($fileds);
}
public function SetDelErrorWorkOrderValues($order, $values)
{
return $this->SetAddPartsWorkOrderValues($order, $values);
}
public function CheckDelPartsWorkOrderValues()
{
$fileds = ['work_order_no', 'chk'];
$this->CheckValues($fileds);
}
public function SetDelPartsWorkOrderValues($order, $values)
{
if ($values['chk'] && $order['parts']) {
foreach ($order['parts'] as $kk => $vv) {
if ($values['chk'] == $vv['chk']) {
$order['parts'][$kk]['checked'] = 1;
}
}
}
return $order;
}
public function CheckLookupErrormModuleValues()
{
$fileds = ['workorderproductid'];
......@@ -326,10 +381,14 @@ class ReceiveGalanz extends Receive
if (!array_key_exists('account', $this->values) || $this->values['account'] == '') {
$this->ReturnMessage(false, "account参数错误!");
} else {
$this->values['account'] = urldecode($this->values['account']);
}
if (!array_key_exists('pwd', $this->values) || $this->values['pwd'] == '') {
$this->ReturnMessage(false, "pwd参数错误!");
} else {
$this->values['pwd'] = urldecode($this->values['pwd']);
}
if ($fields) {
......
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