1. 安装单-添加明细信息,及对外接口

2. 安装单-删除明细信息,及对外接口

application/controllers/api/Galanz.php

@@ -268,6 +268,46 @@ class Galanz extends BaseController
         $obj->ReturnMessage(true, '', $result);
     }
 
+    //安装单-添加明细信息
+    public function addMachineUserProfileOrder()
+    {
+        $param = $this->input->post();
+
+        //验证参数
+        $obj = $this->receiveGalanzObj();
+        $obj->SetValues($param);
+        $obj->CheckAddMachineUserProfileOrderValues();
+        $values = $obj->GetValues();
+        $this->saveLog($values['id'], 'addMachineUserProfileOrder', $param);
+
+        $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
+        $order = $sourceGalanzObj->UserProfileOrderDetail($values['id']);
+        $order = $obj->SetAddMachineUserProfileOrderValues($order, $values);
+        $result = $sourceGalanzObj->AddMachineUserProfileOrder($order['new_id'], $order);
+
+        $obj->ReturnMessage(true, '', $result);
+    }
+
+    //安装单-删除明细信息
+    public function delMachineUserProfileOrder()
+    {
+        $param = $this->input->post();
+
+        //验证参数
+        $obj = $this->receiveGalanzObj();
+        $obj->SetValues($param);
+        $obj->CheckDelMachineUserProfileOrderValues();
+        $values = $obj->GetValues();
+        $this->saveLog($values['id'], 'delMachineUserProfileOrder', $param);
+
+        $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
+        $order = $sourceGalanzObj->UserProfileOrderDetail($values['id']);
+        $order = $obj->SetDelMachineUserProfileOrderValues($order, $values);
+        $result = $sourceGalanzObj->DelMachineUserProfileOrder($order['new_id'], $order);
+
+        $obj->ReturnMessage(true, '', $result);
+    }
+
     //发送安装单
     public function sendUserProfileOrder()
     {

application/controllers/test/Rgalanz.php

@@ -33,12 +33,15 @@ class Rgalanz extends BaseController
 //        self::$testu = 'W75509345';
 //        self::$testp = 'dgqh!769';
 
-        self::$testu = 'C75500035';
-        self::$testp = 'dgqh!769';
+//        self::$testu = 'C75500035';
+//        self::$testp = 'dgqh!769';
 
 //        self::$testu = 'c01000005';
 //        self::$testp = 'weixiuhui010';
 
+        self::$testu = 'C75500027';
+        self::$testp = 'szwxh!755';
+
         $this->load->library('Receive/ReceiveGalanz', null, 'ReceiveGalanz');
         return $this->ReceiveGalanz;
     }
@@ -72,7 +75,7 @@ class Rgalanz extends BaseController
         $data['appid'] = '10001';
         $data['account'] = self::$testu;
         $data['pwd'] = self::$testp;
-        $data['mobile'] = '13925524202';
+        $data['mobile'] = '13424411750';
 
         $data['nonce_str'] = $obj->GetNonceStr();
         $obj->SetValues($data);
@@ -140,7 +143,7 @@ class Rgalanz extends BaseController
         $data['appid'] = '10001';
         $data['account'] = self::$testu;
         $data['pwd'] = self::$testp;
-        $data['id'] = '05a20b81-0a7d-4c3c-a478-c0a456ce309c';
+        $data['id'] = '1650bb3a-46b0-408c-9694-6549a8d9d068';
 
         $data['nonce_str'] = $obj->GetNonceStr();
         $obj->SetValues($data);
@@ -560,15 +563,15 @@ class Rgalanz extends BaseController
             'appid' => '10001',
             'account' => self::$testu,
             'pwd' => self::$testp,
-            'id' => '05a20b81-0a7d-4c3c-a478-c0a456ce309c',
+            'id' => '1650bb3a-46b0-408c-9694-6549a8d9d068',
             'contactname' => '', //姓名
             'mobile' => '', //手机
             'telephone' => '', //电话
             'accountaddr' => '', //地址
             'email' => '', //邮箱
