|
@@ -7,6 +7,7 @@ use App\Model\Construction;
|
|
use App\Model\ConstructionInfo;
|
|
use App\Model\ConstructionInfo;
|
|
use App\Model\ConstructionProductInfo;
|
|
use App\Model\ConstructionProductInfo;
|
|
use App\Model\Customer;
|
|
use App\Model\Customer;
|
|
|
|
+use App\Model\Depart;
|
|
use App\Model\Employee;
|
|
use App\Model\Employee;
|
|
use App\Model\SalesOrder;
|
|
use App\Model\SalesOrder;
|
|
use App\Model\SalesOrderProductInfo;
|
|
use App\Model\SalesOrderProductInfo;
|
|
@@ -539,6 +540,10 @@ class ConstructionService extends Service
|
|
$storehouse = Storehouse::whereIn('id',array_unique(array_column($data['data'],'storehouse_id')))
|
|
$storehouse = Storehouse::whereIn('id',array_unique(array_column($data['data'],'storehouse_id')))
|
|
->pluck('title','id')
|
|
->pluck('title','id')
|
|
->toArray();
|
|
->toArray();
|
|
|
|
+
|
|
|
|
+ //分派的总社或分社
|
|
|
|
+ $dispatch = $this->getDispatchData($data['data']);
|
|
|
|
+
|
|
foreach ($data['data'] as $key => $value){
|
|
foreach ($data['data'] as $key => $value){
|
|
$address = '';
|
|
$address = '';
|
|
if(! empty($value['address1'])) {
|
|
if(! empty($value['address1'])) {
|
|
@@ -561,11 +566,36 @@ class ConstructionService extends Service
|
|
$data['data'][$key]['state_title'] = Construction::$name[$value['state']] ?? '';
|
|
$data['data'][$key]['state_title'] = Construction::$name[$value['state']] ?? '';
|
|
$data['data'][$key]['sales_order_number'] = $sales[$value['sales_order_id']] ?? '';
|
|
$data['data'][$key]['sales_order_number'] = $sales[$value['sales_order_id']] ?? '';
|
|
$data['data'][$key]['storehouse_title'] = $storehouse[$value['storehouse_id']] ?? '';
|
|
$data['data'][$key]['storehouse_title'] = $storehouse[$value['storehouse_id']] ?? '';
|
|
|
|
+ $data['data'][$key]['dispatch_company'] = $dispatch[$value['sales_order_id']] ?? '';
|
|
}
|
|
}
|
|
|
|
|
|
return $data;
|
|
return $data;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public function getDispatchData($data){
|
|
|
|
+ $search_id = [];
|
|
|
|
+ foreach ($data as $value){
|
|
|
|
+ $search_id[] = $value['sales_order_id'];
|
|
|
|
+ }
|
|
|
|
+ if(empty($search_id)) return [];
|
|
|
|
+
|
|
|
|
+ $see = SeeRange::where('del_time',0)
|
|
|
|
+ ->whereIn('data_id',$search_id)
|
|
|
|
+ ->where('data_type',SeeRange::type_seven)
|
|
|
|
+ ->where('type',SeeRange::data_three)
|
|
|
|
+ ->select('param_id')
|
|
|
|
+ ->get()->toArray();
|
|
|
|
+ $map = Depart::whereIn('id',array_unique(array_column($see,'param_id')))
|
|
|
|
+ ->pluck('title','id')
|
|
|
|
+ ->toArray();
|
|
|
|
+ $see_array = [];
|
|
|
|
+ foreach ($see as $value){
|
|
|
|
+ $see_array[$value['sales_order_id']] = $map[$value['sales_order_id']] ?? "";
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return $see_array;
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 获取施工单号
|
|
* 获取施工单号
|
|
* @param $data
|
|
* @param $data
|