1. 微波炉系列订单,需要机器信息需要重新添加接口

1.1 机器编码: 搜索->产品名称->机器信息
1.2 机器详细信息: 通过1.1返回值获取机器详细信息
1.3 机器信息保存: 通过1.2返回值,保存机器信息
1.4 新增机器接口: 1.3入参需要
2. 维修单没有订单号, 需要添加搜索订单接口
2.1 根据手机号搜索订单,返回订单列表

application/controllers/api/Galanz.php

@@ -81,6 +81,33 @@ class Galanz extends BaseController
         $obj->ReturnMessage(true, '', $order);
     }
 
+    public function searchWorkOrder()
+    {
+        $param = $this->input->post();
+
+        //验证参数
+        $obj = $this->receiveGalanzObj();
+        $obj->SetValues($param);
+        $obj->CheckSearchWorkOrderValues();
+        $values = $obj->GetValues();
+        $this->saveLog($values['mobile'], 'queryUserProfileOrder', $param);
+
+        $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
+        $result = $sourceGalanzObj->SearchWorkOrder('', $values['mobile']);
+
+        $list = [];
+        if ($result) {
+            foreach ($result as $k => $v) {
+                $temp = $sourceGalanzObj->WorkOrderDetail($v[0]);
+                $temp = $this->diffWorkOrder($temp, '__VIEWSTATE,machine,fault,parts');
+
+                $list[] = $temp;
+            }
+        }
+
+        $obj->ReturnMessage(true, '', $list);
+    }
+
     //保存订单
     public function saveOrder()
     {
@@ -290,6 +317,26 @@ class Galanz extends BaseController
         $values = $obj->GetValues();
         $this->saveLog($values['work_order_no'], 'addProdWorkOrder', $param);
 
+        $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
+        $order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj);
+        $result = $sourceGalanzObj->ProdAddWorkOrder($order['new_id'], $order);
+        $result = $this->diffWorkOrder($result);
+
+        $obj->ReturnMessage(true, '', $result);
+    }
+
+    //维修单-机器信息-产品条码
+    public function setProdWorkOrder()
+    {
+        $param = $this->input->post();
+
+        //验证参数
+        $obj = $this->receiveGalanzObj();
+        $obj->SetValues($param);
+        $obj->CheckSetProdWorkOrderValues();
+        $values = $obj->GetValues();
+        $this->saveLog($values['work_order_no'], 'setProdWorkOrder', $param);
+
         $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
         $order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj);
         $result = $sourceGalanzObj->ProdGetWorkOrder($order['new_id'], $order, $values['txtproducenumber']);
@@ -403,6 +450,42 @@ class Galanz extends BaseController
         $obj->ReturnMessage(true, '', $result);
     }
 
+    //维修单:机器信息-机器编码
+    public function lookupProductByGroup()
+    {
+        $param = $this->input->post();
+
+        //验证参数
+        $obj = $this->receiveGalanzObj();
+        $obj->SetValues($param);
+        $obj->CheckLookupProductByGroupValues();
+        $values = $obj->GetValues();
+        $this->saveLog($values['productgroupid'], 'lookupProductByGroup', $param);
+
+        $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
+        $result = $sourceGalanzObj->LookupProductByGroup($values['productgroupid'], $values['productname']);
+
+        $obj->ReturnMessage(true, '', $result);
+    }
+
+    //维修单:机器信息-机器编码-机器详情信息
+    public function getProductTypeById()
+    {
+        $param = $this->input->post();
+
+        //验证参数
+        $obj = $this->receiveGalanzObj();
+        $obj->SetValues($param);
+        $obj->CheckGetProductTypeByIdValues();
+        $values = $obj->GetValues();
+        $this->saveLog($values['id'], 'getProductTypeById', $param);
+
+        $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
+        $result = $sourceGalanzObj->GetProductTypeById($values['id']);
+
+        $obj->ReturnMessage(true, '', $result);
+    }
+
     //维修单:故障信息-故障现象
     public function lookupErrormModule()
     {
@@ -581,12 +664,16 @@ class Galanz extends BaseController
         return $order;
     }
 
