|
|
@@ -914,6 +914,9 @@ class Sale extends Base
|
|
|
$zxinfo = Db::name("consult_bids")->where(["bidNo" => $bidNo, "is_del" => 0])->find();
|
|
|
if ($zxinfo == false) {
|
|
|
return error_show(1003, "未找到咨询单商品信息");
|
|
|
+ }
|
|
|
+ if ($zxinfo['status'] !=7) {
|
|
|
+ return error_show(1003, "咨询单商品财务未审核");
|
|
|
}
|
|
|
$bargaininfo =Db::name("bargain_order")->where(["bidsNo" => $bidNo,"is_del"=>0,"status"=>0])->findOrEmpty();
|
|
|
$zx = Db::name("consult_info")->where(["infoNo" => $zxinfo['infoNo'], "is_del" => 0])->find();
|
|
|
@@ -1233,6 +1236,8 @@ class Sale extends Base
|
|
|
'inv_good_name'=>$zxinfo['inv_good_name'],
|
|
|
'open_type'=>$zxinfo['open_type'],
|
|
|
'tax'=>$zxinfo['tax'],
|
|
|
+ "out_tax_id"=>$zxinfo['out_tax_id'],
|
|
|
+ 'out_tax'=>$zxinfo['out_tax'],
|
|
|
'createrid' => $zxinfo['createrid'],
|
|
|
'creater' => $zxinfo['creater'],
|
|
|
];
|
|
|
@@ -1246,7 +1251,7 @@ class Sale extends Base
|
|
|
$temp['spuCode']=$item['spuCode'];
|
|
|
$temp['tax_code']=$item['cat_code'];
|
|
|
$temp['tax_name']=$item['cat_name'];
|
|
|
- $temp['tax_short_name']=$item['short_name'];
|
|
|
+ $temp['tax_short_name']=$item['short_name'];
|
|
|
$temp['inv_tax']=$item['tax'];
|
|
|
$temp['inv_good_name']=$item['inv_good_name'];
|
|
|
return $temp;
|
|
|
@@ -1600,6 +1605,9 @@ class Sale extends Base
|
|
|
$goodinfo = Db::name("consult_bids")->where(["spuCode" => $data['spuCode'], "is_del" => 0])->find();
|
|
|
if ($goodinfo == false) {
|
|
|
throw new Exception("咨询商品未找到");
|
|
|
+ }
|
|
|
+ if ($goodinfo['status'] !=7) {
|
|
|
+ throw new Exception('咨询单商品财务未审核');
|
|
|
}
|
|
|
$bargaininfo =Db::name("bargain_order")->where(["bidsNo" => $goodinfo["bidNo"],"is_del"=>0,"status"=>0])
|
|
|
->findOrEmpty();
|
|
|
@@ -1833,6 +1841,8 @@ class Sale extends Base
|
|
|
'open_type'=>$goodinfo['open_type'],
|
|
|
'inv_good_name'=>$goodinfo['inv_good_name'],
|
|
|
'tax'=>$goodinfo['tax'],
|
|
|
+ 'out_tax_id'=>$goodinfo['out_tax_id'],
|
|
|
+ 'out_tax'=>$goodinfo['out_tax'],
|
|
|
'createrid' => $goodinfo['createrid'],
|
|
|
'creater' => $goodinfo['creater'],
|
|
|
];
|
