驳回

app/Model/Construction.php

@@ -24,12 +24,14 @@ class Construction extends UseScopeBaseModel
         self::Model_type_two => 'T9SH.',
     ];
 
+    const State_minus_one = -1;//驳回
     const STATE_ZERO = 0;//未审核
     const STATE_ONE = 1;//待审核
     const STATE_TWO = 2;//已审核
     const STATE_THREE = 3;//待确认
     const STATE_FOUR = 4;//已完结
     public static $name = [
+        self::State_minus_one => '驳回',
         self::STATE_ZERO => '未审核',
         self::STATE_ONE => '待审核',
         self::STATE_TWO => '施工中',

app/Model/PaymentReceipt.php

@@ -10,10 +10,12 @@ class PaymentReceipt extends UseScopeBaseModel
     const CREATED_AT = 'crt_time';
     const UPDATED_AT = 'upd_time';
     protected $dateFormat = 'U';
+    const State_minus_one = -1;//驳回
     const STATE_ZERO = 0;//未确认
     const STATE_ONE = 1;//待确认
     const STATE_TWO = 2;//已确认
     public static $name = [
+        self::State_minus_one => '驳回',
         self::STATE_ZERO => '未核销',
         self::STATE_ONE => '待核销',
         self::STATE_TWO => '已核销',

app/Model/PurchaseOrder.php

@@ -8,6 +8,7 @@ class PurchaseOrder extends UseScopeBaseModel
     const CREATED_AT = 'crt_time';
     const UPDATED_AT = 'upd_time';
     protected $dateFormat = 'U';
+    const State_minus_one = -1;//驳回
     const STATE_ZERO = 0;//未确认
     const STATE_ONE = 1;//待确认
     const STATE_TWO = 2;//未入库
@@ -15,6 +16,7 @@ class PurchaseOrder extends UseScopeBaseModel
     const STATE_Four = 4;//已入库
     const prefix = 'CG';
     public static $name = [
+        self::State_minus_one => '驳回',
         self::STATE_ZERO => '未确认',
         self::STATE_ONE => '待确认',
         self::STATE_TWO => '已审核',

app/Model/ReturnExchangeOrder.php

@@ -29,10 +29,12 @@ class ReturnExchangeOrder extends UseScopeBaseModel
         self::Model_type_three => '仅退款',
     ];
 
+    const State_minus_one = -1;//驳回
     const State_zero = 0;//未确认
     const State_one = 1;//待确认
     const State_two = 2;//已确认
     public static $state = [
+        self::State_minus_one => '驳回',
         self::State_zero => '未提交',
         self::State_one => '待审核',
         self::State_two => '已审核',

app/Service/CheckService.php

@@ -232,7 +232,7 @@ class CheckService extends Service
             ->where('del_time',0)
             ->first();
         if(empty($model)) return [false,'采购单不存在或已被删除'];
-        if($model->state != PurchaseOrder::STATE_ZERO) return [false,'请确认采购单状态，操作失败'];
+        if(! in_array($model->state, [PurchaseOrder::State_minus_one,PurchaseOrder::STATE_ZERO])) return [false, '请确认采购单状态，操作失败'];
 
         //待确认
         PurchaseOrder::where('id',$data['id'])->update(['state' => PurchaseOrder::STATE_ONE]);
@@ -258,7 +258,7 @@ class CheckService extends Service
             ->where('del_time',0)
             ->first();
         if(empty($model)) return [false, '施工单不存在或已被删除'];
-        if($model->state != Construction::STATE_ZERO) return [false, '请确认施工单状态，操作失败'];
+        if(! in_array($model->state, [Construction::State_minus_one,Construction::STATE_ZERO])) return [false, '请确认施工单状态，操作失败'];
 
         //待确认
         Construction::where('del_time',0)->where('id',$data['id'])
@@ -272,7 +272,7 @@ class CheckService extends Service
             ->where('del_time',0)
             ->first();
         if(empty($model)) return [false, '退换货单不存在或已被删除'];
-        if($model->state != ReturnExchangeOrder::State_zero) return [false, '请确认退换货单状态，操作失败'];
+        if(! in_array($model->state, [ReturnExchangeOrder::State_minus_one,ReturnExchangeOrder::State_zero])) return [false, '请确认退换货单状态，操作失败'];
 
         //待确认
         ReturnExchangeOrder::where('del_time',0)->where('id',$data['id'])
@@ -300,7 +300,7 @@ class CheckService extends Service
             ->where('del_time',0)
             ->first();
         if(empty($model)) return [false, '收付款单不存在或已被删除'];
-        if($model->state != PaymentReceipt::STATE_ZERO) return [false, '请确认收付款单状态，操作失败'];
+        if(! in_array($model->state, [PaymentReceipt::State_minus_one,PaymentReceipt::STATE_ZERO])) return [false, '请确认收付款单状态，操作失败'];
 
         PaymentReceipt::where('del_time',0)->where('id',$data['id'])
             ->update(['state' => PaymentReceipt::STATE_ONE]);