-            'broughtdate' => '', //购买时间
-            'installdate' => '', //安装时间
-            'appointmenttime' => '', //上门时间
+            'broughtdate' => strtotime('2016-08-02 17:34:30'), //购买时间
+            'installdate' => strtotime('2016-08-05 11:17:41'), //安装时间
+            'appointmenttime' => strtotime('2016-08-05 11:17:41'), //上门时间
             'salesite' => '', //商场
             'installer' => '', //安装人员
             'goldcard' => '', //金卡
@@ -590,6 +593,56 @@ class Rgalanz extends BaseController
         $this->show($result['data']);
     }
 
+    public function addMachineUserProfileOrder()
+    {
+        $obj = $this->galanzObj();
+
+        $data = [
+            'appid' => '10001',
+            'account' => self::$testu,
+            'pwd' => self::$testp,
+            'id' => '1650bb3a-46b0-408c-9694-6549a8d9d068',
+            'producenumber' => '16Y101100021481'
+        ];
+
+        $data['nonce_str'] = $obj->GetNonceStr();
+        $obj->SetValues($data);
+        $obj->SetSign();
+        $values = $obj->GetValues();
+
+        $url = self::$apiUrl . "api/galanz/addMachineUserProfileOrder";
+        $result = $this->curlPost($url, $values);
+
+        $result['data'] = json_decode($result['data'], true);
+
+        $this->show($result['data']);
+    }
+
+    public function delMachineUserProfileOrder()
+    {
+        $obj = $this->galanzObj();
+
+        $data = [
+            'appid' => '10001',
+            'account' => self::$testu,
+            'pwd' => self::$testp,
+            'id' => '1650bb3a-46b0-408c-9694-6549a8d9d068',
+            'chk' => 'de580f86-70db-4452-9c99-08d4aa273cbb'
+        ];
+
+        $data['nonce_str'] = $obj->GetNonceStr();
+        $obj->SetValues($data);
+        $obj->SetSign();
+        $values = $obj->GetValues();
+
+        $url = self::$apiUrl . "api/galanz/delMachineUserProfileOrder";
+        $result = $this->curlPost($url, $values);
+
+        $result['data'] = json_decode($result['data'], true);
+
+        $this->show($result['data']);
+    }
+
     private function show($data)
     {
         echo "<pre>";

application/libraries/Receive/ReceiveGalanz.php

@@ -288,6 +288,41 @@ class ReceiveGalanz extends Receive
         $this->SetDefaultValues($dfields);
     }
 
+    public function CheckAddMachineUserProfileOrderValues()
+    {
+        $fileds = ['id', 'producenumber'];
+        $this->CheckValues($fileds);
+    }
+
+    public function SetAddMachineUserProfileOrderValues($order, $values)
+    {
+        if ($values['producenumber']) {
+            $order['txtproducenumber'] = trim($values['producenumber']);
+        }
+
+        return $order;
+    }
+
+    public function CheckDelMachineUserProfileOrderValues()
+    {
+        $fileds = ['id', 'chk'];
+        $this->CheckValues($fileds);
+    }
+
+    public function SetDelMachineUserProfileOrderValues($order, $values)
+    {
+        if ($values['chk'] && $order['products']) {
+            foreach ($order['products'] as $kk => $vv) {
+                if ($values['chk'] == $vv['chk']) {
+                    $vv['checked'] = 1;
+                    $order['products'][$kk] = $vv;
+                }
+            }
+        }
+
+        return $order;
+    }
+
     public function SetSaveUserProfileOrderValues($order, $values)
     {
         //处理基本信息参数

application/libraries/Source/SourceGalanz.php

@@ -625,10 +625,11 @@ class SourceGalanz extends Source
             foreach ($tr[1] as $k => $v) {
                 $temp = $this->TableTdPreg($v);
                 $result[] = [
-                    'jqtm' => $temp[1], //机器条码
-                    'jxmc' => $temp[2], //机型名称
-                    'scrq' => $temp[3], //生产日期
-                    'ckrq' => $temp[4], //出库日期
+                    'chk' => $temp[0],
+                    'producenumber' => $temp[1], //机器条码
+                    'productname' => $temp[2], //机型名称
+                    'shipdate' => $temp[3], //生产日期
+                    'outtime' => $temp[4], //出库日期
                 ];
             }
         }
@@ -650,6 +651,34 @@ class SourceGalanz extends Source
         return $order;
     }
 
