|
|
@@ -505,6 +505,7 @@ class After extends Base
|
|
|
return error_show(1005,"采购主管未审核无法设置退回仓库");
|
|
|
}
|
|
|
$wsm_code = isset($this->post['wsm_code']) && $this->post['wsm_code']!="" ? trim($this->post['wsm_code']) :"";
|
|
|
+ $warehouse=[];
|
|
|
if($info['return_tag']==2) {
|
|
|
if($wsm_code==""){
|
|
|
return error_show(1005,"参数 wsm_code 不能为空");
|
|
|
@@ -514,6 +515,7 @@ class After extends Base
|
|
|
return error_show(1005,"仓库数据未找到");
|
|
|
}
|
|
|
$wareaddr =Db::name("warehouse_addr")->where(["wsm_code"=>$wsm_code,"is_del"=>0,"status"=>1])->find();
|
|
|
+
|
|
|
}
|
|
|
$addrcode=isset($this->post['addr_code'])&&$this->post['addr_code']!=""?$this->post['addr_code']:"";
|
|
|
if($addrcode==""){
|
|
|
@@ -565,6 +567,10 @@ class After extends Base
|
|
|
}
|
|
|
$old_info_status = $info['status'];
|
|
|
$info['status']=4;
|
|
|
+ if($info['order_type']==1){
|
|
|
+ $info['cgder']=$warehouse['contactor_name']??"";
|
|
|
+ $info['cgderid']=$warehouse['contactor']??0;
|
|
|
+ }
|
|
|
$info["updatetime"]=date("Y-m-d H:i:s");
|
|
|
$up =Db::name("order_return")->save($info);
|
|
|
if($up){
|
