Merge remote-tracking branch 'origin/master'

app/Http/Controllers/Api/StatisticController.php

@@ -51,4 +51,19 @@ class StatisticController extends BaseController
 
 
 
+    public function itemDeviceMonthStatistic(Request $request)
+    {
+        $service = new StatisticService();
+        $user = $request->userData;
+        list($status,$data) = $service->itemDeviceMonthStatistic($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+
+
 }

app/Service/AuxiliaryAccountService.php

@@ -13,6 +13,7 @@ use App\Model\Fee;
 use App\Model\Item;
 use App\Model\ItemDetails;
 use App\Model\MonthlyDdOrder;
+use App\Model\MonthlyDdOrderDetails;
 use App\Model\MonthlyPsOrder;
 use App\Model\MonthlyPsOrderDetails;
 use App\Model\MonthlyPwOrderDetails;
@@ -34,7 +35,7 @@ class AuxiliaryAccountService extends Service
     private function setCommon($data,$user, $field = []){
         if(empty($field)) $field = AuxiliaryAccount::$field;
         $data['top_depart_id'] = $user['top_depart_id'];
-        $model = ExpenseClaims::Clear($user,$data);
+        $model = AuxiliaryAccount::Clear($user,$data);
         $model = $model->where('del_time',0)
             ->select($field)
             ->orderby('month', 'desc');
@@ -114,7 +115,7 @@ class AuxiliaryAccountService extends Service
         }else{
             $month_ps_order_id = $month_ps_order_id->id;
         }
-        $model = MonthlyPsOrderDetails::Clear($user,$data);
+        $model = MonthlyDdOrderDetails::Clear($user,$data);
         //总金额
         $total_amount = $model->where('main_id',$month_ps_order_id)->sum("depreciation_amount");
         return [true,[
@@ -126,16 +127,16 @@ class AuxiliaryAccountService extends Service
         $month_ps_order = ExpenseClaims::Clear($user,$data);
         $month_ps_order_id = $month_ps_order->where('del_time',0)->where("month",$monthStart)->first();
         if(empty($month_ps_order_id)){
-            return [false,"请补充对应月份设备月度折旧信息"];
+            return [false,"请补充对应月份费用信息"];
         }else{
             $month_ps_order_id = $month_ps_order_id->id;
         }
-        $model = MonthlyPsOrderDetails::Clear($user,$data);
+        $model = new ExpenseClaimsDetails();
         //总金额
         $list = $model->where('expense_claims_id',$month_ps_order_id)->select("fee_id","amount","remark","entrust_type")->get()->toArray();
         ///分组
         $fee_type_list = Fee::Clear($user,$data)->where('del_time',0)->select("title","id","parent_id")->get()->toArray();
-        return $this->groupListByRoot($list,$fee_type_list);
+        return [true,$this->groupListByRoot($list,$fee_type_list)];
 
     }
 
@@ -198,14 +199,13 @@ class AuxiliaryAccountService extends Service
             $model->code = $this->generateBillNo([
                 'top_depart_id' => $user['top_depart_id'],
                 'type' => ExpenseClaims::Order_type,
-                'month' => date("Ym", strtotime($data['month']))
+                'period' => date("Ym", strtotime($data['month']))
             ]);
             $model->month = $data['order_time'] ?? 0;
-            $model->type = $data['type'];
             $model->crt_id = $user['id'];
-            $model->top_depart_id = $data['top_depart_id'];
+            $model->top_depart_id = $user['top_depart_id'];
             $model->save();
-
+            $data['top_depart_id'] = $user['top_depart_id'];
             $this->saveDetail($model->id, time(), $data);
 
             DB::commit();
@@ -235,7 +235,7 @@ class AuxiliaryAccountService extends Service
                     'entrust2_amount' => $value['entrust2_amount']??0,
                     'aggregation_amount' => $value['aggregation_amount']??00,
                     'total_amount' => $value['total_amount'],
-                    'top_depart_id' => $value['top_depart_id'],
+                    'top_depart_id' => $data['top_depart_id'],
                     'crt_time' => $time,
                 ];
             }
