|
|
@@ -2337,7 +2337,16 @@ class Goodup extends Base
|
|
|
if (isset($supplier_account[$data['supplierNo']])) return json_show(1004, '原供应商已开通账号，不允许操作');
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ $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_name = isset($this->post['cgd_apply_name'])&&$this->post['cgd_apply_name']!=''? trim($this->post['cgd_apply_name']):'';
|
|
|
+ $cgd_supplier_name='';
|
|
|
+ if(isset($supplierArr['relation_code']) && $supplierArr['relation_code']!=''){
|
|
|
+ if($cgd_supplier_code=='')return error_show(1004,'采购供应商信息不能为空');
|
|
|
+ if($cgd_apply_id=='')return error_show(1004,'采购竞单人信息不能为空');
|
|
|
+ $cgd_supplier =$userCommon->handle('getCodeAndName',['code'=>$cgd_supplier_code]);
|
|
|
+ $cgd_supplier_name= $cgd_supplier['data'][$cgd_supplier_code]??'';
|
|
|
+ }
|
|
|
$supplier_temp =$userCommon->handle("hqInfo",["code"=>$supplierNo]);
|
|
|
if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1004,"供应商信息未找到");
|
|
|
$supplierArr=$supplier_temp['data']??[];
|
|
|
@@ -2536,6 +2545,10 @@ class Goodup extends Base
|
|
|
'is_support_barter'=>$is_support_barter,
|
|
|
'chargerid' => $supplier['personid'] ?? $this->uid,
|
|
|
'charger' => $supplier['person'] ?? $this->uname,
|
|
|
+ 'cgd_supplier_code'=>$cgd_supplier_code,//采购供应商编号
|
|
|
+ 'cgd_supplier_name'=>$cgd_supplier_name,//采购供应商编号
|
|
|
+ 'cgd_apply_id'=>$cgd_apply_id,//竞单人
|
|
|
+ 'cgd_apply_name'=>$cgd_apply_name,//竞单人
|
|
|
];
|
|
|
$field = array_diff_assoc($temp,$data);
|
|
|
$temp['field_change'] =empty($field)?"":json_encode(array_keys($field));
|
|
|
@@ -2546,22 +2559,6 @@ class Goodup extends Base
|
|
|
if($up){
|
|
|
$this->BasicToGood($supcode,$temp);
|
|
|
ChangeLog::logAdd(3,$data['spuCode'],$dat,$json,['id' => $this->uid, 'nickname' => $this->uname]);
|
|
|
-// //修改状态，添加待办
|
|
|
-// ActionLog::logAdd($this->post['token'], [
|
|
|
-// "order_code" =>$supcode,//咨询单详情编号
|
|
|
-// "status" => $data['status'],//这里的status是之前的值
|
|
|
-// "action_remark" => '',//备注
|
|
|
-// "action_type" => "create"//新建create，编辑edit，更改状态status
|
|
|
-// ], "SPCB", 0,$temp);
|
|
|
-//
|
|
|
-// ProcessOrder::AddProcess($this->post['token'], [
|
|
|
-// "order_type" => 'SPCB',
|
|
|
-// "order_code" =>$supcode,//咨询单详情编号
|
|
|
-// "order_id" => $data['id'],
|
|
|
-// "order_status" =>0,
|
|
|
-// "before_status"=>0,
|
|
|
-// 'holder_id'=>$data['createrid'],
|
|
|
-// ]);
|
|
|
if($speclist!=="" && !empty($speclist)){
|
|
|
foreach ($speclist as $value){
|
|
|
$lemp=[];
|
