|
|
@@ -3392,8 +3392,15 @@ class Sale extends Base
|
|
|
|
|
|
$data = [];
|
|
|
foreach ($list as $value) {
|
|
|
- $wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c", "k.supplierNo=c.code")
|
|
|
+
|
|
|
+ if($value['order_type']==1 && $value['wsm_code']==''){
|
|
|
+ $wsmcode = Db::name("good")->alias("a")
|
|
|
+ ->leftJoin("supplier b","a.supplierNo=b.code")
|
|
|
+ ->where(["a.spuCode"=>$value['good_code']])->field("'' wsm_name,b.name,b.code")->find();
|
|
|
+ }else{
|
|
|
+ $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 =$addr['addr_code']!=''?json_decode($addr['addr_code'],true)??$addr['addr_code']: '' ;
|
