cqpCow 1 жил өмнө
parent
commit
28a5dfc104

+ 0 - 3
app/Service/FyyOrderService.php

@@ -442,9 +442,6 @@ class FyyOrderService extends Service
 
         $sqlServerModel = new FyySqlServerService($user);
         if($sqlServerModel->error) return [false,$sqlServerModel->error];
-        //映射ip是否通畅
-        $bool = $this->isDomainAvailable($sqlServerModel->host);
-        if(! $bool) return [false, "U8程序外部域名不可达,请重新操作"];
         $result = $sqlServerModel->getDataFromDispatchListPage($data);
 
         return [true,$result];

+ 13 - 6
app/Service/FyySqlServerService.php

@@ -29,14 +29,21 @@ class FyySqlServerService extends Service
         try {
             //用户信息校验
             if (empty($user_id['id'])) {
-                $this->error = '福羊羊数据库连接用户参数不能为空!';
+                $this->error = '恒诚塑业数据库连接用户参数不能为空!';
                 return;
             }
 
             //获取用友账号密码
             $emp = Employee::where('id', $user_id['id'])->select('sqlserver_account', 'sqlserver_password')->first();
             if (empty($emp) || empty($emp->sqlserver_account)) {
-                $this->error = '福羊羊连接构造失败,未找到账号对应的用友账号信息';
+                $this->error = '恒诚塑业连接构造失败,未找到账号对应的用友账号信息';
+                return;
+            }
+
+            //映射ip是否通畅
+            $bool = $this->isDomainAvailable($this->host);
+            if(! $bool) {
+                $this->error = $this->host . "连接不可达,请稍后重新操作!";
                 return;
             }
 
@@ -255,9 +262,9 @@ class FyySqlServerService extends Service
         if (!empty($this->error)) return [false, $this->error];
 
         if ($bredvouch) {
-            $cmemo = '来源:福羊羊完工操作撤回';
+            $cmemo = '来源:恒诚塑业完工操作撤回';
         } else {
-            $cmemo = '来源:福羊羊完工操作 派工单号:' . $data['dispatch_no'];
+            $cmemo = '来源:恒诚塑业完工操作 派工单号:' . $data['dispatch_no'];
         }
 
         //数据
@@ -319,9 +326,9 @@ class FyySqlServerService extends Service
         if (!empty($this->error)) return [false, $this->error];
 
         if ($bredvouch) {
-            $cmemo = '来源:福羊羊';
+            $cmemo = '来源:恒诚塑业';
         } else {
-            $cmemo = '来源:福羊羊发货出库操作';
+            $cmemo = '来源:恒诚塑业发货出库操作';
         }
 
         $new = [];