@@ -249,7 +249,7 @@ class AuxiliaryAccountService extends Service
         $monthStart = strtotime($monthStr); // 2026-03-01 00:00:00
         // 获取该月最后一秒：下个月 1 号减去 1 秒
         $monthEnd = strtotime("$monthStr +1 month") - 1;
-        foreach ($data['detail'] as $index => $item) {
+        foreach ($data['details'] as $index => $item) {
             if (!isset($item['voucher_date'])) {
                 return [false, "第" . ($index + 1) . "凭证日期缺失"];
             }
@@ -269,9 +269,9 @@ class AuxiliaryAccountService extends Service
                 return [false, "第" . ($index + 1) . "凭证摘要缺失"];
             }
             // 将报销日期转换为时间戳
-            $claimTime = strtotime($item['claim_date']);
-            // 判断：claim_date 必须早于 month
-            // 如果 claim_date 是 2026-02-28，而 month 是 2026-03-01，则校验通过
+            $claimTime = strtotime($item['voucher_date']);
+            // 判断：voucher_date 必须早于 month
+            // 如果 voucher_date 是 2026-02-28，而 month 是 2026-03-01，则校验通过
             if ($claimTime < $monthStart || $claimTime > $monthEnd) {
                 return [false, "第" . ($index + 1) . "凭证日期必须早于当前结算月份（" . $data['month'] . "）"];
             }
@@ -293,6 +293,7 @@ class AuxiliaryAccountService extends Service
             AuxiliaryAccountDetails::where('del_time',0)
                 ->where('auxiliary_account_id', $model->id)
                 ->update(['del_time' => $time]);
+            $data['top_depart_id'] = $user['top_depart_id'];
             $this->saveDetail($model->id, $time, $data);
 
             DB::commit();
@@ -346,7 +347,7 @@ class AuxiliaryAccountService extends Service
 
     private function getDetail($id){
         $data = AuxiliaryAccountDetails::where('del_time',0)
-            ->where('expense_claims_id', $id)
+            ->where('auxiliary_account_id', $id)
             ->select('*')
             ->get()->toArray();
         return $data;

app/Service/ExpenseClaimsService.php

@@ -59,20 +59,19 @@ class ExpenseClaimsService extends Service
             $model->code = $this->generateBillNo([
                 'top_depart_id' => $user['top_depart_id'],
                 'type' => ExpenseClaims::Order_type,
-                'month' => $month
+                'period' => $month
             ]);
             $model->month =  $month;
-            $model->type = $data['type'];
             $model->crt_id = $user['id'];
-            $model->top_depart_id = $data['top_depart_id'];
+            $model->top_depart_id = $user['top_depart_id'];
             $model->save();
-
+            $data['top_depart_id'] = $user['top_depart_id'];
             $this->saveDetail($model->id, time(), $data);
 
             DB::commit();
         }catch (\Exception $exception){
             DB::rollBack();
-            return [false,$exception->getMessage()];
+            return [false,$exception->getLine()."_".$exception->getMessage()];
         }
 
         return [true, ''];
@@ -92,7 +91,7 @@ class ExpenseClaimsService extends Service
                     'entrust_type' => $value['entrust_type'],
                     'expense_type' => $value['expense_type'],
                     'expense_attachments' => $value['expense_attachments'],
-                    'top_depart_id' => $value['top_depart_id'],
+                    'top_depart_id' => $data['top_depart_id'],
                     'crt_time' => $time,
                 ];
             }
@@ -106,7 +105,7 @@ class ExpenseClaimsService extends Service
         $monthStart = strtotime($monthStr); // 2026-03-01 00:00:00
         // 获取该月最后一秒：下个月 1 号减去 1 秒
         $monthEnd = strtotime("$monthStr +1 month") - 1;
