ad

app/admin/controller/Consult.php

@@ -783,10 +783,7 @@ class Consult extends Base
 			 $spucode=makeNo('SSU');
 		}
 		$tax_id = isset($this->post['tax_id'])&&$this->post['tax_id']!==''? intval($this->post['tax_id']):'0';
-        $is_syscn_tax = isset($this->post['is_syscn_tax'])&&$this->post['is_syscn_tax']!==''? intval($this->post['is_syscn_tax']):'0';
-        $out_tax = isset($this->post['tax'])&&$this->post['tax']!==''? trim($this->post['tax']):'';
-        $out_tax_id = isset($this->post['out_tax_id'])&&$this->post['out_tax_id']!==''? intval($this->post['out_tax_id']):'0';
-		$cgd_tax_id = isset($this->post['cgd_tax_id'])&&$this->post['cgd_tax_id']!==''? intval($this->post['cgd_tax_id']):'0';
+        $cgd_tax_id = isset($this->post['cgd_tax_id'])&&$this->post['cgd_tax_id']!==''? intval($this->post['cgd_tax_id']):'0';
 		$cgd_tax = isset($this->post['cgd_tax'])&&$this->post['cgd_tax']!==''? trim($this->post['cgd_tax']):'';
         $open_type= isset($this->post['open_type'])&&$this->post['open_type']!==''? intval($this->post['open_type']):1;
         $inv_good_name = isset($this->post['inv_good_name'])&&$this->post['inv_good_name']!==''? trim($this->post['inv_good_name']):'';
@@ -799,7 +796,10 @@ class Consult extends Base
                 if($cgd_tax==='') return error_show(1004,'源头供应商开票税率不能为空');
             }
         }
-        if($is_syscn_tax==1){
+        $is_syscn_tax = isset($this->post['is_syscn_tax'])&&$this->post['is_syscn_tax']!==''? intval($this->post['is_syscn_tax']):'0';
+        $out_tax = isset($this->post['tax'])&&$this->post['tax']!==''? trim($this->post['tax']):'';
+        $out_tax_id = isset($this->post['out_tax_id'])&&$this->post['out_tax_id']!==''? intval($this->post['out_tax_id']):'0';
+         if($is_syscn_tax==1){
             $out_tax_id = $tax_id;
             $out_tax = $tax;
         }
@@ -1289,6 +1289,13 @@ class Consult extends Base
                 if($cgd_tax==='') return error_show(1004,'源头供应商开票税率不能为空');
             }
         }
+        $is_syscn_tax = isset($this->post['is_syscn_tax'])&&$this->post['is_syscn_tax']!==''? intval($this->post['is_syscn_tax']):'0';
+        $out_tax = isset($this->post['tax'])&&$this->post['tax']!==''? trim($this->post['tax']):'';
+        $out_tax_id = isset($this->post['out_tax_id'])&&$this->post['out_tax_id']!==''? intval($this->post['out_tax_id']):'0';
+        if($is_syscn_tax==1){
+            $out_tax_id = $tax_id;
+            $out_tax = $tax;
+        }
         Db::startTrans();
         try{
             $data=[
@@ -1331,6 +1338,7 @@ class Consult extends Base
                 "origin_price"=>$saleprice,
                 "supply_area"=>$supply_area,
                 "remark"=>$remark,
+                'is_syscn_tax'=>$is_syscn_tax,
                 "status"=>0,
                 "updatetime"=>date("Y-m-d H:i:s"),
                 'delivery_place' => $delivery_place,
@@ -1342,6 +1350,8 @@ class Consult extends Base
 		        'open_type'=>$open_type,
                 'inv_good_name'=>$inv_good_name,//采购商品名称
                 'tax_id'=>$tax_id,//税目id
+                'out_tax'=>$out_tax,//税目
+                'out_tax_id'=>$out_tax_id,//税目id
                 'cgd_tax'=>$cgd_tax,//税目
 	            'cgd_tax_id'=>$cgd_tax_id
             ];

app/admin/controller/Goodup.php

@@ -1353,6 +1353,9 @@ class Goodup extends Base
         $creater= $this->uname;
         Db::startTrans();
         try {
+            if($status==9 && $data['is_syscn_tax']==1){
+                $status=1;
+            }
             if($status==1){
             	        //区分是否是对接平台
 		        $platform_info=Db::name('platform')
@@ -1385,9 +1388,6 @@ class Goodup extends Base
                     ]);
                 }
             }
-            if($status==9 && $data['is_syscn_tax']==1){
-                $status=1;
-            }
             $old_status = $data['status'];
             $data['status']=$status;
             $data['updatetime']=date("Y-m-d H:i:s");