1

app/Service/CheckService.php

@@ -230,20 +230,28 @@ class CheckService extends Service
         if(empty($model)) return [false, '发货单不存在或已被删除'];
         if($model->state != InvoiceOrder::STATE_ONE) return [false, '请确认发货单状态，操作失败'];
 
-        InvoiceOrder::where('del_time',0)->where('order_number',$data['order_number'])
-            ->update(['state' => InvoiceOrder::STATE_TWO]);
-        $sale = SalesOrder::where('id',$model->sales_order_id)->first();
-        if($sale['sales_order_type'] == SalesOrder::Order_type_one){
-            //安装件更新发货状态
-            SalesOrder::where('id',$model->sales_order_id)
-                ->update(['invoice_state' => SalesOrder::invoice_one]);
+        if($data['type'] == self::TYPE_ONE){
+            //通过
+            $model->state = InvoiceOrder::STATE_TWO;
+            $model->save();
+
+            $sale = SalesOrder::where('id',$model->sales_order_id)->first();
+            if($sale['sales_order_type'] == SalesOrder::Order_type_one){
+                //安装件更新发货状态
+                SalesOrder::where('id',$model->sales_order_id)
+                    ->update(['invoice_state' => SalesOrder::invoice_one]);
+            }else{
+                //快递件更新 单据状态 发货状态
+                SalesOrder::where('id',$model->sales_order_id)
+                    ->update([
+                        'state' => SalesOrder::State2_one,
+                        'invoice_state' => SalesOrder::invoice_one
+                    ]);
+            }
         }else{
-            //快递件更新 单据状态 发货状态
-            SalesOrder::where('id',$model->sales_order_id)
-                ->update([
-                    'state' => SalesOrder::State2_one,
-                    'invoice_state' => SalesOrder::invoice_one
-                ]);
+            //驳回
+            $model->state = InvoiceOrder::STATE_ZERO;
+            $model->save();
         }
 
         return [true, $model->toArray()];
@@ -287,8 +295,14 @@ class CheckService extends Service
         if(empty($model)) return [false,'采购单不存在或已被删除'];
         if($model->state != PurchaseOrder::STATE_ONE) return [false,'请确认采购单状态，操作失败'];
 
-        //未入库
-        PurchaseOrder::where('order_number',$data['order_number'])->update(['state' => PurchaseOrder::STATE_TWO]);
+        if($data['type'] == self::TYPE_ONE){
+            $model->state = PurchaseOrder::STATE_TWO;
+            $model->save();
+        }else{
+            $model->state = PurchaseOrder::STATE_ZERO;
+            $model->save();
+        }
+
         return [true, $model->toArray()];
     }
 
@@ -299,9 +313,13 @@ class CheckService extends Service
         if(empty($model)) return [false, '采购订单不存在或已被删除'];
         if($model->state != PurchaseOrder::STATE_Three) return [false, '请确认采购订单状态，操作失败'];
 
-        // 已出库
-        PurchaseOrder::where('del_time',0)->where('order_number',$data['order_number'])
-            ->update(['state' => PurchaseOrder::STATE_Four]);
+        if($data['type'] == self::TYPE_ONE){
+            $model->state = PurchaseOrder::STATE_Four;
+            $model->save();
+        }else{
+            $model->state = PurchaseOrder::STATE_TWO;
+            $model->save();
+        }
 
         return [true, $model->toArray()];
     }
@@ -432,11 +450,16 @@ class CheckService extends Service
         if(empty($model)) return [false, '施工单不存在或已被删除'];
         if($model->state != Construction::STATE_ONE) return [false, '请确认施工单状态，操作失败'];
 
-        //已确认
-        Construction::where('del_time',0)->where('order_number',$data['order_number'])
-            ->update(['state' => Construction::STATE_TWO]);
-        //已下施工
-        SalesOrder::where('id',$model->sales_order_id)->update(['state' => SalesOrder::State_five]);
+        if($data['type'] == self::TYPE_ONE){
+            $model->state = Construction::STATE_TWO;
+            $model->save();
+
+            //已下施工
+            SalesOrder::where('id',$model->sales_order_id)->update(['state' => SalesOrder::State_five]);
+        }else{
+            $model->state = Construction::STATE_ZERO;
+            $model->save();
+        }
 
         return [true, $model->toArray()];
     }
@@ -479,13 +502,18 @@ class CheckService extends Service
         if(empty($model)) return [false, '退换货单不存在或已被删除'];
         if($model->state != ReturnExchangeOrder::State_one) return [false, '请确认退换货单状态，操作失败'];
 
-        ReturnExchangeOrder::where('del_time',0)->where('order_number',$data['order_number'])
-            ->update(['state' => ReturnExchangeOrder::State_two]);
+        if($data['type'] == self::TYPE_ONE){
+            $model->state = ReturnExchangeOrder::State_two;
+            $model->save();
 
-        if($model->data_type == ReturnExchangeOrder::Order_type){
-            SalesOrder::where('id', $model->data_id)->update([
-                'state' => SalesOrder::State_six
-            ]);
+            if($model->data_type == ReturnExchangeOrder::Order_type){
+                SalesOrder::where('id', $model->data_id)->update([
+                    'state' => SalesOrder::State_six
+                ]);
+            }
+        }else{
+            $model->state = ReturnExchangeOrder::State_zero;
+            $model->save();
         }
 
         return [true, $model->toArray()];
@@ -591,9 +619,13 @@ class CheckService extends Service
         if(empty($model)) return [false, '合同不存在或已被删除'];
         if($model->state != SalesOrder::State_one) return [false, '请确认合同状态，操作失败'];
 
-        //已确认
-        SalesOrder::where('del_time',0)->where('order_number',$data['order_number'])
-            ->update(['state' => SalesOrder::State_two]);
+        if($data['type'] == self::TYPE_ONE){
+            $model->state = SalesOrder::State_two;
+            $model->save();
+        }else{
+            $model->state = SalesOrder::State_zero;
+            $model->save();
+        }
 
         return [true, $model->toArray()];
     }
@@ -1209,26 +1241,28 @@ class CheckService extends Service
                 }
                 $order = $msg;
 
-                if($record) {
-                    //流水
-                    $bool = $this->$record($data, $order);
-                    if(! $bool) {
-                        DB::rollBack();
-                        return [false, $msg];
+                if($data['type'] == self::TYPE_ONE){
+                    if($record) {
+                        //流水
+                        $bool = $this->$record($data, $order);
+                        if(! $bool) {
+                            DB::rollBack();
+                            return [false, $msg];
+                        }
+                        //库存
+                        $bool = $this->changeInventory($data, $order);
+                        if(! $bool) {
+                            DB::rollBack();
+                            return [false, $msg];
+                        }
                     }
-                    //库存
-                    $bool = $this->changeInventory($data, $order);
-                    if(! $bool) {
-                        DB::rollBack();
-                        return [false, $msg];
-                    }
-                }
 
-                if($create) {
-                    $bool = $this->$create($order);
-                    if(! $bool) {
-                        DB::rollBack();
-                        return [false, $msg];
+                    if($create) {
+                        $bool = $this->$create($order);
+                        if(! $bool) {
+                            DB::rollBack();
+                            return [false, $msg];
+                        }
                     }
                 }