+    /**
+     * 安装单-添加明细信息
+     * @param $id
+     * @param $data
+     * @return mixed
+     */
+    public function AddMachineUserProfileOrder($id, $data)
+    {
+        $result = $this->HandelUserProfileOrder($id, $data, 'Add');
+        $this->HandelOrderError($result);
+        $order = $this->UserProfileOrderDetail($id);
+        return $order;
+    }
+
+    /**
+     * 安装单-删除明细信息
+     * @param $id
+     * @param $data
+     * @return mixed
+     */
+    public function DelMachineUserProfileOrder($id, $data)
+    {
+        $result = $this->HandelUserProfileOrder($id, $data, 'Del');
+        $this->HandelOrderError($result);
+        $order = $this->UserProfileOrderDetail($id);
+        return $order;
+    }
+
     /**
      * 安装单发送
      * @param $id
@@ -1418,18 +1447,9 @@ class SourceGalanz extends Source
      */
     private function HandelUserProfileOrder($id, $data, $type)
     {
-        switch ($type){
-            case 'Save':
-                $target = 'ctl00$ContentQuery$btnSave';
-                break;
-
-            case 'Send':
-                $target = 'ctl00$ContentQuery$btnSend';
-                break;
-        }
 
         $post = [
-            '__EVENTTARGET' => $target,
+            '__EVENTTARGET' => '',
             '__EVENTARGUMENT' => '',
             '__LASTFOCUS' => '',
             '__VIEWSTATE' => $data['__VIEWSTATE'],
@@ -1478,7 +1498,7 @@ class SourceGalanz extends Source
             'ctl00$ContentData$new_installer' => $data['new_installer'],
             'ctl00$ContentData$new_goldcard' => $data['new_goldcard'],
             'ctl00$ContentData$new_remarks' => $data['new_remarks'],
-            'ctl00$ContentData$txtproducenumber' => $data['txtproducenumber'],
+            'ctl00$ContentData$txtproducenumber' => '',
             'ctl00$ContentData$new_qualityresult' => $data['new_qualityresult'],
             'ctl00$ContentData$new_custadvice' => $data['new_custadvice'],
             'ctl00$ContentData$ownerid' => $data['ownerid'],
@@ -1488,6 +1508,29 @@ class SourceGalanz extends Source
             'ctl00$ContentData$ifamount' => $data['ifamount'],
         ];
 
+        switch ($type){
+            case 'Save':
+                $post['__EVENTTARGET'] = 'ctl00$ContentQuery$btnSave';
+                break;
+
+            case 'Send':
+                $post['__EVENTTARGET'] = 'ctl00$ContentQuery$btnSend';
+                break;
+
+            case 'Add':
+                $post['__EVENTTARGET'] = 'ctl00$ContentData$btnAdd';
+                $post['ctl00$ContentData$txtproducenumber'] = $data['txtproducenumber'];
+                break;
+
+            case 'Del':
+                $post['ctl00$ContentData$btnDelete'] = '删除';
+                $products = $this->HandelUserProfileOrderProductsParam($data['products']);
+                $post = array_merge($post, $products);
+                break;
+        }
+
+        //return_msg(true, '', $post);
+
         $url = self::$host . '/Warranty/new_srv_userprofileEP.aspx?mainid=&mainidname=&attrcode=&id=' . $id;
         $headers = $this->Header($url);
         $result = $this->CurlPost($url, $post, $headers);
@@ -1499,6 +1542,34 @@ class SourceGalanz extends Source
         return $result;
     }
 
+    /**
+     * 安装单-明细信息处理
+     * @param $data
+     * @return array
+     */
+    private function HandelUserProfileOrderProductsParam($data)
+    {
+        $result = [];
+
+        if ($data) {
+            foreach ($data as $k => $v) {
+                $tempKey = str_pad($k, 2, '0', STR_PAD_LEFT);
+
+                $post = [
+                    'ctl00$ContentData$rpt$ctl'.$tempKey.'$chk' => $v['chk'],
+                ];
+
+                if (!isset($v['checked']) || !$v['checked']) {
+                    array_shift($post);
+                }
+
+                $post && $result = array_merge($result, $post);
+            }
+        }
+
+        return $result;
+    }
+
     /**
      * 派工单表单字段
      * @return array