cqpCow 9 mesi fa
parent
commit
257b1e285a

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

@@ -226,6 +226,17 @@ class JRFIDController extends BaseController
         }
     }
 
+    public function screenReceipt(Request $request){
+        list($bool, $data) = (new JRFIDServerService())->screenReceipt($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 screenPackage(Request $request){
         list($bool, $data) = (new JRFIDServerService())->screenPackage($request->all(),$request->common_param);
 

+ 32 - 0
app/Service/JRFIDServerService.php

@@ -629,6 +629,38 @@ class JRFIDServerService extends Service
         return [true, ''];
     }
 
+    public function screenReceipt($data,$param){
+        if(empty($data['screenDataList'])) return [false, '发货数据不能为空'];
+        if(empty($data['site']) || empty($data['site_show'])) return [false, '站点信息不能为空'];
+        list($date,$utc_date) = $this->getE8AndUTC();
+        foreach ($data['screenDataList'] as $key => $value){
+            if(empty($value['id']) || ! isset($value['type'])) return [false, '发货数据不能为空'];
+            $data['screenDataList'][$key]['delivery_teams_group'] = $data['delivery_teams_group'];
+            $data['screenDataList'][$key]['delivery_teams_group_show'] = $data['delivery_teams_group_show'];
+            $data['screenDataList'][$key]['delivery_date'] = $utc_date;
+            $data['screenDataList'][$key]['delivery_date_lt'] = $date;
+            $data['screenDataList'][$key]['site'] = $data['site'];
+            $data['screenDataList'][$key]['site_show'] = $data['site_show'];
+        }
+
+        $url = config("j_rfid.screenReceipt");
+        $post = [
+            'screenDataList' => $data['screenDataList'],
+        ];
+
+        list($status,$result) = $this->post_helper($url,$post,$param['header']);
+        if(! $status) return [$status, $result];
+
+        if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
+
+        if(! isset($result['success'])) {
+            $error = $result[0]['message'] ?? "操作失败,请刷新页面";
+            return [false, $error];
+        }
+
+        return [true, ''];
+    }
+
     public function screenPackage($data,$param){
         if(empty($data['screenDataList'])) return [false, '包装数据不能为空'];
         if(empty($data['site']) || empty($data['site_show'])) return [false, '站点信息不能为空'];

+ 2 - 0
config/j_rfid.php

@@ -61,4 +61,6 @@ return [
     'screen_package_by_sep_assem' => 'https://gzy.qingyaokeji.com/api/module-data/package/package/diy/screen_package_by_sep_assem',
     //工位屏-根据芯片查询包装单组件数据
     'screenGetPackageAssemData' => 'https://gzy.qingyaokeji.com/api/module-data/furn_package_dt/furn_package_dt/diy/screen_get_package_assem_data',
+    //工位屏-保存收货单
+    'screenReceipt' => 'https://gzy.qingyaokeji.com/api/module-data/furn_receipt_order/furn_receipt_order/diy/screen_receipt',
 ];

+ 2 - 0
routes/api.php

@@ -62,6 +62,8 @@ Route::group(['middleware'=> ['CheckJRFIDLogin']],function ($route){
     $route->any('screenGetProFlow', 'Api\JRFIDController@screenGetProFlow');
     //收发货
     $route->any('screenSend', 'Api\JRFIDController@screenSend');
+    //工位屏-保存收货单
+    $route->any('screenReceipt', 'Api\JRFIDController@screenReceipt');
     //包装
     $route->any('screenPackage', 'Api\JRFIDController@screenPackage');
     //(根据合同号、图号、房间号查询包装单数据)