Commit 646142fa authored by 蒋林's avatar 蒋林

1. 派工单相关接口参数修改

2. 维修单相关接口参数修改
parent f3506497
...@@ -35,10 +35,10 @@ class Galanz extends BaseController ...@@ -35,10 +35,10 @@ class Galanz extends BaseController
$obj->SetValues($param); $obj->SetValues($param);
$obj->CheckQueryOrderValues(); $obj->CheckQueryOrderValues();
$values = $obj->GetValues(); $values = $obj->GetValues();
$this->saveLog($values['out_trade_no'], 'queryOrder', $param); $this->saveLog($values['id'], 'queryOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getCallOrder($values['out_trade_no'], $sourceGalanzObj); $order = $this->getCallOrder($values['id'], $sourceGalanzObj);
$order = $this->diffOrder($order); $order = $this->diffOrder($order);
$obj->ReturnMessage(true, '', $order); $obj->ReturnMessage(true, '', $order);
...@@ -54,10 +54,10 @@ class Galanz extends BaseController ...@@ -54,10 +54,10 @@ class Galanz extends BaseController
$obj->SetValues($param); $obj->SetValues($param);
$obj->CheckQueryWorkOrderValues(); $obj->CheckQueryWorkOrderValues();
$values = $obj->GetValues(); $values = $obj->GetValues();
$this->saveLog($values['work_order_no'], 'queryWorkOrder', $param); $this->saveLog($values['id'], 'queryWorkOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj); $order = $this->getWorkOrder($values['id'], $sourceGalanzObj);
$order = $this->diffOrder($order); $order = $this->diffOrder($order);
$obj->ReturnMessage(true, '', $order); $obj->ReturnMessage(true, '', $order);
...@@ -75,7 +75,7 @@ class Galanz extends BaseController ...@@ -75,7 +75,7 @@ class Galanz extends BaseController
$this->saveLog($values['id'], 'queryUserProfileOrder', $param); $this->saveLog($values['id'], 'queryUserProfileOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $sourceGalanzObj->UserProfileOrderDetail($values['id']); $order = $this->getUserProfileOrder($values['id'], $sourceGalanzObj);
$order = $this->diffOrder($order); $order = $this->diffOrder($order);
$obj->ReturnMessage(true, '', $order); $obj->ReturnMessage(true, '', $order);
...@@ -110,22 +110,12 @@ class Galanz extends BaseController ...@@ -110,22 +110,12 @@ class Galanz extends BaseController
$obj->SetValues($param); $obj->SetValues($param);
$obj->CheckSearchWorkOrderValues(); $obj->CheckSearchWorkOrderValues();
$values = $obj->GetValues(); $values = $obj->GetValues();
$this->saveLog($values['mobile'], 'searchWorkOrder', $param); $this->saveLog('', 'searchWorkOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$result = $sourceGalanzObj->SearchWorkOrder('', $values['mobile']); $result = $sourceGalanzObj->SearchWorkOrder($values['name'], $values['custmobile'], $values['producenumber'], $values['approvalstatus'], $values['ischangepart'], $values['returnfactory'], $values['isrelief'], $values['starttime'], $values['endtime']);
$result = $sourceGalanzObj->HandelSearchOrderFields($result, 'work'); $result = $sourceGalanzObj->HandelSearchOrderFields($result, 'work');
// $list = [];
// if ($result) {
// foreach ($result as $k => $v) {
// $temp = $sourceGalanzObj->WorkOrderDetail($v[0]);
// $temp = $this->diffOrder($temp, '__VIEWSTATE,machine,fault,parts');
//
// $list[] = $temp;
// }
// }
$obj->ReturnMessage(true, '', $result); $obj->ReturnMessage(true, '', $result);
} }
...@@ -144,16 +134,6 @@ class Galanz extends BaseController ...@@ -144,16 +134,6 @@ class Galanz extends BaseController
$result = $sourceGalanzObj->SearchUserProfieOrder($values['mobile']); $result = $sourceGalanzObj->SearchUserProfieOrder($values['mobile']);
$result = $sourceGalanzObj->HandelSearchOrderFields($result, 'userprofile'); $result = $sourceGalanzObj->HandelSearchOrderFields($result, 'userprofile');
// $list = [];
// if ($result) {
// foreach ($result as $k => $v) {
// $temp = $sourceGalanzObj->UserProfileOrderDetail($v[0]);
// $temp = $this->diffOrder($temp, '__VIEWSTATE,products');
//
// $list[] = $temp;
// }
// }
$obj->ReturnMessage(true, '', $result); $obj->ReturnMessage(true, '', $result);
} }
...@@ -167,10 +147,10 @@ class Galanz extends BaseController ...@@ -167,10 +147,10 @@ class Galanz extends BaseController
$obj->SetValues($param); $obj->SetValues($param);
$obj->CheckSaveOrderValues(); $obj->CheckSaveOrderValues();
$values = $obj->GetValues(); $values = $obj->GetValues();
$this->saveLog($values['out_trade_no'], 'saveOrder', $param); $this->saveLog($values['id'], 'saveOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getCallOrder($values['out_trade_no'], $sourceGalanzObj); $order = $this->getCallOrder($values['id'], $sourceGalanzObj);
$order = $obj->SetSaveOrderValues($order, $values); $order = $obj->SetSaveOrderValues($order, $values);
$result = $sourceGalanzObj->SaveOrder($order['new_id'], $order); $result = $sourceGalanzObj->SaveOrder($order['new_id'], $order);
$result = $this->diffOrder($result); $result = $this->diffOrder($result);
...@@ -189,10 +169,10 @@ class Galanz extends BaseController ...@@ -189,10 +169,10 @@ class Galanz extends BaseController
$obj->SetValues($param); $obj->SetValues($param);
$obj->CheckRefuseOrderValues(); $obj->CheckRefuseOrderValues();
$values = $obj->GetValues(); $values = $obj->GetValues();
$this->saveLog($values['out_trade_no'], 'refuseOrder', $param); $this->saveLog($values['id'], 'refuseOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getCallOrder($values['out_trade_no'], $sourceGalanzObj); $order = $this->getCallOrder($values['id'], $sourceGalanzObj);
$result = $sourceGalanzObj->RefuseOrder($order['new_id'], $order); $result = $sourceGalanzObj->RefuseOrder($order['new_id'], $order);
$result = $this->diffOrder($result); $result = $this->diffOrder($result);
...@@ -209,10 +189,10 @@ class Galanz extends BaseController ...@@ -209,10 +189,10 @@ class Galanz extends BaseController
$obj->SetValues($param); $obj->SetValues($param);
$obj->CheckAcceptOrderValues(); $obj->CheckAcceptOrderValues();
$values = $obj->GetValues(); $values = $obj->GetValues();
$this->saveLog($values['out_trade_no'], 'acceptOrder', $param); $this->saveLog($values['id'], 'acceptOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getCallOrder($values['out_trade_no'], $sourceGalanzObj); $order = $this->getCallOrder($values['id'], $sourceGalanzObj);
$result = $sourceGalanzObj->AcceptOrder($order['new_id'], $order); $result = $sourceGalanzObj->AcceptOrder($order['new_id'], $order);
$result = $this->diffOrder($result); $result = $this->diffOrder($result);
...@@ -229,11 +209,11 @@ class Galanz extends BaseController ...@@ -229,11 +209,11 @@ class Galanz extends BaseController
$obj->SetValues($param); $obj->SetValues($param);
$obj->CheckCreateWorkOrderValues(); $obj->CheckCreateWorkOrderValues();
$values = $obj->GetValues(); $values = $obj->GetValues();
$this->saveLog($values['out_trade_no'], 'createWorkOrder', $param); $this->saveLog($values['id'], 'createWorkOrder', $param);
//搜索订单 //搜索订单
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getCallOrder($values['out_trade_no'], $sourceGalanzObj); $order = $this->getCallOrder($values['id'], $sourceGalanzObj);
$result = $sourceGalanzObj->CreateWorkOrder($order['new_id'], $order); $result = $sourceGalanzObj->CreateWorkOrder($order['new_id'], $order);
if ($result) { if ($result) {
...@@ -255,10 +235,10 @@ class Galanz extends BaseController ...@@ -255,10 +235,10 @@ class Galanz extends BaseController
$obj->SetValues($param); $obj->SetValues($param);
$obj->CheckCreateUserProfileOrderValues(); $obj->CheckCreateUserProfileOrderValues();
$values = $obj->GetValues(); $values = $obj->GetValues();
$this->saveLog($values['out_trade_no'], 'createUserprofileOrder', $param); $this->saveLog($values['id'], 'createUserprofileOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getCallOrder($values['out_trade_no'], $sourceGalanzObj); $order = $this->getCallOrder($values['id'], $sourceGalanzObj);
$result = $sourceGalanzObj->CreateUserProfileOrder($order['new_id'], $order); $result = $sourceGalanzObj->CreateUserProfileOrder($order['new_id'], $order);
if ($result) { if ($result) {
...@@ -282,7 +262,7 @@ class Galanz extends BaseController ...@@ -282,7 +262,7 @@ class Galanz extends BaseController
$this->saveLog($values['id'], 'saveUserProfileOrder', $param); $this->saveLog($values['id'], 'saveUserProfileOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $sourceGalanzObj->UserProfileOrderDetail($values['id']); $order = $this->getUserProfileOrder($values['id'], $sourceGalanzObj);
$order = $obj->SetSaveUserProfileOrderValues($order, $values); $order = $obj->SetSaveUserProfileOrderValues($order, $values);
$result = $sourceGalanzObj->SaveUserProfileOrder($order['new_id'], $order); $result = $sourceGalanzObj->SaveUserProfileOrder($order['new_id'], $order);
$result = $this->diffOrder($result); $result = $this->diffOrder($result);
...@@ -303,7 +283,7 @@ class Galanz extends BaseController ...@@ -303,7 +283,7 @@ class Galanz extends BaseController
$this->saveLog($values['id'], 'addProductsUserProfileOrder', $param); $this->saveLog($values['id'], 'addProductsUserProfileOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $sourceGalanzObj->UserProfileOrderDetail($values['id']); $order = $this->getUserProfileOrder($values['id'], $sourceGalanzObj);
$order = $obj->SetAddProductsUserProfileOrderValues($order, $values); $order = $obj->SetAddProductsUserProfileOrderValues($order, $values);
$result = $sourceGalanzObj->AddProductsUserProfileOrder($order['new_id'], $order); $result = $sourceGalanzObj->AddProductsUserProfileOrder($order['new_id'], $order);
$result = $this->diffOrder($result); $result = $this->diffOrder($result);
...@@ -324,7 +304,7 @@ class Galanz extends BaseController ...@@ -324,7 +304,7 @@ class Galanz extends BaseController
$this->saveLog($values['id'], 'delMachineUserProfileOrder', $param); $this->saveLog($values['id'], 'delMachineUserProfileOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $sourceGalanzObj->UserProfileOrderDetail($values['id']); $order = $this->getUserProfileOrder($values['id'], $sourceGalanzObj);
$order = $obj->SetDelProductsUserProfileOrderValues($order, $values); $order = $obj->SetDelProductsUserProfileOrderValues($order, $values);
$result = $sourceGalanzObj->DelProductsUserProfileOrder($order['new_id'], $order); $result = $sourceGalanzObj->DelProductsUserProfileOrder($order['new_id'], $order);
$result = $this->diffOrder($result); $result = $this->diffOrder($result);
...@@ -345,7 +325,7 @@ class Galanz extends BaseController ...@@ -345,7 +325,7 @@ class Galanz extends BaseController
$this->saveLog($values['id'], 'sendUserProfileOrder', $param); $this->saveLog($values['id'], 'sendUserProfileOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $sourceGalanzObj->UserProfileOrderDetail($values['id']); $order = $this->getUserProfileOrder($values['id'], $sourceGalanzObj);
//已发送 //已发送
if ($order['zhuangtai_value'] == 1 || $order['zhuangtai_name'] == '已发送') { if ($order['zhuangtai_value'] == 1 || $order['zhuangtai_name'] == '已发送') {
...@@ -368,10 +348,10 @@ class Galanz extends BaseController ...@@ -368,10 +348,10 @@ class Galanz extends BaseController
$obj->SetValues($param); $obj->SetValues($param);
$obj->CheckSaveWorkOrderValues(); $obj->CheckSaveWorkOrderValues();
$values = $obj->GetValues(); $values = $obj->GetValues();
$this->saveLog($values['work_order_no'], 'saveWorkOrder', $param); $this->saveLog($values['id'], 'saveWorkOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj); $order = $this->getWorkOrder($values['id'], $sourceGalanzObj);
$order = $obj->SetSaveWorkOrderValues($order, $values); $order = $obj->SetSaveWorkOrderValues($order, $values);
$result = $sourceGalanzObj->SaveWorkOrder($order['new_id'], $order); $result = $sourceGalanzObj->SaveWorkOrder($order['new_id'], $order);
$result = $this->diffOrder($result); $result = $this->diffOrder($result);
...@@ -389,10 +369,10 @@ class Galanz extends BaseController ...@@ -389,10 +369,10 @@ class Galanz extends BaseController
$obj->SetValues($param); $obj->SetValues($param);
$obj->CheckSendWorkOrderValues(); $obj->CheckSendWorkOrderValues();
$values = $obj->GetValues(); $values = $obj->GetValues();
$this->saveLog($values['work_order_no'], 'sendWorkOrder', $param); $this->saveLog($values['id'], 'sendWorkOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj); $order = $this->getWorkOrder($values['id'], $sourceGalanzObj);
$result = $sourceGalanzObj->SendWorkOrder($order['new_id'], $order); $result = $sourceGalanzObj->SendWorkOrder($order['new_id'], $order);
$result = $this->diffOrder($result); $result = $this->diffOrder($result);
...@@ -409,10 +389,10 @@ class Galanz extends BaseController ...@@ -409,10 +389,10 @@ class Galanz extends BaseController
$obj->SetValues($param); $obj->SetValues($param);
$obj->CheckAddProdWorkOrderValues(); $obj->CheckAddProdWorkOrderValues();
$values = $obj->GetValues(); $values = $obj->GetValues();
$this->saveLog($values['work_order_no'], 'addProdWorkOrder', $param); $this->saveLog($values['id'], 'addProdWorkOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj); $order = $this->getWorkOrder($values['id'], $sourceGalanzObj);
$result = $sourceGalanzObj->ProdAddWorkOrder($order['new_id'], $order); $result = $sourceGalanzObj->ProdAddWorkOrder($order['new_id'], $order);
$result = $this->diffOrder($result); $result = $this->diffOrder($result);
...@@ -429,10 +409,10 @@ class Galanz extends BaseController ...@@ -429,10 +409,10 @@ class Galanz extends BaseController
$obj->SetValues($param); $obj->SetValues($param);
$obj->CheckSetProdWorkOrderValues(); $obj->CheckSetProdWorkOrderValues();
$values = $obj->GetValues(); $values = $obj->GetValues();
$this->saveLog($values['work_order_no'], 'setProdWorkOrder', $param); $this->saveLog($values['id'], 'setProdWorkOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj); $order = $this->getWorkOrder($values['id'], $sourceGalanzObj);
$result = $sourceGalanzObj->ProdGetWorkOrder($order['new_id'], $order, $values['txtproducenumber']); $result = $sourceGalanzObj->ProdGetWorkOrder($order['new_id'], $order, $values['txtproducenumber']);
$result = $this->diffOrder($result); $result = $this->diffOrder($result);
...@@ -449,10 +429,10 @@ class Galanz extends BaseController ...@@ -449,10 +429,10 @@ class Galanz extends BaseController
$obj->SetValues($param); $obj->SetValues($param);
$obj->CheckDelProdWorkOrderValues(); $obj->CheckDelProdWorkOrderValues();
$values = $obj->GetValues(); $values = $obj->GetValues();
$this->saveLog($values['work_order_no'], 'delProdWorkOrder', $param); $this->saveLog($values['id'], 'delProdWorkOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj); $order = $this->getWorkOrder($values['id'], $sourceGalanzObj);
$order = $obj->SetDelProdWorkOrderValues($order, $values); $order = $obj->SetDelProdWorkOrderValues($order, $values);
$result = $sourceGalanzObj->ProdDelWorkOrder($order['new_id'], $order); $result = $sourceGalanzObj->ProdDelWorkOrder($order['new_id'], $order);
$result = $this->diffOrder($result); $result = $this->diffOrder($result);
...@@ -470,10 +450,10 @@ class Galanz extends BaseController ...@@ -470,10 +450,10 @@ class Galanz extends BaseController
$obj->SetValues($param); $obj->SetValues($param);
$obj->CheckAddErrorWorkOrderValues(); $obj->CheckAddErrorWorkOrderValues();
$values = $obj->GetValues(); $values = $obj->GetValues();
$this->saveLog($values['work_order_no'], 'addErrorWorkOrder', $param); $this->saveLog($values['id'], 'addErrorWorkOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj); $order = $this->getWorkOrder($values['id'], $sourceGalanzObj);
$order = $obj->SetAddErrorWorkOrderValues($order, $values); $order = $obj->SetAddErrorWorkOrderValues($order, $values);
$result = $sourceGalanzObj->ErrorAddWorkOrder($order['new_id'], $order); $result = $sourceGalanzObj->ErrorAddWorkOrder($order['new_id'], $order);
$result = $this->diffOrder($result); $result = $this->diffOrder($result);
...@@ -491,10 +471,10 @@ class Galanz extends BaseController ...@@ -491,10 +471,10 @@ class Galanz extends BaseController
$obj->SetValues($param); $obj->SetValues($param);
$obj->CheckDelErrorWorkOrderValues(); $obj->CheckDelErrorWorkOrderValues();
$values = $obj->GetValues(); $values = $obj->GetValues();
$this->saveLog($values['work_order_no'], 'delErrorWorkOrder', $param); $this->saveLog($values['id'], 'delErrorWorkOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj); $order = $this->getWorkOrder($values['id'], $sourceGalanzObj);
$order = $obj->SetDelErrorWorkOrderValues($order, $values); $order = $obj->SetDelErrorWorkOrderValues($order, $values);
$result = $sourceGalanzObj->ErrorDelWorkOrder($order['new_id'], $order); $result = $sourceGalanzObj->ErrorDelWorkOrder($order['new_id'], $order);
$result = $this->diffOrder($result); $result = $this->diffOrder($result);
...@@ -512,10 +492,10 @@ class Galanz extends BaseController ...@@ -512,10 +492,10 @@ class Galanz extends BaseController
$obj->SetValues($param); $obj->SetValues($param);
$obj->CheckAddPartsWorkOrderValues(); $obj->CheckAddPartsWorkOrderValues();
$values = $obj->GetValues(); $values = $obj->GetValues();
$this->saveLog($values['work_order_no'], 'addPartsWorkOrder', $param); $this->saveLog($values['id'], 'addPartsWorkOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj); $order = $this->getWorkOrder($values['id'], $sourceGalanzObj);
$order = $obj->SetAddPartsWorkOrderValues($order, $values); $order = $obj->SetAddPartsWorkOrderValues($order, $values);
$result = $sourceGalanzObj->PartsAddWorkOrder($order['new_id'], $order); $result = $sourceGalanzObj->PartsAddWorkOrder($order['new_id'], $order);
$result = $this->diffOrder($result); $result = $this->diffOrder($result);
...@@ -533,10 +513,10 @@ class Galanz extends BaseController ...@@ -533,10 +513,10 @@ class Galanz extends BaseController
$obj->SetValues($param); $obj->SetValues($param);
$obj->CheckDelPartsWorkOrderValues(); $obj->CheckDelPartsWorkOrderValues();
$values = $obj->GetValues(); $values = $obj->GetValues();
$this->saveLog($values['work_order_no'], 'delPartsWorkOrder', $param); $this->saveLog($values['id'], 'delPartsWorkOrder', $param);
$sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']); $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
$order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj); $order = $this->getWorkOrder($values['id'], $sourceGalanzObj);
$order = $obj->SetDelPartsWorkOrderValues($order, $values); $order = $obj->SetDelPartsWorkOrderValues($order, $values);
$result = $sourceGalanzObj->PartsDelWorkOrder($order['new_id'], $order); $result = $sourceGalanzObj->PartsDelWorkOrder($order['new_id'], $order);
$result = $this->diffOrder($result); $result = $this->diffOrder($result);
...@@ -672,20 +652,20 @@ class Galanz extends BaseController ...@@ -672,20 +652,20 @@ class Galanz extends BaseController
/** /**
* 获取派工单单信息 * 获取派工单单信息
* @param $order_no * @param $order_id
* @param $sourceGalanzObj * @param $sourceGalanzObj
* @return mixed * @return mixed
*/ */
private function getCallOrder($order_no, $sourceGalanzObj) private function getCallOrder($order_id, $sourceGalanzObj)
{ {
$search = $sourceGalanzObj->SearchOrder($order_no); // $search = $sourceGalanzObj->SearchOrder($order_no);
//
if (empty($search)) { // if (empty($search)) {
return_msg(false, '查询的派工单不存在'); // return_msg(false, '查询的派工单不存在');
} // }
//订单详情 //订单详情
$order = $sourceGalanzObj->OrderDetail($search[0][0]); $order = $sourceGalanzObj->OrderDetail($order_id);
if (!isset($order['new_name']) && !$order['new_name']) { if (!isset($order['new_name']) && !$order['new_name']) {
return_msg(false, '查询的派工单不存在'); return_msg(false, '查询的派工单不存在');
...@@ -696,21 +676,14 @@ class Galanz extends BaseController ...@@ -696,21 +676,14 @@ class Galanz extends BaseController
/** /**
* 获取维修单信息 * 获取维修单信息
* @param $order_no * @param $order_id
* @param $sourceGalanzObj * @param $sourceGalanzObj
* @return mixed * @return mixed
*/ */
private function getWorkOrder($order_no, $sourceGalanzObj) private function getWorkOrder($order_id, $sourceGalanzObj)
{ {
//搜索订单
$search = $sourceGalanzObj->SearchWorkOrder($order_no);
if (empty($search)) {
return_msg(false, '查询的维修单不存在');
}
//订单详情 //订单详情
$order = $sourceGalanzObj->WorkOrderDetail($search[0][0]); $order = $sourceGalanzObj->WorkOrderDetail($order_id);
if (!isset($order['new_name']) && !$order['new_name']) { if (!isset($order['new_name']) && !$order['new_name']) {
return_msg(false, '查询的维修单不存在'); return_msg(false, '查询的维修单不存在');
...@@ -721,29 +694,19 @@ class Galanz extends BaseController ...@@ -721,29 +694,19 @@ class Galanz extends BaseController
/** /**
* 获取安装单信息 * 获取安装单信息
* @param $mobile * @param $order_id
* @param $order_no
* @param $sourceGalanzObj * @param $sourceGalanzObj
* @return mixed * @return mixed
*/ */
private function getUserProfileOrder($mobile, $order_no, $sourceGalanzObj) private function getUserProfileOrder($order_id, $sourceGalanzObj)
{ {
//搜索订单
$search = $sourceGalanzObj->SearchUserProfieOrder($mobile, $order_no);
if (empty($search)) {
return_msg(false, '查询的安装单不存在');
}
//订单详情 //订单详情
$order = $sourceGalanzObj->UserProfileOrderDetail($search[0][0]); $order = $sourceGalanzObj->UserProfileOrderDetail($order_id);
if (!isset($order['new_number']) && !$order['new_number']) { if (!isset($order['new_number']) && !$order['new_number']) {
return_msg(false, '查询的安装单不存在'); return_msg(false, '查询的安装单不存在');
} }
return $order; return $order;
} }
......
...@@ -15,13 +15,13 @@ class ReceiveGalanz extends Receive ...@@ -15,13 +15,13 @@ class ReceiveGalanz extends Receive
*/ */
public function CheckQueryOrderValues() public function CheckQueryOrderValues()
{ {
$fileds = ['out_trade_no']; $fileds = ['id'];
$this->CheckValues($fileds); $this->CheckValues($fileds);
} }
public function CheckQueryWorkOrderValues() public function CheckQueryWorkOrderValues()
{ {
$fileds = ['work_order_no']; $fileds = ['id'];
$this->CheckValues($fileds); $this->CheckValues($fileds);
} }
...@@ -59,8 +59,48 @@ class ReceiveGalanz extends Receive ...@@ -59,8 +59,48 @@ class ReceiveGalanz extends Receive
public function CheckSearchWorkOrderValues() public function CheckSearchWorkOrderValues()
{ {
$fileds = ['mobile']; // $fileds = ['mobile'];
$this->CheckValues($fileds); // $this->CheckValues($fileds);
$dfields = [
'name',
'custmobile',
'producenumber',
'approvalstatus',
'ischangepart',
'returnfactory',
'isrelief',
'starttime',
'endtime'
];
$this->SetDefaultValues($dfields);
if ($this->values['starttime']) {
$this->values['starttime'] = date('Y/m/d', strtotime($this->values['starttime']));
}
if ($this->values['endtime']) {
$this->values['endtime'] = date('Y/m/d', strtotime($this->values['endtime']));
}
if ($this->values['ischangepart'] && in_array($this->values['ischangepart'], [1,2])) {
$this->values['ischangepart'] += 1;
} else {
$this->values['ischangepart'] = 1;
}
if ($this->values['returnfactory'] && in_array($this->values['returnfactory'], [1,2])) {
$this->values['returnfactory'] += 1;
} else {
$this->values['returnfactory'] = 1;
}
if ($this->values['isrelief'] && in_array($this->values['isrelief'], [1,2])) {
$this->values['isrelief'] += 1;
} else {
$this->values['isrelief'] = 1;
}
} }
public function CheckSearchUserProfieOrderValues() public function CheckSearchUserProfieOrderValues()
...@@ -74,7 +114,7 @@ class ReceiveGalanz extends Receive ...@@ -74,7 +114,7 @@ class ReceiveGalanz extends Receive
*/ */
public function CheckSaveOrderValues() public function CheckSaveOrderValues()
{ {
$fileds = ['out_trade_no']; $fileds = ['id'];
$this->CheckValues($fileds); $this->CheckValues($fileds);
$dfields = [ $dfields = [
...@@ -130,7 +170,7 @@ class ReceiveGalanz extends Receive ...@@ -130,7 +170,7 @@ class ReceiveGalanz extends Receive
*/ */
public function CheckRefuseOrderValues() public function CheckRefuseOrderValues()
{ {
$fileds = ['out_trade_no']; $fileds = ['id'];
$this->CheckValues($fileds); $this->CheckValues($fileds);
} }
...@@ -139,7 +179,7 @@ class ReceiveGalanz extends Receive ...@@ -139,7 +179,7 @@ class ReceiveGalanz extends Receive
*/ */
public function CheckAcceptOrderValues() public function CheckAcceptOrderValues()
{ {
$fileds = ['out_trade_no']; $fileds = ['id'];
$this->CheckValues($fileds); $this->CheckValues($fileds);
} }
...@@ -149,7 +189,7 @@ class ReceiveGalanz extends Receive ...@@ -149,7 +189,7 @@ class ReceiveGalanz extends Receive
*/ */
public function CheckCreateWorkOrderValues() public function CheckCreateWorkOrderValues()
{ {
$fileds = ['out_trade_no']; $fileds = ['id'];
$this->CheckValues($fileds); $this->CheckValues($fileds);
} }
...@@ -158,14 +198,14 @@ class ReceiveGalanz extends Receive ...@@ -158,14 +198,14 @@ class ReceiveGalanz extends Receive
*/ */
public function CheckCreateUserProfileOrderValues() public function CheckCreateUserProfileOrderValues()
{ {
$fileds = ['out_trade_no']; $fileds = ['id'];
$this->CheckValues($fileds); $this->CheckValues($fileds);
} }
//保存维修单 //保存维修单
public function CheckSaveWorkOrderValues() public function CheckSaveWorkOrderValues()
{ {
$fileds = ['work_order_no']; $fileds = ['id'];
$this->CheckValues($fileds); $this->CheckValues($fileds);
$dfields = [ $dfields = [
...@@ -286,7 +326,7 @@ class ReceiveGalanz extends Receive ...@@ -286,7 +326,7 @@ class ReceiveGalanz extends Receive
public function CheckSendWorkOrderValues() public function CheckSendWorkOrderValues()
{ {
$fileds = ['work_order_no']; $fileds = ['id'];
$this->CheckValues($fileds); $this->CheckValues($fileds);
} }
...@@ -410,19 +450,19 @@ class ReceiveGalanz extends Receive ...@@ -410,19 +450,19 @@ class ReceiveGalanz extends Receive
public function CheckAddProdWorkOrderValues() public function CheckAddProdWorkOrderValues()
{ {
$fileds = ['work_order_no']; $fileds = ['id'];
$this->CheckValues($fileds); $this->CheckValues($fileds);
} }
public function CheckSetProdWorkOrderValues() public function CheckSetProdWorkOrderValues()
{ {
$fileds = ['work_order_no', 'txtproducenumber']; $fileds = ['id', 'txtproducenumber'];
$this->CheckValues($fileds); $this->CheckValues($fileds);
} }
public function CheckAddErrorWorkOrderValues() public function CheckAddErrorWorkOrderValues()
{ {
$fileds = ['work_order_no', 'chk']; $fileds = ['id', 'chk'];
$this->CheckValues($fileds); $this->CheckValues($fileds);
} }
...@@ -442,7 +482,7 @@ class ReceiveGalanz extends Receive ...@@ -442,7 +482,7 @@ class ReceiveGalanz extends Receive
public function CheckAddPartsWorkOrderValues() public function CheckAddPartsWorkOrderValues()
{ {
$fileds = ['work_order_no', 'chk']; $fileds = ['id', 'chk'];
$this->CheckValues($fileds); $this->CheckValues($fileds);
} }
...@@ -461,7 +501,7 @@ class ReceiveGalanz extends Receive ...@@ -461,7 +501,7 @@ class ReceiveGalanz extends Receive
public function CheckDelProdWorkOrderValues() public function CheckDelProdWorkOrderValues()
{ {
$fileds = ['work_order_no', 'chk']; $fileds = ['id', 'chk'];
$this->CheckValues($fileds); $this->CheckValues($fileds);
} }
...@@ -480,7 +520,7 @@ class ReceiveGalanz extends Receive ...@@ -480,7 +520,7 @@ class ReceiveGalanz extends Receive
public function CheckDelErrorWorkOrderValues() public function CheckDelErrorWorkOrderValues()
{ {
$fileds = ['work_order_no', 'chk']; $fileds = ['id', 'chk'];
$this->CheckValues($fileds); $this->CheckValues($fileds);
} }
...@@ -491,7 +531,7 @@ class ReceiveGalanz extends Receive ...@@ -491,7 +531,7 @@ class ReceiveGalanz extends Receive
public function CheckDelPartsWorkOrderValues() public function CheckDelPartsWorkOrderValues()
{ {
$fileds = ['work_order_no', 'chk']; $fileds = ['id', 'chk'];
$this->CheckValues($fileds); $this->CheckValues($fileds);
} }
......
...@@ -226,12 +226,18 @@ class SourceGalanz extends Source ...@@ -226,12 +226,18 @@ class SourceGalanz extends Source
/** /**
* 维修单搜索 * 维修单搜索
* @param string $new_number * @param string $name 维修单号
* @param string $mobile * @param string $custmobile 顾客手机
* @param string $approvalstatus 单据状态 * @param string $producenumber 产品条码
* @param string $approvalstatus 单据状态: '':默认; 1:待发送; 2:已发送; 3:驳回; 4:合格; 5:复议; 6:虚假单
* @param string $ischangepart 是否换件: 1:默认; 2:是; 3:否
* @param string $returnfactory 售前机: 1:默认; 2:是; 3:否
* @param string $isrelief 减免: 1:默认; 2:是; 3:否
* @param string $stime 开始时间,格式:2016/08/05
* @param string $etime 结束时间,格式:同上
* @return array * @return array
*/ */
public function SearchWorkOrder($new_number='', $mobile='', $approvalstatus='') public function SearchWorkOrder($name='', $custmobile='', $producenumber='', $approvalstatus='', $ischangepart='', $returnfactory='', $isrelief='', $stime='', $etime='')
{ {
$post = [ $post = [
'__EVENTTARGET' => 'ctl00$ContentQuery$btnQuery', '__EVENTTARGET' => 'ctl00$ContentQuery$btnQuery',
...@@ -242,16 +248,16 @@ class SourceGalanz extends Source ...@@ -242,16 +248,16 @@ class SourceGalanz extends Source
'ctl00$ContentQuery$hidMainId' => '', 'ctl00$ContentQuery$hidMainId' => '',
'ctl00$ContentQuery$hidAttrCode' => '', 'ctl00$ContentQuery$hidAttrCode' => '',
'ctl00$ContentQuery$hidMainIdName' => '', 'ctl00$ContentQuery$hidMainIdName' => '',
'ctl00$ContentQuery$new_finishtime_s' => '', 'ctl00$ContentQuery$new_finishtime_s' => $stime,
'ctl00$ContentQuery$new_finishtime_e' => '', 'ctl00$ContentQuery$new_finishtime_e' => $etime,
'ctl00$ContentQuery$new_number' => $new_number, 'ctl00$ContentQuery$new_number' => $name,
'ctl00$ContentQuery$new_custname' => '', 'ctl00$ContentQuery$new_custname' => '',
'ctl00$ContentQuery$new_custmobile' => $mobile, 'ctl00$ContentQuery$new_custmobile' => $custmobile,
'ctl00$ContentQuery$new_ischangepart' => 1, 'ctl00$ContentQuery$new_ischangepart' => $ischangepart,
'ctl00$ContentQuery$new_returnfactory' => 1, 'ctl00$ContentQuery$new_returnfactory' => $returnfactory,
'ctl00$ContentQuery$new_isrelief' => 1, 'ctl00$ContentQuery$new_isrelief' => $isrelief,
'ctl00$ContentQuery$new_approvalstatus' => $approvalstatus, 'ctl00$ContentQuery$new_approvalstatus' => $approvalstatus,
'ctl00$ContentQuery$txtproducenumber' => '', 'ctl00$ContentQuery$txtproducenumber' => $producenumber,
'ctl00$ContentQuery$new_name' => '', 'ctl00$ContentQuery$new_name' => '',
'ctl00$ContentQuery$new_iskt' => 0, 'ctl00$ContentQuery$new_iskt' => 0,
'ctl00$ContentData$PagerToolBar1$ctl00' => 500, 'ctl00$ContentData$PagerToolBar1$ctl00' => 500,
......
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