|
@@ -1039,6 +1039,9 @@ class SalesOrderService extends Service
|
|
|
|
|
|
//同步用友信息
|
|
|
$u8 = (new U8ServerService())->getMessage(array_column($data['data'], 'id'),U8Job::two);
|
|
|
+
|
|
|
+ //关联施工单号
|
|
|
+ $construction_array = $this->getConstruction(array_column($data['data'], 'id'));
|
|
|
foreach ($data['data'] as $key => $value){
|
|
|
$data['data'][$key]['plat_type_title'] = $basic_map[$value['plat_type']] ?? '';
|
|
|
$data['data'][$key]['sales_order_type_title'] = SalesOrder::$order_type[$value['sales_order_type']] ?? '';
|
|
@@ -1067,6 +1070,7 @@ class SalesOrderService extends Service
|
|
|
$data['data'][$key]['invoice_arr'] = implode(',', $tmp);
|
|
|
$data['data'][$key]['dispatch_company'] = $dispatch[$value['id']] ?? '';
|
|
|
$data['data'][$key]['u8_message'] = $u8[$value['id']] ?? '';
|
|
|
+ $data['data'][$key]['construction_no'] = $construction_array[$value['id']] ?? '';
|
|
|
|
|
|
//用于计算--------
|
|
|
//已收(审核后)
|
|
@@ -1450,6 +1454,26 @@ class SalesOrderService extends Service
|
|
|
return $state;
|
|
|
}
|
|
|
|
|
|
+ public function getConstruction($sale_order_id){
|
|
|
+ if(empty($sale_order_id)) return [];
|
|
|
+
|
|
|
+ $result = Construction::where('del_time',0)
|
|
|
+ ->whereIn('sales_order_id',$sale_order_id)
|
|
|
+ ->select('order_number','sales_order_id')
|
|
|
+ ->get()->toArray();
|
|
|
+ $return = [];
|
|
|
+
|
|
|
+ foreach ($result as $value){
|
|
|
+ if(isset($return[$value['sales_order_id']])){
|
|
|
+ $return[$value['sales_order_id']] .= ',' . $value['order_number'];
|
|
|
+ }else{
|
|
|
+ $return[$value['sales_order_id']] = $value['order_number'];
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return $return;
|
|
|
+ }
|
|
|
+
|
|
|
public function batchConfirm($data,$user){
|
|
|
if(empty($data['order_number']) || ! is_array($data['order_number'])) return [false, '批量确认数据不正确'];
|
|
|
|