小高薪

app/Http/Controllers/Api/DeviceWorkController.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Service\DeviceWorkService;
+use Illuminate\Http\Request;
+
+class DeviceWorkController extends BaseController
+{
+    public function monthlyDwOrderEdit(Request $request)
+    {
+        $service = new DeviceWorkService();
+        $user = $request->userData;
+        list($status,$data) = $service->monthlyDwOrderEdit($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function monthlyDwOrderAdd(Request $request)
+    {
+        $service = new DeviceWorkService();
+        $user = $request->userData;
+        list($status,$data) = $service->monthlyDwOrderAdd($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+
+    }
+
+    public function monthlyDwOrderDel(Request $request)
+    {
+        $service = new DeviceWorkService();
+        $user = $request->userData;
+        list($status,$data) = $service->monthlyDwOrderDel($request->all());
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+
+    }
+
+    public function monthlyDwOrderList(Request $request)
+    {
+        $service = new DeviceWorkService();
+        $user = $request->userData;
+        list($status,$data) = $service->monthlyDwOrderList($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function monthlyDwOrderDetail(Request $request)
+    {
+        $service = new DeviceWorkService();
+        $user = $request->userData;
+        list($status,$data) = $service->monthlyDwOrderDetail($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+}

app/Model/MonthlyDwOrder.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Model;
+
+class MonthlyDwOrder extends DataScopeBaseModel
+{
+    //设备月度工时单
+    protected $table = "monthly_dw_order"; //指定表
+    const CREATED_AT = 'crt_time';
+    const UPDATED_AT = 'upd_time';
+    protected $dateFormat = 'U';
+    const employee_column = "crt_id";
+
+    public static $field = ['id','code','crt_id','crt_time','month'];
+
+    const Order_type = "monthly_dw_order";
+}

app/Model/MonthlyDwOrderDetails.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Model;
+
+class MonthlyDwOrderDetails extends DataScopeBaseModel
+{
+    //人员月度工时单详细
+    protected $guarded = [];
+    protected $table = "monthly_dw_order_details"; //指定表
+    const CREATED_AT = 'crt_time';
+    const UPDATED_AT = 'upd_time';
+    protected $dateFormat = 'U';
+}

app/Model/MonthlyPwOrder.php

@@ -4,6 +4,7 @@ namespace App\Model;
 
 class MonthlyPwOrder extends DataScopeBaseModel
 {
+    //人员月度工时单
     protected $table = "monthly_pw_order"; //指定表
     const CREATED_AT = 'crt_time';
     const UPDATED_AT = 'upd_time';

app/Model/MonthlyPwOrderDetails.php

@@ -4,6 +4,7 @@ namespace App\Model;
 
 class MonthlyPwOrderDetails extends DataScopeBaseModel
 {
+    //人员月度工时单详细
     protected $guarded = [];
     protected $table = "monthly_pw_order_details"; //指定表
     const CREATED_AT = 'crt_time';

app/Service/DeviceWorkService.php

@@ -0,0 +1,311 @@
+<?php
+
+namespace App\Service;
+
+use App\Model\Device;
+use App\Model\Employee;
+use App\Model\MonthlyDwOrder;
+use App\Model\MonthlyDwOrderDetails;
+use Illuminate\Support\Facades\DB;
+
+class DeviceWorkService extends Service
+{
+    public function monthlyDwOrderEdit($data,$user){
+        list($status,$msg) = $this->monthlyDwOrderRule($data, $user, false);
+        if(!$status) return [$status,$msg];
+
+        try {
+            DB::beginTransaction();
+
+            $model = MonthlyDwOrder::where('id',$data['id'])->first();
+//            $model->month = $data['month'] ?? 0;
+//            $model->save();
+
+            $time = time();
+            MonthlyDwOrderDetails::where('del_time',0)
+                ->where('main_id', $model->id)
+                ->update(['del_time' => $time]);
+            $this->saveDetail($model->id, $time, $data);
+
+            DB::commit();
+        }catch (\Exception $exception){
+            DB::rollBack();
+            return [false,$exception->getMessage()];
+        }
+
+        return [true, ''];
+    }
+
+    public function monthlyDwOrderAdd($data,$user){
+        list($status,$msg) = $this->monthlyDwOrderRule($data, $user);
+        if(!$status) return [$status,$msg];
+
+        try {
+            DB::beginTransaction();
+
+            $model = new MonthlyDwOrder();
+            $model->code = $this->generateBillNo([
+                'top_depart_id' => $user['top_depart_id'],
+                'type' => MonthlyDwOrder::Order_type,
+                'period' => date("Ym", $data['month'])
+            ]);
+            $model->month = $data['month'] ?? 0;
+            $model->crt_id = $user['id'];
+            $model->top_depart_id = $data['top_depart_id'];
+            $model->save();
+
+            $this->saveDetail($model->id, time(), $data);
+
+            DB::commit();
+        }catch (\Exception $exception){
+            DB::rollBack();
+            return [false,$exception->getMessage()];
+        }
+
+        return [true, ''];
+    }
+
+    private function saveDetail($id, $time, $data){
+        if(! empty($data['details'])){
+            $unit = [];
+            foreach ($data['details'] as $value){
+                $unit[] = [
+                    'main_id' => $id,
+                    'device_id' => $value['device_id'],
+                    'total_days' => $value['total_days'],
+                    'rd_total_days' => $value['rd_total_days'],
+                    'total_hours' => $value['total_hours'],
+                    'rd_total_hours' => $value['rd_total_hours'],
+                    'start_time' => $value['start_time'],
+                    'end_time' => $value['end_time'],
+                    'crt_time' => $time,
+                    'top_depart_id' => $value['top_depart_id'],
+                ];
+            }
+            if(! empty($unit)) MonthlyDwOrderDetails::insert($unit);
+        }
+    }
+
+    private function getDetail($id){
+        $data = MonthlyDwOrderDetails::where('del_time',0)
+            ->where('main_id', $id)
+            ->select('device_id', 'total_days', 'rd_total_days', 'total_hours', 'rd_total_hours', 'start_time', 'end_time')
+            ->get()->toArray();
+
+        $id = array_column($data,'device_id');
+        $map = Device::whereIn('id', $id)->select('title','id','code')->get()->toArray();
+        $map = array_column($map,null,'id');
+
+        foreach ($data as $key => $value){
+            $tmp = $map[$value['device_id']] ?? [];
+            $merge = [];
+            $merge['device_title'] = $tmp['title'];
+            $merge['device_number'] = $tmp['number'];
+            $merge['start_time'] = date("Y-m-d", $value['start_time']);
+            $merge['end_time'] = date("Y-m-d", $value['end_time']);
+            $data[$key] = array_merge($value, $merge);
+        }
+
+        $detail = [
+            'details' => $data,
+        ];
+
+        foreach ($detail as $key => $value) {
+            if (empty($value)) {
+                $detail[$key] = (object)[]; // 转成 stdClass 对象
+            }
+        }
+
+        return $detail;
+    }
+
+    public function monthlyDwOrderDel($data){
+        if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
+
+        try {
+            DB::beginTransaction();
+            $time = time();
+
+            MonthlyDwOrder::where('del_time',0)
+                ->whereIn('id',$data['id'])
+                ->update(['del_time' => $time]);
+
+            MonthlyDwOrderDetails::where('del_time',0)
+                ->whereIn('main_id', $data['id'])
+                ->update(['del_time' => $time]);
+
+            DB::commit();
+        }catch (\Exception $exception){
+            DB::rollBack();
+            return [false,$exception->getMessage()];
+        }
+
+        return [true, ''];
+    }
+
+    public function monthlyDwOrderDetail($data, $user){
+        if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
+        $customer = MonthlyDwOrder::where('del_time',0)
+            ->where('id',$data['id'])
+            ->first();
+        if(empty($customer)) return [false,'项目不存在或已被删除'];
+        $customer = $customer->toArray();
+        $customer['crt_name'] = Employee::where('id',$customer['crt_id'])->value('title');
+        $customer['crt_time'] = $customer['crt_time'] ? date("Y-m-d H:i:s",$customer['crt_time']): '';
+        $customer['month'] = $customer['month'] ? date("Y-m",$customer['month']): '';
+
+        $details = $this->getDetail($data['id']);
+        $customer = array_merge($customer, $details);
+
+        return [true, $customer];
+    }
+
+    public function monthlyDwOrderCommon($data,$user, $field = []){
+        if(empty($field)) $field = MonthlyDwOrder::$field;
+
+        $model = MonthlyDwOrder::Clear($user,$data);
+        $model = $model->where('del_time',0)
+            ->select($field)
+            ->orderby('id', 'desc');
+
+        if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
+        if(! empty($data['id'])) $model->whereIn('id', $data['id']);
+        if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
+            $return = $this->changeDateToTimeStampAboutRange($data['crt_time']);
+            $model->where('crt_time','>=',$return[0]);
+            $model->where('crt_time','<=',$return[1]);
+        }
+
+        return $model;
+    }
+
+    public function monthlyDwOrderList($data,$user){
+        $model = $this->monthlyDwOrderCommon($data, $user);
+        $list = $this->limit($model,'',$data);
+        $list = $this->fillData($list);
+
+        return [true, $list];
+    }
+
+    public function monthlyDwOrderRule(&$data, $user, $is_add = true){
+        if(empty($data['month'])) return [false, '月份不能为空'];
+        $data['month'] = $this->changeDateToDate($data['month']);
+
+        $data['top_depart_id'] = $user['top_depart_id'];
+        if(empty($data['details'])) return [false, '设备月度工时单明细不能为空'];
+        foreach ($data['details'] as $key => $value){
+            if(empty($value['device_id'])) return [false, '设备不能为空'];
+            $res = $this->checkNumber($value['total_days'],0,'non-negative');
+            if(! $res['valid']) return [false,'出勤总天数：' . $res['error']];
+            $res = $this->checkNumber($value['rd_total_days'],0,'non-negative');
+            if(! $res['valid']) return [false,'研发出勤总天数：' . $res['error']];
+            $res = $this->checkNumber($value['total_hours'],2,'non-negative');
+            if(! $res['valid']) return [false,'出勤总工时：' . $res['error']];
+            $res = $this->checkNumber($value['rd_total_hours'],2,'non-negative');
+            if(! $res['valid']) return [false,'研发总工时：' . $res['error']];
+
+            if(empty($value['start_time'])) return [false, '开始时间不能为空'];
+            $data['details'][$key]['start_time'] = $this->changeDateToDate($value['start_time']);
+            if(empty($value['end_time'])) return [false, '结束时间不能为空'];
+            $data['details'][$key]['end_time'] = $this->changeDateToDate($value['end_time']);
+            $data['details'][$key]['top_depart_id'] = $data['top_depart_id'];
+        }
+        list($status, $msg) = $this->checkArrayRepeat($data['details'],'device_id','设备');
+        if(! $status) return [false, $msg];
+
+        if($is_add){
+            $bool = MonthlyDwOrder::where('code',$data['code'])
+                ->where('top_depart_id', $data['top_depart_id'])
+                ->where('del_time',0)
+                ->exists();
+        }else{
+            if(empty($data['id'])) return [false,'ID不能为空'];
+            $bool = MonthlyDwOrder::where('code',$data['code'])
+                ->where('top_depart_id', $data['top_depart_id'])
+                ->where('id','<>',$data['id'])
+                ->where('del_time',0)
+                ->exists();
+        }
+        if($bool) return [false, date("Y-m", $data['month']) . '已存在设备月度研发工时单'];
+
+        return [true, ''];
+    }
+
+    public function fillData($data){
+        if(empty($data['data'])) return $data;
+
+        $emp = (new EmployeeService())->getEmployeeMap(array_unique(array_column($data['data'],'crt_id')));
+        foreach ($data['data'] as $key => $value){
+            $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
+            $data['data'][$key]['month'] = $value['month'] ? date('Y-m',$value['month']) : '';
+            $data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
+        }
+
+        return $data;
+    }
+
+    public function fillDataForExport($data, $column, &$return)
+    {
+        if(empty($data)) return;
+
+        $mainIds = array_column($data, 'id');
+        // 获取详情映射 [main_id => [details...]]
+        $detailsMap = $this->getDetailsMap($mainIds);
+
+        // 默认空行模板
+        $defaultRow = array_fill_keys($column, '');
+
+        foreach ($data as $main) {
+            $mainId = $main['id'];
+            $details = $detailsMap[$mainId] ?? [];
+
+            // 提取主表信息
+            $mainInfo = [
+                'code'  => $main['code'],
+                'month' => $main['month'] ? date('Y-m', $main['month']) : '',
+            ];
+
+            if (empty($details)) {
+                // 如果没有详情，至少导出一行主表信息（可选）
+                $return[] = array_merge($defaultRow, $mainInfo);
+            } else {
+                // 核心：遍历详情，每一行详情都合并主表信息
+                foreach ($details as $sub) {
+                    // 合并主表字段 + 详情字段
+                    $fullRow = array_merge($mainInfo, $sub);
+                    // 过滤掉不在导出列里的字段，并补充缺失列
+                    $return[] = array_merge($defaultRow, array_intersect_key($fullRow, $defaultRow));
+                }
+            }
+        }
+    }
+
+    public function getDetailsMap($main_ids)
+    {
+        // 获取详情
+        $details = MonthlyDwOrderDetails::where('del_time', 0)
+            ->whereIn('main_id', $main_ids)
+            ->get();
+
+        // 获取人员信息
+        $empIds = $details->pluck('device_id')->unique();
+        $empMap = Device::whereIn('id', $empIds)->get()->keyBy('id');
+
+        $res = [];
+        foreach ($details as $item) {
+            $tmpEmp = $empMap[$item->device_id] ?? null;
+
+            // 组装每一行详情需要展示的字段
+            $res[$item->main_id][] = [
+                'device_number' => $tmpEmp ? $tmpEmp->number : '',
+                'total_days'     => $item->total_days,
+                'rd_total_days'  => $item->rd_total_days,
+                'total_hours'    => $item->total_hours,
+                'rd_total_hours' => $item->rd_total_hours,
+                'start_time'     => $item->start_time ? date("Y-m-d", $item->start_time) : '',
+                'end_time'       => $item->end_time ? date("Y-m-d", $item->end_time) : '',
+            ];
+        }
+        return $res; // 返回 [main_id => [detail_row, detail_row]]
+    }
+}

app/Service/ExportFileService.php

@@ -173,52 +173,21 @@ class ExportFileService extends Service
         return [true, $this->saveExportData($return,$header)];
     }
 
-    public function one($ergs, $user){
-        $service = new EmployeeService();
-        $model = $service->employeeCommon($ergs, $user);
-
-        // 导出数据
-        $return = [];
-
-        $header_default = $user['e_header_default'];
-        $column = array_column($header_default,'key');
-        $header = array_column($header_default,'value');
-        $model->chunk(500,function ($data) use(&$return,$column,$service){
-            $data = $data->toArray();
-            $list['data'] = $data;
-            $list = $service->organizationEmployeeData($list);
-
-            $this->fillData($list['data'], $column, $return);
-        });
-
-        return [true, $this->saveExportData($return,$header)];
-    }
-
-    public function four($ergs,$user){
+    public function monthDwOrder($ergs,$user){
         // 导出数据
         $return = [];
         $header_default = $user['e_header_default'];
-        $column = array_column($header_default,'key');
+        $column = array_column($header_default,'export');
         $header = array_column($header_default,'value');
 
-        $service = new RDService();
-        $model = $service->rdCommon($ergs, $user);
-
-        $model->chunk(500,function ($data) use(&$return, $column, $service){
-            $data = $data->toArray();
-            $list['data'] = $data;
-
-            //订单数据
-            $list = $service->fillData($list);
+        $service = new DeviceWorkService();
+        $model = $service->monthlyDwOrderCommon($ergs, $user);
 
-            $this->fillData($list['data'], $column, $return);
+        $model->chunk(500,function ($data) use(&$return, $service, $column){
+            // 直接处理这一批主表数据，将其与详情合并平铺
+            $service->fillDataForExport($data->toArray(), $column, $return);
         });
 
-        //合计
-        $total = $this->countTotal($return, $header_default);
-        //填充合计
-        $this->fillTotalData($total, $header_default, $return);
-
         return [true, $this->saveExportData($return,$header)];
     }
 

app/Service/ImportService.php

@@ -11,7 +11,6 @@ use App\Model\Item;
 use App\Model\ItemDetails;
 use App\Model\MonthlyPwOrder;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
 use Maatwebsite\Excel\Facades\Excel;
 use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions\F;
 use PhpOffice\PhpSpreadsheet\IOFactory;
@@ -24,6 +23,7 @@ class ImportService extends Service
         'item', // 项目
         'fee', // 费用
         'monthPwOrder', // 人员月度研发工时单
+        'monthDwOrder', // 设备月度研发工时单
     ];
 
     public function getTableTitleXls($data,$user){
@@ -99,6 +99,17 @@ class ImportService extends Service
         return [true, [$config_array, $filename]];
     }
 
+    private function monthDwOrder($data,$user){
+        $config = $this->getTableConfig($data['type']);
+        if(empty($config)) return [false, ['导入配置表头文件不存在','']];
+
+        $config_array = $config['array'] ?? [];
+        //生成下载文件
+        $filename =  $config['name'] . "导入模板_" . time() . '.' . 'xlsx';
+
+        return [true, [$config_array, $filename]];
+    }
+
     //导入入口
     public function importAll($data,$user){
 //        //不超时
@@ -977,6 +988,238 @@ class ImportService extends Service
         return [$error_string, $update_map, $dbEmps];
     }
 
+    // 设备月度工时单
+    public function monthDwOrderImport($array, $user, $other_param)
+    {
+        $upload = $array[0];
+        list($status, $msg) = $this->compareTableAndReturn($upload, $other_param);
+        if (!$status) return [false, $msg];
+        $table_config = $msg;
+
+        unset($array[0]);
+        if (empty($array)) return [false, '导入数据不能为空'];
+
+        list($array, $error) = $this->checkCommon($array, $table_config);
+        if (!empty($error)) return [0, $error];
+
+        // 2. 详细校验 (这里会返回 update_map 和 dbDevs 映射)
+        list($error, $update_map, $dbDevs) = $this->monthDwOrderCheck($array, $user, $table_config);
+        if (!empty($error)) return [0, $error];
+
+        $keys = array_column($table_config, 'key');
+        $codeIdx = array_search('code', $keys);
+        $monthIdx = array_search('month', $keys);
+        $empIdx = array_search('device_id', $keys);
+
+        // --- 步骤 1: 数据聚合分组 ---
+        // 将 Excel 数据按“单据”维度归类
+        $groups = [];
+        foreach ($array as $rowIndex => $row) {
+            $cCode = trim($row[$codeIdx] ?? '');
+            $cMonthTs = $row[$monthIdx]; // 校验阶段已转为时间戳
+
+            // 聚合 Key：有编码用编码，没编码用月份标记
+            $aggKey = $cCode ?: "MONTH_" . $cMonthTs;
+
+            if (!isset($groups[$aggKey])) {
+                $groups[$aggKey] = [
+                    'main_id'  => $update_map[$rowIndex] ?? 0, // 如果存在则是编辑
+                    'code'     => $cCode,
+                    'month'    => $cMonthTs,
+                    'details'  => []
+                ];
+            }
+
+            // 准备详情行数据
+            $detailTmp = [];
+            foreach ($table_config as $k => $conf) {
+                if (!$conf['is_main']) {
+                    $fieldKey = $conf['key'];
+                    $fieldVal = $row[$k];
+                    // 如果是人员，转换为 ID
+                    if ($fieldKey == 'device_id') {
+                        $fieldVal = $dbDevs[$fieldVal] ?? 0;
+                    }
+                    $detailTmp[$fieldKey] = $fieldVal;
+                }
+            }
+            $groups[$aggKey]['details'][] = $detailTmp;
+        }
+
+        // --- 步骤 2: 开启事务写入 ---
+        DB::beginTransaction();
+        try {
+            $time = time();
+            foreach ($groups as $aggKey => $group) {
+                $mainId = $group['main_id'];
+
+                if ($mainId > 0) {
+                    // 删除旧详情
+                    DB::table('monthly_dw_order_details')->where('del_time',0)
+                        ->where('main_id', $mainId)
+                        ->update(['del_time' => $time]);
+                } else {
+                    // B. 新增逻辑
+                    $newCode = $this->generateBillNo([
+                        'top_depart_id' => $user['top_depart_id'],
+                        'type'          => MonthlyPwOrder::Order_type,
+                        'period'        => date("Ym", $group['month'])
+                    ]);
+
+                    $mainId = DB::table('monthly_dw_order')->insertGetId([
+                        'code'          => $newCode,
+                        'month'         => $group['month'],
+                        'top_depart_id' => $user['top_depart_id'],
+                        'crt_id'        => $user['id'],
+                        'crt_time'      => $time,
+                        'upd_time'      => $time,
+                        'del_time'      => 0
+                    ]);
+                }
+
+                // C. 批量插入详情
+                $insertDetails = [];
+                foreach ($group['details'] as $detail) {
+                    $detail['main_id']      = $mainId;
+                    $detail['top_depart_id']= $user['top_depart_id'];
+                    $detail['crt_time']     = $time;
+                    $detail['del_time']     = 0;
+                    $insertDetails[] = $detail;
+                }
+
+                if (!empty($insertDetails)) {
+                    DB::table('monthly_dw_order_details')->insert($insertDetails);
+                }
+            }
+
+            DB::commit();
+        } catch (\Exception $e) {
+            DB::rollBack();
+            return [false, "失败：" . $e->getMessage() . " (行号:" . $e->getLine() . ")"];
+        }
+
+        return [true, ''];
+    }
+
+    private function monthDwOrderCheck(&$array, $user, $table_config)
+    {
+        $keys = array_column($table_config, 'key');
+        $codeIdx = array_search('code', $keys);
+        $monthIdx = array_search('month', $keys);
+        $devIdx = array_search('device_id', $keys);
+        $startIdx = array_search('start_time', $keys);
+        $endIdx = array_search('end_time', $keys);
+
+        // 1. 预加载基础数据
+        $allEmpNumbers = array_filter(array_unique(array_column($array, $devIdx)));
+        $dbDevs = Device::where('del_time', 0)
+            ->whereIn('code', $allEmpNumbers)
+            ->where('top_depart_id', $user['top_depart_id'])
+            ->pluck('id', 'code')->toArray();
+
+        $allCodes = array_filter(array_unique(array_column($array, $codeIdx)));
+        $dbOrders = DB::table('monthly_dw_order')
+            ->whereIn('code', $allCodes)
+            ->where('top_depart_id', $user['top_depart_id'])
+            ->get()->keyBy('code');
+
+        $existingMonths = DB::table('monthly_dw_order')
+            ->where('top_depart_id', $user['top_depart_id'])
+            ->pluck('month')
+            ->toArray();
+        $existingMonthsMap = array_fill_keys($existingMonths, true);
+
+        $excelAggregator = [];
+        $errors = [];
+        $update_map = [];
+
+        foreach ($array as $rowIndex => $row) {
+            // 用户看到的行号（假设数据从第2行开始）
+            $displayLine = $rowIndex + 1;
+
+            $valCode = trim($row[$codeIdx] ?? '');
+            $valMonthRaw = trim($row[$monthIdx] ?? '');
+            $valDev = trim($row[$devIdx] ?? '');
+            $valStartRaw = $row[$startIdx] ?? '';
+            $valEndRaw = $row[$endIdx] ?? '';
+
+            // --- A. 日期转换校验 ---
+            // 转换月份
+            list($mStatus, $valMonthTs) = $this->convertExcelCellToDate($valMonthRaw);
+            if (!$mStatus) {
+                $errors[] = "第{$displayLine}行：月份格式错误({$valMonthRaw})";
+                continue;
+            }
+            // 强制格式化为当月1号的时间戳，确保聚合逻辑一致
+            $valMonthTs = strtotime(date('Y-m-01', $valMonthTs));
+
+            // 转换开始日期
+            list($sStatus, $startTime) = $this->convertExcelCellToDate($valStartRaw);
+            if (!$sStatus) {
+                $errors[] = "第{$displayLine}行：开始日期格式错误";
+                continue;
+            }
+
+            // 转换结束日期
+            list($eStatus, $endTime) = $this->convertExcelCellToDate($valEndRaw);
+            if (!$eStatus) {
+                $errors[] = "第{$displayLine}行：结束日期格式错误";
+                continue;
+            }
+
+            $aggKey = $valCode ?: "NEW_ORDER_" . $valMonthTs;
+
+            // --- B. 校验单据与月份的一致性 ---
+            if ($valCode && isset($dbOrders[$valCode])) {
+                $dbOrder = $dbOrders[$valCode];
+                if ($dbOrder->month != $valMonthTs) {
+                    $errors[] = "第{$displayLine}行：单据编码[{$valCode}]对应月份为[" . date('Y-m', $dbOrder->month) . "]，与导入月份不符";
+                }
+                $update_map[$rowIndex] = $dbOrder->id;
+            }
+
+            // --- C. 校验设备存在性与单据内唯一性 ---
+            if (!isset($dbDevs[$valDev])) {
+                $errors[] = "第{$displayLine}行：设备的资产编码[{$valDev}]不存在";
+            } else {
+                if (isset($excelAggregator[$aggKey]['devs'][$valDev])) {
+                    $errors[] = "第{$displayLine}行：设备的资产编码[{$valDev}]在同一单据中重复";
+                }
+                $excelAggregator[$aggKey]['devs'][$valDev] = true;
+
+                if (isset($excelAggregator[$aggKey]['month_ts']) && $excelAggregator[$aggKey]['month_ts'] !== $valMonthTs) {
+                    $errors[] = "第{$displayLine}行：同组数据的月份不统一";
+                }
+                $excelAggregator[$aggKey]['month_ts'] = $valMonthTs;
+            }
+
+            // --- D. 逻辑校验：日期范围 ---
+            if ($startTime > $endTime) {
+                $errors[] = "第{$displayLine}行：开始日期大于结束日期";
+            } else {
+                $monthEndTs = strtotime("+1 month", $valMonthTs) - 1;
+                if ($startTime < $valMonthTs || $endTime > $monthEndTs) {
+                    $errors[] = "第{$displayLine}行：日期超出[ " . date('Y-m', $valMonthTs) . " ]范围";
+                }
+            }
+
+            // --- E. 月份唯一单据校验 (新增) ---
+            if (!$valCode) {
+                if (isset($existingMonthsMap[$valMonthTs])) {
+                    $errors[] = "第{$displayLine}行：月份[ " . date('Y-m', $valMonthTs) . " ]已存在单据，请填编码编辑";
+                }
+            }
+
+            // 将转换后的时间戳写回原数组，方便后续写入数据库时直接使用
+            $array[$rowIndex][$monthIdx] = $valMonthTs;
+            $array[$rowIndex][$startIdx] = $startTime;
+            $array[$rowIndex][$endIdx] = $endTime;
+        }
+
+        $error_string = !empty($errors) ? implode('|', $errors) : "";
+        return [$error_string, $update_map, $dbDevs];
+    }
+
     //公共校验 -----------------------------------------
     private function checkCommon($array, $table_config) {
         $error = [];

app/Service/PersonWorkService.php

@@ -230,18 +230,14 @@ class PersonWorkService extends Service
         return [true, ''];
     }
 
-    public function fillData($data, $is_export = false){
+    public function fillData($data){
         if(empty($data['data'])) return $data;
 
         $emp = (new EmployeeService())->getEmployeeMap(array_unique(array_column($data['data'],'crt_id')));
-        $map = [];
-        if($is_export) $map = $this->getDetailsMap(array_column($data['data'],'id'));
         foreach ($data['data'] as $key => $value){
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
             $data['data'][$key]['month'] = $value['month'] ? date('Y-m',$value['month']) : '';
             $data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
-            $tmp = $map[$value['id']] ?? [];
-            $data['data'][$key]['details'] = $tmp['man'] ?? "";
         }
 
         return $data;

config/excel/monthDwOrder.php

@@ -0,0 +1,105 @@
+<?php
+return [
+    "name" => "设备月度工时单",
+    "array" => [
+        [
+            'key' =>'code',
+            'export' =>'code',
+            'value' => '单据编码',
+            'required' => false,
+            'is_main' => true,
+            'default' => "",
+            'unique' => false,
+            'enums' => [],
+            'comments' => '（如果填写则是编辑）'
+        ],
+        [
+            'key' =>'month',
+            'export' =>'month',
+            'value' => '月份',
+            'required' => true,
+            'is_main' => true,
+            'default' => "",
+            'unique' => false,
+            'enums' => [],
+            'comments' => '必填（2026-02）'
+        ],
+        [
+            'key' =>'device_id',
+            'export' =>'device_number',
+            'value' => '设备',
+            'required' => true,
+            'is_main' => false,
+            'default' => "",
+            'unique' => false,
+            'enums' => [],
+            'comments' => '必填（填写设备的资产编码）'
+        ],
+        [
+            'key' =>'total_days',
+            'export' =>'total_days',
+            'value' => '出勤总天数',
+            'required' => true,
+            'is_main' => false,
+            'default' => 0,
+            'unique' => false,
+            'enums' => [],
+            'comments' => '必填'
+        ],
+        [
+            'key' =>'rd_total_days',
+            'export' =>'rd_total_days',
+            'value' => '研发出勤总天数',
+            'required' => true,
+            'is_main' => false,
+            'default' => 0,
+            'unique' => false,
+            'enums' => [],
+            'comments' => '必填'
+        ],
+        [
+            'key' =>'total_hours',
+            'export' =>'total_hours',
+            'value' => '出勤总工时',
+            'required' => true,
+            'is_main' => false,
+            'default' => 0,
+            'unique' => false,
+            'enums' => [],
+            'comments' => '必填'
+        ],
+        [
+            'key' =>'rd_total_hours',
+            'export' =>'rd_total_hours',
+            'value' => '研发总工时',
+            'required' => true,
+            'is_main' => false,
+            'default' => 0,
+            'unique' => false,
+            'enums' => [],
+            'comments' => '必填'
+        ],
+        [
+            'key' =>'start_time',
+            'export' =>'start_time',
+            'value' => '开始日期',
+            'required' => true,
+            'is_main' => false,
+            'default' => "",
+            'unique' => false,
+            'enums' => [],
+            'comments' => '必填'
+        ],
+        [
+            'key' =>'end_time',
+            'export' =>'end_time',
+            'value' => '结束日期',
+            'required' => true,
+            'is_main' => false,
+            'unique' => false,
+            'enums' => [],
+            'default' => "",
+            'comments' => ""
+        ],
+    ]
+];

routes/api.php

@@ -95,5 +95,12 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('monthlyPwOrderAdd', 'Api\PersonWorkController@monthlyPwOrderAdd');
     $route->any('monthlyPwOrderDel', 'Api\PersonWorkController@monthlyPwOrderDel');
     $route->any('monthlyPwOrderDetail', 'Api\PersonWorkController@monthlyPwOrderDetail');
+
+    //设备月度研发工时单
+    $route->any('monthlyDwOrderList', 'Api\PersonWorkController@monthlyDwOrderList');
+    $route->any('monthlyDwOrderEdit', 'Api\PersonWorkController@monthlyDwOrderEdit');
+    $route->any('monthlyDwOrderAdd', 'Api\PersonWorkController@monthlyDwOrderAdd');
+    $route->any('monthlyDwOrderDel', 'Api\PersonWorkController@monthlyDwOrderDel');
+    $route->any('monthlyDwOrderDetail', 'Api\PersonWorkController@monthlyDwOrderDetail');
 });