cqpCow 1 år sedan
förälder
incheckning
27276e9ebe

+ 29 - 1
app/Http/Middleware/YongYou.php

@@ -1,14 +1,19 @@
 <?php
 namespace App\Http\Middleware;
 
+use App\Model\ErrorTable;
 use App\Service\FinishedOrderService;
 use Closure;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Symfony\Component\HttpFoundation\Response;
 
 class YongYou
 {
+    const type_one = 1; //包装 =》 产成品入库
+    const type_two = 2; //发货 =》 发货出库
+
     /**
      * Handle an incoming request.
      *
@@ -31,6 +36,7 @@ class YongYou
      */
     public function terminate(Request $request, Response $response)
     {
+        $time = time();
         $userData = $request->userData->toArray();
         $return = json_decode($response->content(),true);
 
@@ -39,9 +45,31 @@ class YongYou
                 $package_data = $return['data']['package_data'];
                 if(! empty($package_data)) {
                     $service = new FinishedOrderService();
-                    $service->U8Rdrecord10Save($package_data,$userData);
+                    list($status,$msg) = $service->U8Rdrecord10Save($package_data,$userData);
+                    if(! $status) $this->recordErrorTable($msg,$userData,$package_data,$time,self::type_one);
+                }
+            }
+
+            if(! empty($return['data']['send_data'])){
+                $package_data = $return['data']['send_data'];
+                if(! empty($package_data)) {
+                    $service = new FinishedOrderService();
+                    list($status,$msg) = $service->U8Rdrecord32Save($package_data,$userData);
+                    if(! $status) $this->recordErrorTable($msg,$userData,$package_data,$time,self::type_one);
                 }
             }
         }
     }
+
+    private function recordErrorTable($msg,$user,$data,$time,$type){
+        // 连接到指定数据库连接
+        ErrorTable::insert([
+            'msg' => $msg,
+            'data' => json_encode($data),
+            'user_id' => $user['id'],
+            'user_operation_time' => $time,
+            'type' => $type,
+            'order_no' => $data['order_no'] ?? ""
+        ]);
+    }
 }

+ 1 - 0
app/Service/Box/BoxService.php

@@ -159,6 +159,7 @@ class BoxService extends Service
             $ext_1 = "";
             if(empty($ext_1) && isset($sale_product_list[0]['customer_name'])) $ext_1 = $sale_product_list[0]['customer_name'];
             if(empty($ext_1) && isset($product_list[0]['customer_name'])) $ext_1 = $product_list[0]['customer_name'];
+            $insert['ext_1'] = $ext_1;
 
             $insert['detail'] = $box_insert;
             $insert['top_order_no'] = $top_order_no;

+ 23 - 2
app/Service/FinishedOrderService.php

@@ -169,14 +169,35 @@ class FinishedOrderService extends Service
                 ->select('id','top_id','num','ext_1','ext_2','ext_3','ext_4','ext_5','out_order_no','box_type','price')
                 ->get()->toArray();
 
-
             //用友数据插入------------
-            if(! empty($insert_sql_server)){
+            if(! empty($boxDetail)){
                 $sqlServerModel = new FyySqlServerService($user);
                 if($sqlServerModel->error) return [false, $sqlServerModel->error];
                 list($status,$msg) = $sqlServerModel->U8Rdrecord10Save($box,$boxDetail);
                 if(! $status) return [false, $msg];
             }
+            //用友数据插入------------
+
+        }catch (\Exception $e){
+            return [false,$e->getMessage() . '|' . $e->getFile() . '|' . $e->getLine()];
+        }
+
+        return [true,''];
+    }
+
+    //销售发货出库 toDO
+    public function U8Rdrecord32Save($send_data, $user){
+        if(empty($send_data)) return [true, ''];
+
+        try{
+            //用友数据插入------------
+            if(! empty($boxDetail)){
+                $sqlServerModel = new FyySqlServerService($user);
+                if($sqlServerModel->error) return [false, $sqlServerModel->error];
+                list($status,$msg) = $sqlServerModel->U8Rdrecord32Save($send_data,$boxDetail);
+                if(! $status) return [false, $msg];
+            }
+            //用友数据插入------------
 
         }catch (\Exception $e){
             return [false,$e->getMessage() . '|' . $e->getFile() . '|' . $e->getLine()];

+ 1 - 1
app/Service/FyySqlServerService.php

@@ -317,7 +317,7 @@ class FyySqlServerService extends Service
 
         Log::channel('apiLog')->info('产成品入库:源数据', ["param" => $post]);
 
-        $return = $this->post_helper($this->url, json_encode($post), ['Content-Type:application/json']);
+        $return = $this->post_helper($this->url, json_encode($post), ['Content-Type:application/json'],20);
 
         Log::channel('apiLog')->info('产成品入库:返回结果', ["param" => $return]);