提交

app/Service/InventoryService.php

@@ -187,10 +187,22 @@ class InventoryService extends Service
     public function fillListData($data){
         if(empty($data['data'])) return $data;
 
+        $asset = InventoryOrderAsset::where('del_time',0)
+            ->whereIn('order_no',array_column($data['data'],'order_no'))
+            ->select('order_no','state')
+            ->get()->toArray();
+        $map = [];
+        foreach ($asset as $value){
+            if(! isset($map[$value['order_no']]) && $value['state'] > InventoryOrderAsset::STATE_ZERO)  $map[$value['order_no']] = 1;
+        }
+
         $emp_map = Employee::whereIn('id',array_column($data['data'],'crt_id'))->pluck('emp_name','id')->toArray();
 
         date_default_timezone_set('PRC');
         foreach ($data['data'] as $key => $value){
+            $is_edit = 1;
+            if(isset($map[$value['order_no']])) $is_edit = 0;
+            $data['data'][$key]['is_edit'] = $is_edit;
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date("Y-m-d",$value['crt_time']) : '';
             $data['data'][$key]['crt_name'] = $emp_map[$value['crt_id']] ?? '';
             if($value['inventory_time']) {
@@ -198,6 +210,7 @@ class InventoryService extends Service
                 $value['inventory_time'] = $return[0] . ' ' . $return[1];
             }
             $data['data'][$key]['inventory_time'] = $value['inventory_time'];
+            $data['data'][$key]['state_name'] = InventoryOrder::$name[$value['state']] ?? "";
         }
 
         return $data;
@@ -288,14 +301,20 @@ class InventoryService extends Service
     }
 
     public function updateAssetStateRule($data){
+        if(empty($data['order_no'])) return [false,'盘点单号不能为空'];
         if(empty($data['data'])) return [false,'盘点单资产数据不能为空'];
 
-        $id = array_column($data['data'],'id');
-        $bool = InventoryOrderAsset::whereIn('id',$id)
-            ->where('del_time',0)
-            ->where('state','>',InventoryOrderAsset::STATE_ZERO)
+        $bool = InventoryOrder::where('order_no',$data['order_no'])
+            ->where('state','>',InventoryOrder::STATE_ZERO)
             ->exists();
-        if($bool) return [false,'请确认盘点数据资产的状态,盘点失败！'];
+        if($bool) return [false,'请确认盘点单状态,盘点失败！'];
+
+//        $id = array_column($data['data'],'id');
+//        $bool = InventoryOrderAsset::whereIn('id',$id)
+//            ->where('del_time',0)
+//            ->where('state','>',InventoryOrderAsset::STATE_ZERO)
+//            ->exists();
+//        if($bool) return [false,'请确认盘点数据资产的状态,盘点失败！'];
 
         return [true,''];
     }