-    private function diffWorkOrder($order)
+    private function diffWorkOrder($order, $str = '')
     {
         //字段过滤
-        $fields = [
-            '__VIEWSTATE',
-        ];
+        if (empty($str)) {
+            $fields = [
+                '__VIEWSTATE',
+            ];
+        } else {
+            $fields = explode(',', $str);
+        }
 
         $order = $this->diff($order, $fields);
         return $order;
@@ -635,7 +722,7 @@ class Galanz extends BaseController
      */
     private function sourceGalanzObj($username, $pwd)
     {
-//        $pwd = str_aes(urldecode($pwd), '', 'de');
+//        $pwd = str_aes($pwd, '', 'de');
 //
 //        if (!$pwd) {
 //            return_msg(false, '密码无效');

application/controllers/test/Sgalanz.php

@@ -73,16 +73,17 @@ class Sgalanz extends BaseController
     public function workOrderDetail()
     {
         $obj = $this->galanzObj();
-        $list = $obj->WorkOrderDetail('44e3a501-1a44-4d17-a9fc-d41bb2457a91');
+        $list = $obj->WorkOrderDetail('cb027cbf-a702-4c91-82ba-e5f323e854eb');
         $this->show($list);
     }
 
     public function prodAddWorkOrder()
     {
         $obj = $this->galanzObj();
-        $list = $obj->WorkOrderDetail('b4562475-1eac-415d-8713-653f8ea7d7c3');
+        $list = $obj->WorkOrderDetail('cb027cbf-a702-4c91-82ba-e5f323e854eb');
 
-        $result = $obj->ProdGetWorkOrder($list['new_id'], $list, '15C1321000388166');
+        //$result = $obj->ProdAddWorkOrder($list['new_id'], $list);
+        $result = $obj->ProdGetWorkOrder($list['new_id'], $list, '15H551100010330');
         $this->show($result);
     }
 
@@ -101,12 +102,22 @@ class Sgalanz extends BaseController
         $obj = $this->galanzObj();
         //$list = $obj->WorkOrderDetail('b4562475-1eac-415d-8713-653f8ea7d7c3');
 
-        $result['a'] = $obj->LookupErrormModule('c7d14361-df35-4147-966f-ee671298d3eb');
-        $result['b'] = $obj->LookupErrorGroup($result['a'][0]['id']);
-        $result['c'] = $obj->LookupErrorSolution($result['b'][0]['id']);
+        $result['a'] = $obj->LookupProductByGroup('fabf8619-07cc-4164-929e-9d433301d625', '微波炉P70D10EP-QA(P0)');
+//        $result['b'] = $obj->LookupErrormModule('c73cf4b6-0a8d-4810-961f-111bcb925727');
+//        $result['c'] = $obj->LookupErrorGroup('a7af025a-d061-e411-80cb-00155d016a1c');
+//        $result['c'] = $obj->LookupErrorSolution($result['b'][0]['id']);
+
+//        $result['d1'] = $obj->LookupErrorParts($result['c'][0]['id'], 'c7d14361-df35-4147-966f-ee671298d3eb');
+//        $result['d2'] = $obj->LookupParts('6f562a61-3a22-4a16-9e42-f3306dcc10a0', '48e24c55-7b53-46ae-8e43-c20e2435adbc');
+        $this->show($result);
+    }
+
+    public function getData()
+    {
+        $obj = $this->galanzObj();
+
+        $result = $obj->GetProductTypeById('66d07939-8c72-478f-a586-b4956b92b1af');
 
-        $result['d1'] = $obj->LookupErrorParts($result['c'][0]['id'], 'c7d14361-df35-4147-966f-ee671298d3eb');
-        $result['d2'] = $obj->LookupParts('6f562a61-3a22-4a16-9e42-f3306dcc10a0', '48e24c55-7b53-46ae-8e43-c20e2435adbc');
         $this->show($result);
     }
 
@@ -115,11 +126,16 @@ class Sgalanz extends BaseController
 //        $account = [
 //            'username' => 'c01000005',
 //            'pwd' => 'weixiuhui010'
+//        ];
+
+//        $account = [
+//            'username' => 'K75516022',
+//            'pwd' => '123456'
 //        ];
 
         $account = [
-            'username' => 'K75516022',
-            'pwd' => '123456'
+            'username' => 'W75509345',
+            'pwd' => 'dgqh!769'
         ];
 
         $this->load->library('Source/SourceGalanz', $account, 'SourceGalanz');

application/libraries/Receive/ReceiveGalanz.php

@@ -25,12 +25,9 @@ class ReceiveGalanz extends Receive
         $this->CheckValues($fileds);
     }
 
