|
@@ -353,6 +353,11 @@ class Sale extends BaseController
|
|
|
if(empty($einfo)){
|
|
|
return error_show(1002,"未找到销售订单数据");
|
|
|
}
|
|
|
+ $info = Db::name('sale_diff')->where(['orderCode'=>$einfo['orderCode']])->select();
|
|
|
+ $de = Db::name('order_out')->where(['orderCode'=>$einfo['orderCode']])->select();
|
|
|
+ $dm = Db::name('order_return')->where(['orderCode'=>$einfo['orderCode']])->select();
|
|
|
+ $dk= Db::name('order_back')->where(['orderCode'=>$einfo['orderCode']])->select();
|
|
|
+ $sa= Db::name('sale_return')->where(['orderCode'=>$einfo['orderCode']])->select();
|
|
|
|
|
|
$goon = Db::name('good')->alias('b')->join("good_type a","a.good_code=b.good_code","left")
|
|
|
->where(['a.type_code'=> $einfo['good_code']])->find();
|
|
@@ -438,6 +443,11 @@ class Sale extends BaseController
|
|
|
$einfo['addrs']=$addrs;
|
|
|
$einfo['bum']=$ins;
|
|
|
$einfo['can']=$int;
|
|
|
+ $einfo['item']=$info;
|
|
|
+ $einfo['empty']=$de;
|
|
|
+ $einfo['str']=$dm;
|
|
|
+ $einfo['var']=$dk;
|
|
|
+ $einfo['sainfo']=$sa;
|
|
|
if(empty($einfo)){
|
|
|
return error_show(1002,"未找到销售订单数据");
|
|
|
}else{
|
|
@@ -1036,4 +1046,32 @@ class Sale extends BaseController
|
|
|
}
|
|
|
return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);
|
|
|
}
|
|
|
+ public function outinfo(){
|
|
|
+ $outCode = isset($this->post['outCode']) && $this->post['outCode']!==""? trim($this->post['outCode']):"";
|
|
|
+ if($outCode==""){
|
|
|
+ return error_show(1002,"参数outcode不能为空");
|
|
|
+ }
|
|
|
+ $codeinfo = Db::name("order_out")->where(['outCode'=>$outCode])->select();
|
|
|
+ if(empty($codeinfo)){
|
|
|
+ return error_show(1002,"未找到出库数据");
|
|
|
+ }
|
|
|
+ $data=[];
|
|
|
+ foreach ($codeinfo as $value) {
|
|
|
+ $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();
|
|
|
+ $item = Db::name("sale")->where(['orderCode'=>$value['orderCode']])->find();
|
|
|
+ $value['good_name'] = isset($item['good_name']) ? $item['good_name'] : "";
|
|
|
+ $value['good_num'] = isset($item['good_num']) ? $item['good_num'] : "";
|
|
|
+ $value['good_code'] = isset($item['good_code']) ? $item['good_code'] : "";
|
|
|
+ $value['wsm_name'] = isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name'] : "";
|
|
|
+ $value['wsm_supplier'] = isset($wsmcode['name']) ? $wsmcode['name'] : "";
|
|
|
+ $value['wsm_supplierNo'] = isset($wsmcode['code']) ? $wsmcode['code'] : "";
|
|
|
+ $value['addr'] = isset($addr['addr']) ? $addr['addr'] : "";
|
|
|
+ $value['contactor'] = isset($addr['contactor']) ? $addr['contactor'] : "";
|
|
|
+ $value['mobile'] = isset($addr['mobile']) ? $addr['mobile'] : "";
|
|
|
+ $data[] = $value;
|
|
|
+ }
|
|
|
+ return app_show(0,"获取成功",$data);
|
|
|
+ }
|
|
|
}
|