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

2. 维修单相关接口参数修改

application/libraries/Receive/ReceiveGalanz.php

@@ -15,13 +15,13 @@ class ReceiveGalanz extends Receive
      */
     public function CheckQueryOrderValues()
     {
-        $fileds = ['out_trade_no'];
+        $fileds = ['id'];
         $this->CheckValues($fileds);
     }
 
     public function CheckQueryWorkOrderValues()
     {
-        $fileds = ['work_order_no'];
+        $fileds = ['id'];
         $this->CheckValues($fileds);
     }
 
@@ -59,8 +59,48 @@ class ReceiveGalanz extends Receive
 
     public function CheckSearchWorkOrderValues()
     {
-        $fileds = ['mobile'];
-        $this->CheckValues($fileds);
+//        $fileds = ['mobile'];
+//        $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()
@@ -74,7 +114,7 @@ class ReceiveGalanz extends Receive
      */
     public function CheckSaveOrderValues()
     {
-        $fileds = ['out_trade_no'];
+        $fileds = ['id'];
         $this->CheckValues($fileds);
 
         $dfields = [
@@ -130,7 +170,7 @@ class ReceiveGalanz extends Receive
      */
     public function CheckRefuseOrderValues()
     {
-        $fileds = ['out_trade_no'];
+        $fileds = ['id'];
         $this->CheckValues($fileds);
     }
 
@@ -139,7 +179,7 @@ class ReceiveGalanz extends Receive
      */
     public function CheckAcceptOrderValues()
     {
-        $fileds = ['out_trade_no'];
+        $fileds = ['id'];
         $this->CheckValues($fileds);
 
     }
@@ -149,7 +189,7 @@ class ReceiveGalanz extends Receive
      */
     public function CheckCreateWorkOrderValues()
     {
-        $fileds = ['out_trade_no'];
+        $fileds = ['id'];
         $this->CheckValues($fileds);
     }
 
@@ -158,14 +198,14 @@ class ReceiveGalanz extends Receive
      */
     public function CheckCreateUserProfileOrderValues()
     {
-        $fileds = ['out_trade_no'];
+        $fileds = ['id'];
         $this->CheckValues($fileds);
     }
 
     //保存维修单
     public function CheckSaveWorkOrderValues()
     {
-        $fileds = ['work_order_no'];
+        $fileds = ['id'];
         $this->CheckValues($fileds);
 
         $dfields = [
@@ -286,7 +326,7 @@ class ReceiveGalanz extends Receive
 
     public function CheckSendWorkOrderValues()
     {
-        $fileds = ['work_order_no'];
+        $fileds = ['id'];
         $this->CheckValues($fileds);
     }
 
@@ -410,19 +450,19 @@ class ReceiveGalanz extends Receive
 
     public function CheckAddProdWorkOrderValues()
     {
-        $fileds = ['work_order_no'];
+        $fileds = ['id'];
         $this->CheckValues($fileds);
     }
 
     public function CheckSetProdWorkOrderValues()
     {
-        $fileds = ['work_order_no', 'txtproducenumber'];
+        $fileds = ['id', 'txtproducenumber'];
         $this->CheckValues($fileds);
     }
 
     public function CheckAddErrorWorkOrderValues()
     {
-        $fileds = ['work_order_no', 'chk'];
+        $fileds = ['id', 'chk'];
         $this->CheckValues($fileds);
     }
 
@@ -442,7 +482,7 @@ class ReceiveGalanz extends Receive
 
     public function CheckAddPartsWorkOrderValues()
     {
-        $fileds = ['work_order_no', 'chk'];
+        $fileds = ['id', 'chk'];
         $this->CheckValues($fileds);
     }
 
@@ -461,7 +501,7 @@ class ReceiveGalanz extends Receive
 
     public function CheckDelProdWorkOrderValues()
     {
-        $fileds = ['work_order_no', 'chk'];
+        $fileds = ['id', 'chk'];
         $this->CheckValues($fileds);
     }
 
@@ -480,7 +520,7 @@ class ReceiveGalanz extends Receive
 
     public function CheckDelErrorWorkOrderValues()
     {
-        $fileds = ['work_order_no', 'chk'];
+        $fileds = ['id', 'chk'];
         $this->CheckValues($fileds);
     }
 
@@ -491,7 +531,7 @@ class ReceiveGalanz extends Receive
 
     public function CheckDelPartsWorkOrderValues()
     {
-        $fileds = ['work_order_no', 'chk'];
+        $fileds = ['id', 'chk'];
         $this->CheckValues($fileds);
     }
 

application/libraries/Source/SourceGalanz.php

@@ -226,12 +226,18 @@ class SourceGalanz extends Source
 
     /**
      * 维修单搜索
-     * @param string $new_number
-     * @param string $mobile
-     * @param string $approvalstatus 单据状态
+     * @param string $name 	维修单号
+     * @param string $custmobile 顾客手机
+     * @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
      */
-    public function SearchWorkOrder($new_number='', $mobile='', $approvalstatus='')
+    public function SearchWorkOrder($name='', $custmobile='', $producenumber='', $approvalstatus='', $ischangepart='', $returnfactory='', $isrelief='', $stime='', $etime='')
     {
         $post = [
             '__EVENTTARGET' => 'ctl00$ContentQuery$btnQuery',
@@ -242,16 +248,16 @@ class SourceGalanz extends Source
             'ctl00$ContentQuery$hidMainId' => '',
             'ctl00$ContentQuery$hidAttrCode' => '',
             'ctl00$ContentQuery$hidMainIdName' => '',
-            'ctl00$ContentQuery$new_finishtime_s' => '',
-            'ctl00$ContentQuery$new_finishtime_e' => '',
-            'ctl00$ContentQuery$new_number' => $new_number,
+            'ctl00$ContentQuery$new_finishtime_s' => $stime,
+            'ctl00$ContentQuery$new_finishtime_e' => $etime,
+            'ctl00$ContentQuery$new_number' => $name,
             'ctl00$ContentQuery$new_custname' => '',
-            'ctl00$ContentQuery$new_custmobile' => $mobile,
-            'ctl00$ContentQuery$new_ischangepart' => 1,
-            'ctl00$ContentQuery$new_returnfactory' => 1,
-            'ctl00$ContentQuery$new_isrelief' => 1,
+            'ctl00$ContentQuery$new_custmobile' => $custmobile,
+            'ctl00$ContentQuery$new_ischangepart' => $ischangepart,
+            'ctl00$ContentQuery$new_returnfactory' => $returnfactory,
+            'ctl00$ContentQuery$new_isrelief' => $isrelief,
             'ctl00$ContentQuery$new_approvalstatus' => $approvalstatus,
-            'ctl00$ContentQuery$txtproducenumber' => '',
+            'ctl00$ContentQuery$txtproducenumber' => $producenumber,
             'ctl00$ContentQuery$new_name' => '',
             'ctl00$ContentQuery$new_iskt' => 0,
             'ctl00$ContentData$PagerToolBar1$ctl00' => 500,