fyy

app/Service/FyyOrderService.php

@@ -26,8 +26,8 @@ class FyyOrderService extends Service
         if(! $status) return [false, $return];
 
         //数据校验
-        list($status,$msg) = $this->orderRule($return);
-        if(!$status) return [$status,$msg];
+//        list($status,$msg) = $this->orderRule($return);
+//        if(!$status) return [$status,$msg];
 
         try{
             DB::beginTransaction();

app/Service/FyySqlServerService.php

@@ -2,6 +2,7 @@
 
 namespace App\Service;
 
+use App\Model\Orders;
 use App\Model\SaleOrdersProduct;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\DB;
@@ -168,6 +169,8 @@ class FyySqlServerService extends Service
 
         $result = $model->get()->toArray();
         if(empty($result)) return [false,'暂无数据，更新结束！',''];
+        list($status,$msg) = $this->orderRule($result);
+        if(! $status) return [false,$msg,''];
 
         //查询附带的一些信息（比较少）
         $product_no = array_column($result,'product_no');
@@ -225,6 +228,16 @@ class FyySqlServerService extends Service
         return [true,$result,$messageTwo];
     }
 
+    public function orderRule($data){
+        $result = Orders::where('del_time',0)
+            ->whereIn('out_order_no',array_column($data,'out_order_no'))
+            ->select('out_order_no')
+            ->get()->toArray();
+        if(! empty($result))  return [false,'查询区间内销售订单号已存在'];
+
+        return [true,''];
+    }
+
     //获取数据（刷新现存量）
     public function getDataFromSqlServerForOnHand($data){
         if(! empty($this->error)) return [false,$this->error,''];