|
|
@@ -134,7 +134,8 @@ class Purchin extends BaseController
|
|
|
$data['addr_code'] =isset($wsmcode['addr_code']) ? $wsmcode['addr_code']:"";
|
|
|
$data['wsm_addr'] =isset($wsmcode['addr_code']) ? GetAddr($wsmcode['addr_code']):"";
|
|
|
$data['wsm_addr'].=isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr']:"";
|
|
|
- $check = Db::name("purchease_info")->where(['wsm_in_code'=>$incode,"is_del"=>0])->select();
|
|
|
+ $check = Db::name("purchease_info")->alias("a")->leftJoin("result_info b","a.error_code=b.result_code")->where
|
|
|
+ (['wsm_in_code'=>$incode,"a.is_del"=>0])->field("a.id,a.wsm_in_code,a.num,a.error_code,b.result as error_msg,a.error_img,remark,a.is_del")->select();
|
|
|
$info['checkinfo']= $check;
|
|
|
$return = Db::name("purchease_return")->where(['wsm_in_code'=>$incode,"is_del"=>0])->find();
|
|
|
$info['return']= $return;
|
