cqpCow 8 ヶ月 前
コミット
f9742e9a58

+ 11 - 0
app/Http/Controllers/Api/JRFIDController.php

@@ -391,6 +391,17 @@ class JRFIDController extends BaseController
         }
     }
 
+    public function furnSendOrderDtCompList(Request $request){
+        list($bool, $data) = (new JRFIDServerService())->furnSendOrderDtCompList($request->all(),$request->common_param);
+
+        if($bool){
+            return $this->json_return(200,'',$data);
+        }else{
+            if($bool === 0) return $this->json_return(401,$data);
+            return $this->json_return(201,$data);
+        }
+    }
+
     public function getWorkshopData(Request $request){
         list($bool, $data) = (new JRFIDServerService())->getWorkshopData($request->all(),$request->common_param);
 

+ 70 - 0
app/Service/JRFIDServerService.php

@@ -1301,6 +1301,76 @@ class JRFIDServerService extends Service
         return [true, $result['data']];
     }
 
+    public function furnSendOrderDtCompList($data,$param){
+        if(empty($data['site'])) return [false, '站点不能为空'];
+        $header = array_merge($param['header'], ['site:'. $data['site']]);
+        $url = config("j_rfid.furnSendOrderDtCompList");
+
+        if(! empty($data['drawing_no']) || ! empty($data['contract_no']) || ! empty($data['region']) || ! empty($data['room_no']) || ! empty($data['assembly_name']) || ! empty($data['component'])) {
+            $rules = [];
+            if(! empty($data['drawing_no'])) {
+                $rules[] = [
+                    'field' => 'furn_send_assem_dt.drawing_no',
+                    'option' => 'IN',
+                    'values' => $data['drawing_no']
+                ];
+            }
+            if(! empty($data['contract_no'])) {
+                $rules[] = [
+                    'field' => 'furn_send_prod_dt.contact_no',
+                    'option' => 'IN',
+                    'values' => $data['contract_no']
+                ];
+            }
+            if(! empty($data['region'])) {
+                $rules[] = [
+                    'field' => 'furn_send_assem_dt.region',
+                    'option' => 'IN',
+                    'values' => $data['region']
+                ];
+            }
+            if(! empty($data['room'])) {
+                $rules[] = [
+                    'field' => 'furn_send_assem_dt.room_no',
+                    'option' => 'IN',
+                    'values' => $data['room']
+                ];
+            }
+            if(! empty($data['assembly_name'])) {
+                $rules[] = [
+                    'field' => 'furn_send_assem_dt.assembly_name',
+                    'option' => 'IN',
+                    'values' => $data['assembly_name']
+                ];
+            }
+            if(! empty($data['component'])) {
+                $rules[] = [
+                    'field' => 'component',
+                    'option' => 'IN',
+                    'values' => $data['component']
+                ];
+            }
+
+            $post['rules'] = $rules;
+        }
+
+        $post['size'] = $data['size'] ?? 10;
+        $post['number'] = ($data['number'] ?? 1) - 1;
+
+        list($status,$result) = $this->post_helper($url,$post,$header);
+        if(! $status) return [$status, $result];
+
+        if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
+        if(! empty($result['type']) && $result['type'] == 'errorVm') return [false, $result['message']];
+
+        if(! isset($result['content'])) {
+            $error = $result[0]['message'] ?? "操作失败,请刷新页面";
+            return [false, $error];
+        }
+
+        return [true, $result];
+    }
+
     public function post_helper($url, $data, $header = [], $timeout = 20){
         Log::channel('apiLog')->info('工装云POST', ["api" => $url , "param" => $data ,"header" => $header]);
 

+ 2 - 0
config/j_rfid.php

@@ -81,4 +81,6 @@ return [
     'getWorkshopData' => 'https://gzy.qingyaokeji.com/api/module-data/separate_order/separate_order/diy/get_workshop_data',
     //查询发货数据(合同号、发货单号、房号、图号、组件、部件)
     'screenGetSendData' => 'https://gzy.qingyaokeji.com/api/module-data/send_and_receipt/send_and_receipt/diy/screen_get_send_data',
+    //发货单详情部件列表
+    'furnSendOrderDtCompList' => 'https://gzy.qingyaokeji.com/api/module-data/furn_send_order_dt_comp_list/page ',
 ];

+ 2 - 0
routes/api.php

@@ -96,4 +96,6 @@ Route::group(['middleware'=> ['CheckJRFIDLogin']],function ($route){
     $route->any('getWorkshopData', 'Api\JRFIDController@getWorkshopData');
     //查询发货数据(合同号、发货单号、房号、图号、组件、部件)
     $route->any('screenGetSendData', 'Api\JRFIDController@screenGetSendData');
+    //发货单详情部件列表
+    $route->any('furnSendOrderDtCompList', 'Api\JRFIDController@furnSendOrderDtCompList');
 });