|
|
@@ -3266,7 +3266,7 @@ class Sale extends Base
|
|
|
->leftJoin("order_send os", "os.outCode=a.outCode")
|
|
|
->leftJoin("purchease_order wpo", "wpo.cgdNo=os.cgdNo")
|
|
|
->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0")
|
|
|
- ->field("a.*,b.good_name,b.good_code,b.skuCode,b.supplierNo,b.customer_code,v.companyName,b.origin_price,b.sale_price,b.total_price,os.cgdNo,u.itemid")
|
|
|
+ ->field("a.*,b.order_type,b.order_source,b.good_name,b.good_code,b.skuCode,b.supplierNo,b.customer_code,v.companyName,b.origin_price,b.sale_price,b.total_price,os.cgdNo,u.itemid")
|
|
|
->where($where)
|
|
|
->where($condition)
|
|
|
->order("addtime desc")
|
|
|
@@ -3278,6 +3278,14 @@ class Sale extends Base
|
|
|
$wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c", "k.supplierNo=c.code")
|
|
|
->where(["k.wsm_code" => $value['wsm_code']])->field("k.name as wsm_name,c.name,c.code")->find();
|
|
|
$addr = Db::name("order_addr")->where(["id" => $value['addrid']])->find();
|
|
|
+ if($addr){
|
|
|
+ $addinfo =json_decode($addr['addr_code'],true);
|
|
|
+ if(is_string($addinfo)){
|
|
|
+ $addinfo=["provice_code"=>'',"city_code"=>'',"area_code"=>''];
|
|
|
+ list($addinfo['provice_code'],$addinfo['city_code'],$addinfo['area_code']) = explode(",",$addr['addr_code']);
|
|
|
+ }
|
|
|
+ $addr['addr_cn'] =GetAddr(json_encode($addinfo));
|
|
|
+ }
|
|
|
if ($value['order_type'] == 3) {
|
|
|
$goon = Db::name("good_zixun")->field('id,cat_id')->where(["spuCode" => $value['good_code'], "is_del" => 0])->find();
|
|
|
} else {
|