-    /**
-     * 搜索订单
-     */
-    public function CheckSearchOrderValues()
+    public function CheckSearchWorkOrderValues()
     {
-        $fileds = ['out_trade_no'];
+        $fileds = ['mobile'];
         $this->CheckValues($fileds);
     }
 
@@ -142,6 +139,7 @@ class ReceiveGalanz extends Receive
             'visittime',
             'finishtime',
             'repairapply',
+            'machine',
             'fault',
             'parts',
         ];
@@ -176,6 +174,28 @@ class ReceiveGalanz extends Receive
             $order['new_repairapply'] = $values['repairapply'];
         }
 
+        //处理机器信息参数
+        if ($values['machine']) {
+            $machine = json_decode($values['machine'], true);
+
+            if (is_array($machine) && $machine && $order['machine']) {
+                foreach ($order['machine'] as $kk => $vv) {
+                    if ($machine['chk'] == $vv['chk']) {
+                        isset($machine['cbiserror']) && $vv['cbiserror'] = urldecode($machine['cbiserror']);
+                        isset($machine['txtproducenumber']) && $vv['txtproducenumber'] = urldecode($machine['txtproducenumber']);
+                        isset($machine['producttypeid']) && $vv['new_producttypeid'] = urldecode($machine['producttypeid']);
+                        isset($machine['producttypeidName']) && $vv['new_producttypeidName'] = urldecode($machine['producttypeidName']);
+                        isset($machine['productmodelid']) && $vv['new_productmodelid'] = urldecode($machine['productmodelid']);
+                        isset($machine['productmodelidName']) && $vv['new_productmodelidName'] = urldecode($machine['productmodelidName']);
+                        isset($machine['productnumber']) && $vv['hidnew_productnumber'] = urldecode($machine['productnumber']);
+                        isset($machine['modelnumber']) && $vv['hidnew_modelnumber'] = urldecode($machine['modelnumber']);
+
+                        $order['machine'][$kk] = $vv;
+                    }
+                }
+            }
+        }
+
         //处理故障信息参数
         if ($values['fault']) {
             $fault = json_decode($values['fault'], true);
@@ -237,6 +257,12 @@ class ReceiveGalanz extends Receive
     }
 
     public function CheckAddProdWorkOrderValues()
+    {
+        $fileds = ['work_order_no'];
+        $this->CheckValues($fileds);
+    }
+
+    public function CheckSetProdWorkOrderValues()
     {
         $fileds = ['work_order_no', 'txtproducenumber'];
         $this->CheckValues($fileds);
@@ -330,6 +356,22 @@ class ReceiveGalanz extends Receive
         return $order;
     }
 
+    public function CheckGetProductTypeByIdValues()
+    {
+        $fileds = ['id'];
+        $this->CheckValues($fileds);
+    }
+
+    public function CheckLookupProductByGroupValues()
+    {
+        $fileds = ['productgroupid'];
+        $this->CheckValues($fileds);
+
+        $dfields = [
+            'productname',
+        ];
+        $this->SetDefaultValues($dfields);
+    }
 
     public function CheckLookupErrormModuleValues()
     {