|
|
@@ -716,21 +716,22 @@ class Consult extends Base
|
|
|
$expire_day = isset($this->post['expire_day'])&&$this->post['expire_day']!=""? intval($this->post['expire_day']) :"";
|
|
|
$origin_place = isset($this->post['origin_place'])&&$this->post['origin_place']!=""? trim($this->post['origin_place']):"";
|
|
|
$supplierNo = isset($this->post['supplierNo'])&&$this->post['supplierNo']!=""? trim($this->post['supplierNo']):"";
|
|
|
- $supplier_account = checkHasAccountBySupplierNos([$supplierNo]);
|
|
|
+// $supplier_account = checkHasAccountBySupplierNos([$supplierNo]);
|
|
|
$cgd_supplier_code = isset($this->post['cgd_supplier_code'])&&$this->post['cgd_supplier_code']!=''? trim($this->post['cgd_supplier_code']):'';
|
|
|
- $cgd_apply_id = isset($this->post['cgd_apply_id'])&&$this->post['cgd_apply_id']!=''? trim($this->post['cgd_apply_id']):'';
|
|
|
+ $cgd_apply_id = isset($this->post['cgd_apply_id'])&&$this->post['cgd_apply_id']!=''? trim($this->post['cgd_apply_id']):0;
|
|
|
$cgd_apply_name = isset($this->post['cgd_apply_name'])&&$this->post['cgd_apply_name']!=''? trim($this->post['cgd_apply_name']):'';
|
|
|
- $supplier_origin_price = isset($this->post['supplier_origin_price'])&&$this->post['supplier_origin_price']!=''? floatval($this->post['supplier_origin_price']):'';
|
|
|
- $cgd_supplier_name='';
|
|
|
+ $supplier_origin_price = isset($this->post['supplier_origin_price'])&&$this->post['supplier_origin_price']!=''? floatval($this->post['supplier_origin_price']):0;
|
|
|
+
|
|
|
$user= \app\admin\common\User::getIns();
|
|
|
$supplier =$user->handle("getCodeAndName",["code"=>[$supplierNo,$cgd_supplier_code]]);
|
|
|
$supplierName = isset($supplier['data'][$supplierNo])?$supplier['data'][$supplierNo]:"";
|
|
|
- if(isset($supplier_account[$supplierNo])){
|
|
|
- if($cgd_supplier_code=='')return error_show(1004,'采购供应商信息不能为空');
|
|
|
- if($cgd_apply_id=='')return error_show(1004,'采购竞单人信息不能为空');
|
|
|
- if($supplier_origin_price==='')return error_show(1004,'采购供应商信息采购成本不能为空');
|
|
|
- $cgd_supplier_name= $supplier['data'][$cgd_supplier_code]??'';
|
|
|
- }
|
|
|
+ $cgd_supplier_name= $supplier['data'][$cgd_supplier_code]??'';
|
|
|
+// if(isset($supplier_account[$supplierNo])){
|
|
|
+// if($cgd_supplier_code=='')return error_show(1004,'采购供应商信息不能为空');
|
|
|
+// if($cgd_apply_id=='')return error_show(1004,'采购竞单人信息不能为空');
|
|
|
+// if($supplier_origin_price==='')return error_show(1004,'采购供应商信息采购成本不能为空');
|
|
|
+// $cgd_supplier_name= $supplier['data'][$cgd_supplier_code]??'';
|
|
|
+// }
|
|
|
$pay_way = isset($this->post['pay_way'])&&$this->post['pay_way']!=""? intval($this->post['pay_way']):"";
|
|
|
$tax = isset($this->post['tax'])&&$this->post['tax']!=""? trim($this->post['tax']):"";
|
|
|
$send_way = isset($this->post['send_way'])&&$this->post['send_way']!=""? intval($this->post['send_way']):"";
|
|
|
@@ -824,7 +825,6 @@ class Consult extends Base
|
|
|
|
|
|
if ($supplierArr['relation_code'] != '') {
|
|
|
if ($supplierArr['relation_code'] == $zx['companyNo']) return error_show(1004, "业务公司与供应商信息一致");
|
|
|
-
|
|
|
//判断支付渠道中是否有相关供应商
|
|
|
$is_select_pay_rate = Db::name('platform')
|
|
|
->where(['is_del' => 0, 'id' => $zx['platform_code']])
|
|
|
@@ -1130,22 +1130,22 @@ class Consult extends Base
|
|
|
$expire_day = isset($this->post['expire_day'])&&$this->post['expire_day']!=""? intval($this->post['expire_day']) :"";
|
|
|
$origin_place = isset($this->post['origin_place'])&&$this->post['origin_place']!=""? trim($this->post['origin_place']):"";
|
|
|
$supplierNo = isset($this->post['supplierNo'])&&$this->post['supplierNo']!=""? trim($this->post['supplierNo']):"";
|
|
|
- $supplier_account = checkHasAccountBySupplierNos([$supplierNo]);
|
|
|
+// $supplier_account = checkHasAccountBySupplierNos([$supplierNo]);
|
|
|
$cgd_supplier_code = isset($this->post['cgd_supplier_code'])&&$this->post['cgd_supplier_code']!=''? trim($this->post['cgd_supplier_code']):'';
|
|
|
- $cgd_apply_id = isset($this->post['cgd_apply_id'])&&$this->post['cgd_apply_id']!=''? trim($this->post['cgd_apply_id']):'';
|
|
|
+ $cgd_apply_id = isset($this->post['cgd_apply_id'])&&$this->post['cgd_apply_id']!=''? trim($this->post['cgd_apply_id']):0;
|
|
|
$cgd_apply_name = isset($this->post['cgd_apply_name'])&&$this->post['cgd_apply_name']!=''? trim($this->post['cgd_apply_name']):'';
|
|
|
- $supplier_origin_price = isset($this->post['supplier_origin_price'])&&$this->post['supplier_origin_price']!=''? floatval($this->post['supplier_origin_price']):'';
|
|
|
+ $supplier_origin_price = isset($this->post['supplier_origin_price'])&&$this->post['supplier_origin_price']!=''? floatval($this->post['supplier_origin_price']):0;
|
|
|
$cgd_supplier_name='';
|
|
|
$user= \app\admin\common\User::getIns();
|
|
|
$supplier =$user->handle("getCodeAndName",["code"=>[$supplierNo,$cgd_supplier_code]]);
|
|
|
|
|
|
$supplierName = isset($supplier['data'][$supplierNo])?$supplier['data'][$supplierNo]:"";
|
|
|
- if(isset($supplier_account[$supplierNo])){
|
|
|
- if($cgd_supplier_code=='')return error_show(1004,'采购供应商信息不能为空');
|
|
|
- if($cgd_apply_id=='')return error_show(1004,'采购竞单人信息不能为空');
|
|
|
- if($supplier_origin_price==='')return error_show(1004,'采购供应商信息采购成本不能为空');
|
|
|
+// if(isset($supplier_account[$supplierNo])){
|
|
|
+// if($cgd_supplier_code=='')return error_show(1004,'采购供应商信息不能为空');
|
|
|
+// if($cgd_apply_id=='')return error_show(1004,'采购竞单人信息不能为空');
|
|
|
+// if($supplier_origin_price==='')return error_show(1004,'采购供应商信息采购成本不能为空');
|
|
|
$cgd_supplier_name= $supplier['data'][$cgd_supplier_code]??'';
|
|
|
- }
|
|
|
+// }
|
|
|
$pay_way = isset($this->post['pay_way'])&&$this->post['pay_way']!=""? intval($this->post['pay_way']):"";
|
|
|
$tax = isset($this->post['tax'])&&$this->post['tax']!=""? trim($this->post['tax']):"";
|
|
|
$send_way = isset($this->post['send_way'])&&$this->post['send_way']!=""? intval($this->post['send_way']):"0";
|
|
|
@@ -1216,6 +1216,8 @@ class Consult extends Base
|
|
|
if(channel_is_company($zx['platform_code'],$supplierArr['relation_code'])) return error_show(1004, "平台渠道包含当前供应商公司{$supplierNo}");
|
|
|
//
|
|
|
}
|
|
|
+ }else{
|
|
|
+ if($is_combind==1)$this->error('当前供应商无对应业务公司，不可选择组合商品');
|
|
|
}
|
|
|
|
|
|
Db::startTrans();
|
