Merge remote-tracking branch 'origin/master'

app/Http/Controllers/Api/ConstructionController.php

@@ -125,7 +125,8 @@ class ConstructionController extends BaseController
     public function deliveryNoteDel(Request $request)
     {
         $service = new ConstructionService();
-        list($status,$data) = $service->deliveryNoteList($request->all());
+        $userData = $request->userData->toArray();
+        list($status,$data) = $service->deliveryNoteList($request->all(),$userData);
 
         if($status){
             return $this->json_return(200,'',$data);

app/Service/ConstructionService.php

@@ -812,6 +812,7 @@ class ConstructionService extends Service
         if(isset($data['id'])) {
             $model = DeliveryNote::where('id',$data['id'])->first();
             if($model->img3) return [false,'客户已签字，无法编辑！'];
+            if(DeliveryNote::where('del_time',0)->where('construction_order_number',$data['construction_order_number'])->where('id','<>',$data['id'])->first()) return [false,'施工单客户确认单已存在！'];
         }
 
         else {
@@ -857,4 +858,23 @@ class ConstructionService extends Service
         $list = $this->limit($list,'*',$data);
         return [true,$list];
     }
+
+    public function deliveryNoteDetail($data){
+        if(isset($data['id'])) $model = DeliveryNote::where('id',$data['id'])->where('del_time',0)->first();
+        if(isset($data['construction_order_number'])) $model = DeliveryNote::where('id',$data['construction_order_number'])->where('del_time',0)->first();
+        if(empty($model)) return [false,'数据不存在！'];
+        $detail = $model;
+
+        return [true,$detail];
+    }
+
+    public function deliveryNoteDel($data,$user){
+        DeliveryNote::where('img4',$data['id'])->update(
+            [
+                'del_time' => time(),
+                'upd_id' => $user['id'],
+            ]
+        );
+        return [true,'删除成功!'];
+    }
 }