frist

application/api/controller/ReportingWork.php

@@ -725,6 +725,51 @@ class ReportingWork extends Api
 
     }
 
+    /**
+     * 清理工分报工操作日志（默认仅保留近180天）
+     * @ApiMethod (POST)
+     * @param int $days 保留天数，默认180
+     * @param int $batch 每批删除条数，默认1000
+     */
+    public function cleanReportingWorkLog()
+    {
+        if (!$this->request->isPost()) {
+            $this->error('请求方法错误');
+        }
+        $this->ensureReportingWorkLogTable();
+
+        $params = $this->request->post();
+        $days = max(1, intval($params['days'] ?? 180));
+        $batch = max(1, min(5000, intval($params['batch'] ?? 1000)));
+        $deadline = date('Y-m-d H:i:s', strtotime("-{$days} days"));
+
+        $totalDeleted = 0;
+        try {
+            while (true) {
+                $ids = Db::table('设备_工分报工操作日志')
+                    ->where('oper_time', '<', $deadline)
+                    ->order('id asc')
+                    ->limit($batch)
+                    ->column('id');
+                if (empty($ids)) {
+                    break;
+                }
+                $affected = Db::table('设备_工分报工操作日志')->where('id', 'in', $ids)->delete();
+                $totalDeleted += (int)$affected;
+            }
+        } catch (\think\exception\HttpResponseException $e) {
+            throw $e;
+        } catch (\Exception $e) {
+            $this->error('清理失败：' . $e->getMessage());
+        }
+
+        $this->success('清理成功', [
+            'days' => $days,
+            'deadline' => $deadline,
+            'deleted' => $totalDeleted,
+        ]);
+    }
+
         /**
      * 查询机台报工记录
      * @ApiMethod (GET)

application/api/controller/WorkOrderProcess.php

@@ -692,7 +692,7 @@ class WorkOrderProcess extends Api
             $workOrderParts[] = [
                 'work_order' => $params['workorder'],
                 'part_code' => $value['part_code'],
-                'part_name' => $value['part_name'],
+                'part_name' => trim((string)$value['part_name']),
                 'part_type' => '',
                 'remark' => '',
                 'status' => 1,
@@ -707,10 +707,10 @@ class WorkOrderProcess extends Api
             $workOrderProcesses[] = [
                 'work_order' => $params['workorder'],
                 'part_code' => $value['part_code'],
-                'part_name' => $value['part_name'],
+                'part_name' => trim((string)$value['part_name']),
                 'process_code' => $value['process_code'],
-                'process_name' => $value['process_name'],
-                'big_process' => $value['big_process'],
+                'process_name' => trim((string)$value['process_name']),
+                'big_process' => trim((string)$value['big_process']),
                 'standard_hour' => $value['standard_hour'],
                 'standard_score' => $value['standard_score'],
                 'coefficient' => $value['coefficient'],
@@ -944,8 +944,8 @@ class WorkOrderProcess extends Api
                 'part_code' => $partCode,
                 'part_name' => $name,
                 'process_code' => $seq,
-                'process_name' => $value['工序名称'],
-                'big_process' => $value['生产工序'],
+                'process_name' => isset($value['工序名称']) ? trim((string)$value['工序名称']) : '',
+                'big_process' => isset($value['生产工序']) ? trim((string)$value['生产工序']) : '',
                 'standard_hour' => $value['秒'],
                 'standard_minutes' => $value['分'],
                 'standard_score' => $value['定额分'],
@@ -1862,9 +1862,9 @@ class WorkOrderProcess extends Api
             $rows[] = [
                 'work_order' => $workOrder,
                 'part_code' => $part['part_code'],
-                'part_name' => $part['part_name'],
+                'part_name' => trim((string)$part['part_name']),
                 'remark' => isset($part['remark']) ? $part['remark'] : '',
-                'part_type' => isset($part['part_type']) ? $part['part_type'] : '',
+                'part_type' => isset($part['part_type']) ? trim((string)$part['part_type']) : '',
                 'status' => 0,
                 'sys_id' => $sysId,
                 'sys_rq' => $operTime,
@@ -1883,10 +1883,10 @@ class WorkOrderProcess extends Api
             $rows[] = [
                 'work_order' => $workOrder,
                 'part_code' => $process['part_code'],
-                'part_name' => isset($process['part_name']) ? $process['part_name'] : '',
+                'part_name' => isset($process['part_name']) ? trim((string)$process['part_name']) : '',
                 'process_code' => $process['process_code'],
-                'process_name' => $process['process_name'],
-                'big_process' => $process['big_process'],
+                'process_name' => trim((string)$process['process_name']),
+                'big_process' => trim((string)$process['big_process']),
                 'standard_hour' => $process['standard_hour'],
                 'standard_minutes' => $process['standard_minutes'],
                 'standard_score' => $process['standard_score'],

application/api/controller/WorkOrderSpotCheck.php

@@ -2673,7 +2673,7 @@ class WorkOrderSpotCheck extends Api{
     public function getMachineMac(){
         if ($this->request->isGet() == false){$this->error('非法请求');}
         $params = $this->request->get();
-        if (empty($params['sys_sbID'])){$this->error('物理地址参数不能为空');}
+        if (empty($params['sys_sbID'])){$this->error('MAC地址参数不能为空');}
 
         $data = \db('设备_基本资料')->where('sys_sbID', $params['sys_sbID'])
             ->field('设备编号 as 机台号,生产工序,工序,rtrim(设备编组) as 组别,组长,sys_sbID')