|
|
@@ -1526,7 +1526,6 @@ class Sale extends Base
|
|
|
if ($id == "") {
|
|
|
return error_show(1002, "参数id不能为空");
|
|
|
}
|
|
|
- //->field('good_code,good_name,good_num,customer_code,orderCode')
|
|
|
$einfo = Db::name('sale')->where(['id' => $id, 'is_del' => 0])->find();
|
|
|
if (empty($einfo)) {
|
|
|
return error_show(1002, "未找到销售订单数据");
|
|
|
@@ -1609,9 +1608,10 @@ class Sale extends Base
|
|
|
$value['addr_info'] = "";
|
|
|
$value['send_num'] = 0;
|
|
|
if ($value['addr_code'] != "") {
|
|
|
- $addr = GetAddr($value['addr_code']);
|
|
|
+ $place = ["provice_code"=>"","city_code"=>"","area_code"=>""];
|
|
|
+ list($place['provice_code'],$place['city_code'],$place['area_code'])=explode(",",$value['addr_code']);
|
|
|
+ $addr = GetAddr(json_encode($place));
|
|
|
$value['addr_info'] = $addr;
|
|
|
- $value['addr_code'] = json_decode($value['addr_code'], true);
|
|
|
}
|
|
|
$value['wsm_name']="";
|
|
|
if(isset($value['wsm_code'])&&$value['wsm_code']!=""){
|