-        foreach ($data['detail'] as $index => $item) {
+        foreach ($data['details'] as $index => $item) {
             if (!isset($item['claim_date'])) {
                 return [false, "第" . ($index + 1) . "项报销日期缺失"];
             }
@@ -130,7 +129,6 @@ class ExpenseClaimsService extends Service
             $month = strtotime(date("Ymd", strtotime($data['month'])));
             $model = ExpenseClaims::where('id',$data['id'])->first();
             $model->month =  $month;
-            $model->type = $data['type'];
             $model->crt_id = $user['id'];
             $model->save();
 
@@ -138,6 +136,7 @@ class ExpenseClaimsService extends Service
             ExpenseClaimsDetails::where('del_time',0)
                 ->where('expense_claims_id', $model->id)
                 ->update(['del_time' => $time]);
+            $data['top_depart_id'] = $user['top_depart_id'];
             $this->saveDetail($model->id, $time, $data);
 
             DB::commit();

app/Service/StatisticService.php

@@ -14,6 +14,7 @@ use App\Model\Fee;
 use App\Model\Item;
 use App\Model\ItemDetails;
 use App\Model\MonthlyDdOrder;
+use App\Model\MonthlyDdOrderDetails;
 use App\Model\MonthlyPsOrder;
 use App\Model\MonthlyPsOrderDetails;
 use App\Model\MonthlyPwOrderDetails;
@@ -241,7 +242,7 @@ class StatisticService extends Service
         $employee = Employee::Clear($user, $data);
         $employee_key_list = $employee->wherein('id', $employee_ids)->pluck("title", "id")->toArray();
 
-        $item_month_list = collect($item_month_list)->transform(function ($item) use ($item_title_key_list, $item_code_key_list) {
+        $item_month_list = collect($item_month_list)->transform(function ($item) use ($item_title_key_list, $item_code_key_list,$employee_key_list) {
             $item['item_title'] = $item_key_list[$item_title_key_list['item_id']] ?? "未知项目({$item['item_id']})";
             $item['item_code'] = $item_code_key_list[$item['item_id']] ?? "未知项目({$item['item_id']})";
             $item['employee_title'] = $employee_key_list[$item['employee_id']] ?? "未知人员({$item['employee_id']})";
@@ -249,6 +250,109 @@ class StatisticService extends Service
         })->all();
         return [true,$item_month_list];
     }
+    public function itemDeviceMonthStatistic($data, $user)
+    {
+        //项目编码、项目名称、设备名称、项目工时、研发工时占比、设备原值、设备折旧额、本项目帐面归集的折旧额、确定的本项目折旧额、加计调整金额、当月工时、日期
+        list($status, $month_start, $month_end) = $this->commonRule($data);
+        if (!$status) return [false, $month_start];
+        //确认所有项目、设备、设备工时
+        $month_device = DailyPwOrderDetails::Clear($user, $data);
+        $month_device_list = $month_device->where("order_time", ">=", $month_start)->where("order_time", "<", $month_end)
+            ->where('del_time', 0)
+            ->select(
+                "item_id",
+                "device_id",
+                // 将时间戳转为 Y-m-d 格式并起别名
+                DB::raw("FROM_UNIXTIME(order_time, '%Y-%m') as order_month"),
+                // 聚合求和
+                DB::raw("SUM(total_work_min) as total_work")
+            )
+            ->groupBy("order_month", "item_id", "device_id")->toArray();
+        //查询所有人员工资
+        $monthly_dd_order_ids = MonthlyDdOrder::Clear($user, $data)->where('del_time', 0)->where("month", ">=", $month_start)->where("month", "<", $month_end)
+            ->pluck('id')->toArray();
+        $monthly_dd_order_key_list = MonthlyDdOrder::Clear($user, $data)->where('del_time', 0)->where("month", ">=", $month_start)->where("month", "<", $month_end)
+            ->pluck(DB::raw("FROM_UNIXTIME(month, '%Y-%m') as month"), 'id')->toArray();
+        $month_device_salary = MonthlyDdOrderDetails::wherein('main_id', $monthly_dd_order_ids)
+            ->select("device_id", "depreciation_amount", "main_id")
+            ->get()->toArray();
+        //查询所有项目人员的工时比例
+        //汇总每个人每个月工资
+        $depreciatio_map = [];
+        foreach ($month_device_salary as $val) {
+            $month = $monthly_dd_order_key_list[$val['main_id']] ?? '';
+            if ($month) {
+                $depreciatio_map[$val['device_id'] . '_' . $month] = $val['salary'];
+            }
+        }
+        // 2. 计算每个员工在每个月的全月总工时
+        $device_monthly_total_min = [];
+        foreach ($month_device_list as $row) {
+            $key = $row['device_id'] . '_' . $row['order_month'];
+            if (!isset($device_monthly_total_min[$key])) {
+                $device_monthly_total_min[$key] = 0;
+            }
+            $device_monthly_total_min[$key] += $row['total_work'];
+        }
+
+        // 3. 计算分摊天数与工资
+        $item_month_list = [];
+        foreach ($month_device_list as $item) {
+            $key = $item['device_id'] . '_' . $item['order_month'];
+            $device_key = $item['order_month'] . '_' . $item['item_id'] . '_' . $item['device_id'];
+            $total_depreciatio = $depreciatio_map[$key] ?? 0;
+            $total_min = $device_monthly_total_min[$key] ?? 0;
+            if(!isset($item_month_list[$device_key])){
+                $item_month_list[$device_key] = [
+                    "month" => $item['order_month'],
+                    "allocated_depreciatio" => 0,
+                    "work_minutes" => 0,
+                    "total_min" => $total_min,
+                    "total_depreciatio" => $total_depreciatio,
+                ];
+            }
+
+
+
+            // B. 计算工资分摊：(项目工时 / 月总工时) * 月工资
+            if ($total_min > 0) {
+                $ratio = round($item['total_work'] / $total_min,3);
+                $allocated_salary = round($ratio * $total_depreciatio, 2);
+            } else {
+                $ratio = 0;
+                $allocated_salary = 0;
+            }
+            $item_month_list[$device_key]['allocated_depreciatio'] += $allocated_salary;
+            $item_month_list[$device_key]['work_minutes'] += $total_min;
+            $item_month_list[$device_key]['ratio'] = $ratio;
+        }
+
+        foreach ($item_month_list as $k=>$v){
+            $item_month_list[$k]['total_hours'] =  round($v['total_min']/60,1);
+            $item_month_list[$k]['hours'] =  round($v['work_minutes']/60,1);
+            unset($item_month_list[$k]['work_minutes']);
+        }
+        $item_month_list = collect($item_month_list)->sortBy('month')->values()->all();
+        $items = collect($item_month_list)->pluck('item_id')->unique()->values()->all();
+        $item = Item::Clear($user, $data);
+        $item_title_key_list = $item->wherein('id', $items)->pluck("title", "id")->toArray();
+        $item_code_key_list = $item->wherein('id', $items)->pluck("code", "id")->toArray();
+
+        $device_ids =  collect($item_month_list)->pluck('device_id')->unique()->values()->all();
+
+        $device = Device::Clear($user, $data);
+        $device_key_list = $device->wherein('id', $device_ids)->pluck("title", "id")->toArray();
+        $device_original_value_key_list = $device->wherein('id', $device_ids)->pluck("original_value", "id")->toArray();
+
+        $item_month_list = collect($item_month_list)->transform(function ($item) use ($item_title_key_list, $item_code_key_list,$device_key_list,$device_original_value_key_list) {
+            $item['item_title'] = $item_key_list[$item_title_key_list['item_id']] ?? "未知项目({$item['item_id']})";
+            $item['item_code'] = $item_code_key_list[$item['item_id']] ?? "未知项目({$item['item_id']})";
+            $item['device_title'] = $device_key_list[$item['device_id']] ?? "未知人员({$item['device_id']})";
+            $item['device_original'] = $device_original_value_key_list[$item['device_id']] ?? "未知人员({$item['device_id']})";
+            return $item;
+        })->all();
+        return [true,$item_month_list];
+    }
 
     private function commonRule($data)
     {

routes/api.php

@@ -187,8 +187,10 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('employeeDayHourStatistic', 'Api\StatisticsController@employeeDayHourStatistic');
     ///人员工资统计表（月维度）
     $route->any('employeeMonthSalaryStatistic', 'Api\StatisticsController@employeeMonthSalaryStatistic');
-    ///项目工资分摊统计表（日期）
+    ///项目工资分摊统计表（月）
     $route->any('itemDaySalaryStatistic', 'Api\StatisticsController@itemDaySalaryStatistic');
+    ///项目设备折旧费用统计表（月）
+    $route->any('itemDeviceMonthStatistic', 'Api\StatisticsController@itemDeviceMonthStatistic');