Merge branch 'master-new' into master-new-dev-wf

app/admin/controller/Reorder.php

@@ -31,7 +31,8 @@ class Reorder extends Base
         if(empty($order)){
             return error_show(1005,"未找到订单数据");
         }
-        $retrun =Db::name("sale_return")->where([["orderCode","=",$ordeCode],["is_del","=",0],["status","<",4]])->count();
+        $retrun =Db::name("sale_return")->where([["orderCode","=",$ordeCode],["is_del","=",0],["status", "in", [1,2,3,7,9,10]]])
+        ->count();
         if($retrun>0){
             return error_show(1005,"存在未完成退货订单数据");
         }
@@ -1402,7 +1403,7 @@ class Reorder extends Base
         if($order['wsend_num']!=$order['good_num']){
         	  return error_show(1005,"订单未发货数量与总数不等，无法全退");
         }
-        $retrun =Db::name("sale_return")->where([["orderCode","=",$orderCode],["is_del","=",0],["status","<",4]])->count();
+        $retrun =Db::name("sale_return")->where([["orderCode","=",$orderCode],["is_del","=",0],["status", "in", [1,2,3,7,9,10]]])->count();
         if($retrun>0){
             return error_show(1005,"存在退货订单数据");
         }

app/admin/controller/Sale.php

@@ -661,8 +661,8 @@ class Sale extends Base
         if (empty($etid)) {
             return error_show(1002, "未找到数据");
         }
-        $retrun =Db::name("sale_return")->where([["orderCode","=",$orderCode],["is_del","=",0],["status","<",4]])
-            ->count();
+        $retrun =Db::name("sale_return")->where([["orderCode","=",$orderCode],["is_del","=",0],["status","in",[1,2,3,
+        7,9,10]]])->count();
         if($retrun>0){
             return error_show(1005,"存在未完成退货订单数据");
         }
@@ -3847,8 +3847,8 @@ class Sale extends Base
         if ($orderCode == "") {
             return error_show(1002, "参数orderCoder不能为空");
         }
-        $retrun =Db::name("sale_return")->where([["orderCode","=",$orderCode],["is_del","=",0],["status","<",4]])
-            ->count();
+        $retrun =Db::name("sale_return")->where([["orderCode","=",$orderCode],["is_del","=",0],["status","in",[1,2,3,
+        7,9,10]]])->count();
         if($retrun>0){
             return error_show(1005,"存在未完成退货订单数据");
         }
@@ -4115,7 +4115,7 @@ class Sale extends Base
         if (empty($einfo)) {
             return error_show(1002, "未找到销售订单数据");
         }
-        $is_reurn = Db::name("sale_return")->where(['orderCode' => $outinfo['orderCode'], 'is_del' => 0])->where("status", "<", 4)->find();
+        $is_reurn = Db::name("sale_return")->where(['orderCode' => $outinfo['orderCode'], 'is_del' => 0])->where("status", "in", [1,2,3,7,9,10])->find();
         if ($is_reurn != false) {
             return error_show(1002, "销售单存在退货未处理完成");
         }

app/common.php

@@ -1434,7 +1434,7 @@ if(!function_exists("cgd_sale_return")){
 		$order =Db::name("order_num")->alias("a")
 		->leftJoin("sale_return b","a.orderCode=b.orderCode and b.is_del=0")
 		->where(["a.cgdNo"=>$cgdNo])
-		->whereIn("b.status",[1,2,3,7])
+		->whereIn("b.status",[1,2,3,7,9,10])
 		->findOrEmpty();
 		return !empty($order);
 	}