feat(追踪系统): 添加手动设置起始钢卷功能

- 后端添加设置起始钢卷API和钢卷查询API
- 前端实现起始钢卷选择界面和状态管理
- 优化追踪逻辑自动加载后续钢卷
- 添加本地存储保持起始钢卷设置

backend/main.py

@@ -411,6 +411,22 @@ async def save_opc_config(config: OpcConfig):
 
 @app.get("/api/opc/status")
 def opc_status():
+    # 获取当前正在追踪的4个钢卷
+    current_tracking_coils = []
+    try:
+        from sqlite_sync import sqlite_get_coil_track
+        coils = sqlite_get_coil_track()
+        current_tracking_coils = [
+            {
+                "coilid": coil.get("coilid", ""),
+                "sequencenb": coil.get("sequencenb", 0),
+                "rollprogramnb": coil.get("rollprogramnb", 0)
+            } 
+            for coil in coils[:4]
+        ]
+    except Exception as e:
+        logger.warning(f"Failed to get current tracking coils: {e}")
+    
     return {
         "running": opc_service.running,
         "last_counter": opc_service.last_counter,
@@ -418,6 +434,13 @@ def opc_status():
         "log": opc_service.event_log[-50:],
         "track_state": opc_service.track_state,
         "write_counter_last": opc_service.write_counter_last,
+        "tracking_info": {
+            "first_coilid": opc_service.first_coilid,  # 这个保持不变
+            "last_tracked_coilid": opc_service.last_tracked_coilid,
+            "end_coilid": opc_service.end_coilid,
+            "tracking_ended": opc_service.tracking_ended,
+            "current_tracking_coils": current_tracking_coils  # 当前正在追踪的4个钢卷
+        }
     }
 
 
@@ -664,3 +687,104 @@ async def simulate_signal2():
     """模拟信号2触发 - 更新追踪表"""
     await opc_service._handle_signal2()
     return {"message": "信号2已触发"}
+
+
+# ─────────────────────────────────────────────
+# Manual Starting Coil Configuration
+# ─────────────────────────────────────────────
+
+@app.post("/api/track/set-start-coil")
+async def set_start_coil(data: dict):
+    """设置手动起始钢卷ID用于追踪"""
+    coilid = data.get("coilid")
+    if not coilid:
+        raise HTTPException(status_code=400, detail="coilid不能为空")
+    
+    # 验证钢卷是否存在
+    conn = get_connection()
+    cursor = conn.cursor()
+    try:
+        cursor.execute("SELECT COUNT(*) FROM PLTM.PDI_PLTM WHERE COILID = :coilid", {"coilid": coilid})
+        if cursor.fetchone()[0] == 0:
+            raise HTTPException(status_code=404, detail=f"钢卷 {coilid} 不存在")
+    finally:
+        cursor.close()
+        conn.close()
+    
+    # 设置起始钢卷
+    opc_service.set_manual_start_coil(coilid)
+    
+    # 自动读取起始钢卷及后续3个钢卷到暂存表
+    try:
+        await opc_service._handle_signal1()
+    except Exception as e:
+        # 即使读取失败也不影响设置成功
+        logger.warning(f"Failed to load initial coils after setting start coil: {e}")
+    
+    return {"message": f"已设置起始钢卷: {coilid}"}
+
+
+@app.get("/api/track/available-coils")
+def get_available_coils(
+    page: int = Query(1, ge=1),
+    page_size: int = Query(20, ge=1, le=200),
+    coilid: Optional[str] = None,
+    sequencenb_min: Optional[int] = None,
+    sequencenb_max: Optional[int] = None
+):
+    """获取可用的钢卷列表用于选择起始点（支持搜索和分页）"""
+    conn = get_connection()
+    cursor = conn.cursor()
+    try:
+        # 构建查询条件
+        conditions = []
+        params = {}
+        
+        if coilid:
+            conditions.append("COILID LIKE :coilid")
+            params["coilid"] = f"%{coilid}%"
+        
+        if sequencenb_min is not None:
+            conditions.append("SEQUENCENB >= :sequencenb_min")
+            params["sequencenb_min"] = sequencenb_min
+            
+        if sequencenb_max is not None:
+            conditions.append("SEQUENCENB <= :sequencenb_max")
+            params["sequencenb_max"] = sequencenb_max
+        
+        where_clause = ""
+        if conditions:
+            where_clause = "WHERE " + " AND ".join(conditions)
+        
+        # 查询总数
+        count_sql = f"SELECT COUNT(*) FROM PLTM.PDI_PLTM {where_clause}"
+        cursor.execute(count_sql, params)
+        total = cursor.fetchone()[0]
+        
+        # 分页查询
+        offset = (page - 1) * page_size
+        data_sql = f"""
+            SELECT COILID, SEQUENCENB, ROLLPROGRAMNB, STEEL_GRADE, 
+                   ENTRY_COIL_THICKNESS, ENTRY_COIL_WIDTH, ENTRY_COIL_WEIGHT
+            FROM PLTM.PDI_PLTM 
+            {where_clause}
+            ORDER BY COILID ASC
+        """
+        cursor.execute(data_sql, params)
+        
+        # 手动分页（因为Oracle的ROWNUM处理比较复杂）
+        all_rows = cursor.fetchall()
+        paginated_rows = all_rows[offset:offset + page_size]
+        
+        columns = [col[0].lower() for col in cursor.description]
+        rows = [dict(zip(columns, row)) for row in paginated_rows]
+        
+        return {
+            "data": rows,
+            "total": total,
+            "page": page,
+            "page_size": page_size
+        }
+    finally:
+        cursor.close()
+        conn.close()

backend/opc_service.py

@@ -92,6 +92,8 @@ class OpcService:
         self.event_log: List[str] = []
         self._stop_event = asyncio.Event()
         self._task: Optional[asyncio.Task] = None
+        self._need_fetch_next_batch: bool = False
+        self._need_initial_load: bool = False
 
     # ------------------------------------------------------------------
     def _load_trackmap_nodes(self) -> Dict[str, str]:
@@ -569,6 +571,32 @@ class OpcService:
 
         return value
 
+    # ------------------------------------------------------------------
+    def set_manual_start_coil(self, coilid: str):
+        """Set manual starting coil ID for tracking and load initial coils.
+        
+        Args:
+            coilid: The coil ID to start tracking from
+        """
+        self.first_coilid = coilid
+        self.last_tracked_coilid = None
+        self.end_coilid = None
+        self.tracking_ended = False
+        self.signal1_coils = []
+        self._log(f"Manual start coil set to: {coilid}")
+        
+        # Clear any existing temp track data
+        try:
+            from sqlite_sync import sqlite_clear_coil_track
+            sqlite_clear_coil_track()
+            self._log("Cleared temp track data for manual start")
+        except Exception as exc:
+            self._log(f"Failed to clear temp track data: {exc}")
+        
+        # 标记需要自动读取起始钢卷（由外部调用_handle_signal1）
+        self._need_initial_load = True
+
+    # ------------------------------------------------------------------
     async def _handle_signal1(self):
         """Handle signal1: fetch next 4 coils from Oracle PDI table and save to SQLite temp table."""
         from sqlite_sync import sqlite_save_coils_to_track, sqlite_clear_coil_track
@@ -663,7 +691,12 @@ class OpcService:
 
             self.last_tracked_coilid = coils[0]["coilid"]
 
-            self._log(f"Signal1: Saved {len(coils)} coils, next_start: {self.first_coilid}, last_tracked: {self.last_tracked_coilid}")
+            # 详细日志：显示当前读取的4个钢卷信息
+            coil_details = []
+            for i, coil in enumerate(coils):
+                coil_details.append(f"pos{i+1}:{coil['coilid']}(seq:{coil['sequencenb']})")
+            
+            self._log(f"Signal1: Saved {len(coils)} coils [{', '.join(coil_details)}], next_start: {self.first_coilid}, last_tracked: {self.last_tracked_coilid}")
 
         loop = asyncio.get_event_loop()
         await loop.run_in_executor(None, _do_fetch)
@@ -760,7 +793,7 @@ class OpcService:
                     conn.commit()
                     self._log(f"Signal2: Updated 4 positions (coils: {coil_count})")
 
-                    # 检查是否还有更多钢卷可以追踪
+                    # 检查是否还有更多钢卷可以追踪，如果有则自动读取下一批
                     self._log(f"Signal2: Checking remaining coils, first_coilid={repr(self.first_coilid)}")
                     
                     if self.first_coilid:
@@ -779,15 +812,10 @@ class OpcService:
                                 self.last_tracked_coilid = self.first_coilid
                                 self.tracking_ended = True
                                 self._log(f"Signal2: No more coils, tracking ended, end_coilid={self.end_coilid}")
-                            elif remaining_count >= 2:
-                                # 有2个以上钢卷，保持 first_coilid 不变，让 Signal1 处理
-                                self._log(f"Signal2: >=2 coils remain, first_coilid unchanged, waiting for Signal1")
                             else:
-                                # 只有一个钢卷时先展示为“7(1个)”，下一次重复信号再清空到 NULL
-                                self._log(
-                                    f"Signal2: One coil remains ({all_remaining[0][0]}), "
-                                    "waiting one more cycle before final clear"
-                                )
+                                # 还有钢卷，标记需要自动读取下一批
+                                self._log(f"Signal2: Will auto-trigger Signal1 logic to fetch next batch of coils")
+                                self._need_fetch_next_batch = True
                         except Exception as exc:
                             self._log(f"Signal2: Check next coils failed: {exc}")
                 finally:
@@ -800,6 +828,15 @@ class OpcService:
 
         loop = asyncio.get_event_loop()
         await loop.run_in_executor(None, _do_update)
+        
+        # 如果标记需要读取下一批，则调用Signal1的逻辑
+        if hasattr(self, '_need_fetch_next_batch') and self._need_fetch_next_batch:
+            self._need_fetch_next_batch = False
+            try:
+                await self._handle_signal1()
+                self._log("Signal2: Successfully fetched next batch of coils")
+            except Exception as exc:
+                self._log(f"Signal2: Failed to fetch next batch: {exc}")
 
     # ------------------------------------------------------------------
     async def _update_oracle(self, position: Any, data: Dict[str, Any]):

frontend/src/views/TrackCoil.vue

@@ -1,11 +1,30 @@
 <template>
   <div>
+    <!-- 起始钢卷信息显示 -->
+    <div class="panel" style="background:#f8f9fa;border:1px solid #e9ecef">
+      <h3 style="margin:0 0 10px 0;color:#495057">起始钢卷信息</h3>
+      <div v-if="startCoilInfo.coilid" style="display:flex;align-items:center;gap:20px">
+        <div style="display:flex;align-items:center;gap:10px">
+          <span style="color:#dc3545;font-weight:bold;font-size:16px">起始钢卷:</span>
+          <span style="color:#dc3545;font-weight:bold;font-size:16px">{{ startCoilInfo.coilid }}</span>
+          <el-tag type="danger" size="small">顺序号: {{ startCoilInfo.sequencenb }}</el-tag>
+        </div>
+        <div style="color:#6c757d;font-size:14px">
+          <span>设置时间: {{ startCoilInfo.set_time || '未知' }}</span>
+        </div>
+        <div style="flex:1"></div>
+        <el-button size="small" type="warning" icon="el-icon-location" @click="openStartCoilDialog">重新设置</el-button>
+      </div>
+      <div v-else style="color:#6c757d;text-align:center;padding:20px">
+        <span>尚未设置起始钢卷</span>
+        <el-button size="small" type="primary" style="margin-left:10px" @click="openStartCoilDialog">设置起始钢卷</el-button>
+      </div>
+    </div>
+
     <div class="panel" style="display:flex;align-items:center;gap:10px;flex-wrap:wrap">
       <el-button size="small" @click="loadCoils">刷新</el-button>
-      <el-button size="small" type="primary" icon="el-icon-plus" @click="openAdd">新增钢卷</el-button>
       <el-button size="small" type="danger" icon="el-icon-delete" @click="clearAll">清空全部</el-button>
       <span style="flex:1"></span>
-      <el-button size="small" type="warning" @click="triggerSignal1">模拟信号1(入口)</el-button>
       <el-button size="small" type="success" @click="triggerSignal2">模拟信号2(焊接完成)</el-button>
       <span style="font-size:12px;color:#666">1.出口 2.酸洗 3.入口活套 4.开卷机 提示:(最小的先进产线)</span>
     </div>
@@ -48,11 +67,80 @@
         <el-button type="primary" size="small" @click="doSave" :loading="saving">保存</el-button>
       </div>
     </el-dialog>
+    
+    <!-- 起始钢卷选择对话框 -->
+    <el-dialog title="选择起始钢卷" :visible.sync="startCoilDialogVisible" width="1400px">
+      <div style="margin-bottom:15px">
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-input
+              v-model="searchCoilid"
+              placeholder="搜索钢卷号"
+              clearable
+              size="small"
+              @clear="searchAvailableCoils"
+              @keyup.enter.native="searchAvailableCoils"
+            >
+              <el-button slot="append" icon="el-icon-search" @click="searchAvailableCoils"></el-button>
+            </el-input>
+          </el-col>
+          <el-col :span="6">
+            <el-input
+              v-model="searchSequencenb"
+              placeholder="顺序号筛选"
+              clearable
+              size="small"
+              @clear="searchAvailableCoils"
+              @keyup.enter.native="searchAvailableCoils"
+            >
+              <el-button slot="append" icon="el-icon-search" @click="searchAvailableCoils"></el-button>
+            </el-input>
+          </el-col>
+          <el-col :span="4">
+            <el-button size="small" style="width:100%" @click="searchAvailableCoils">刷新</el-button>
+          </el-col>
+        </el-row>
+      </div>
+      <el-table :data="availableCoils" stripe border size="small" v-loading="searchLoading" element-loading-text="搜索中..." style="width:100%" height="400" :empty-text="'暂无数据'">
+        <el-table-column prop="sequencenb" label="顺序号" align="center" />
+        <el-table-column prop="coilid" label="钢卷号"  />
+        <el-table-column prop="rollprogramnb" label="计划号"  align="center" />
+        <el-table-column prop="steel_grade" label="钢种" width="150" />
+        <el-table-column prop="entry_coil_thickness" label="厚度(mm)" width="100" align="center" />
+        <el-table-column prop="entry_coil_width" label="宽度(mm)" width="100" align="center" />
+        <el-table-column prop="entry_coil_weight" label="重量(kg)" width="110" align="center" />
+        <el-table-column label="状态" width="90" align="center">
+          <template slot-scope="{row}">
+            <el-tag size="mini" type="success">计划中</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="110" align="center">
+          <template slot-scope="{row}">
+            <el-button type="primary" size="mini" @click="selectStartCoil(row)">选择</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="margin-top:15px;text-align:center">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="searchParams.page"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="searchParams.page_size"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="searchTotal">
+        </el-pagination>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="startCoilDialogVisible = false">取消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { trackApi } from '../api/index'
+import axios from 'axios'
 
 export default {
   name: 'TrackCoil',
@@ -74,6 +162,22 @@ export default {
         coilid: [
           { required: true, message: '钢卷号不能为空', trigger: 'blur' }
         ]
+      },
+      // 起始钢卷选择相关
+      startCoilDialogVisible: false,
+      availableCoils: [],
+      searchLoading: false,
+      searchCoilid: '',
+      searchSequencenb: '',
+      searchParams: {
+        page: 1,
+        page_size: 20
+      },
+      searchTotal: 0,
+      startCoilInfo: {
+        coilid: '',
+        sequencenb: 0,
+        set_time: ''
       }
     }
   },
@@ -83,7 +187,18 @@ export default {
     }
   },
   created() {
+    this.loadStartCoilFromStorage()
     this.loadCoils()
+    this.loadTrackStatus()
+    // 定时刷新状态
+    this.statusTimer = setInterval(() => {
+      this.loadTrackStatus()
+    }, 2000)
+  },
+  beforeDestroy() {
+    if (this.statusTimer) {
+      clearInterval(this.statusTimer)
+    }
   },
   methods: {
     async loadCoils() {
@@ -220,11 +335,152 @@ export default {
     async triggerSignal2() {
       try {
         await trackApi.simulateSignal2()
-        this.$message.success('信号2已触发 - 已更新追踪表')
+        this.$message.success('信号2已触发 - 已读取钢卷并更新追踪表')
         this.loadCoils()
       } catch (e) {
         this.$message.error(e.message)
       }
+    },
+    // 起始钢卷持久化存储方法
+    loadStartCoilFromStorage() {
+      try {
+        const saved = localStorage.getItem('startCoilInfo')
+        if (saved) {
+          this.startCoilInfo = JSON.parse(saved)
+        }
+      } catch (e) {
+        console.error('Failed to load start coil from storage:', e)
+      }
+    },
+    saveStartCoilToStorage() {
+      try {
+        localStorage.setItem('startCoilInfo', JSON.stringify(this.startCoilInfo))
+      } catch (e) {
+        console.error('Failed to save start coil to storage:', e)
+      }
+    },
+    clearStartCoilFromStorage() {
+      try {
+        localStorage.removeItem('startCoilInfo')
+      } catch (e) {
+        console.error('Failed to clear start coil from storage:', e)
+      }
+    },
+    // 起始钢卷选择相关方法
+    async loadTrackStatus() {
+      try {
+        const res = await axios.get('/api/opc/status')
+        const tracking_info = res.data.tracking_info || {}
+        const first_coilid = tracking_info.first_coilid || ''
+        
+        // 如果localStorage中有起始钢卷信息，优先使用localStorage的
+        // 不再随后端状态变化而变化
+        if (this.startCoilInfo.coilid) {
+          // 有本地存储的起始钢卷，保持不变
+          return
+        }
+        
+        // 只有在没有本地存储时，才检查后端是否有历史设置
+        if (first_coilid) {
+          try {
+            const params = { page: 1, page_size: 1, coilid: first_coilid }
+            const coilRes = await axios.get('/api/track/available-coils', { params })
+            if (coilRes.data.data && coilRes.data.data.length > 0) {
+              const coil = coilRes.data.data[0]
+              this.startCoilInfo = {
+                coilid: coil.coilid,
+                sequencenb: coil.sequencenb,
+                set_time: '历史设置'  // 标记为历史设置，不是当前手动设置
+              }
+              // 保存到localStorage
+              this.saveStartCoilToStorage()
+            }
+          } catch (e) {
+            console.error('Failed to get start coil details:', e)
+          }
+        }
+      } catch (e) {
+        console.error('Failed to load track status:', e)
+      }
+    },
+    isStartCoil(coilid) {
+      return this.startCoilInfo.coilid === coilid
+    },
+    openStartCoilDialog() {
+      this.startCoilDialogVisible = true
+      this.searchAvailableCoils()
+    },
+    clearStartCoil() {
+      this.startCoilInfo = {
+        coilid: '',
+        sequencenb: 0,
+        set_time: ''
+      }
+      this.clearStartCoilFromStorage()
+    },
+    async searchAvailableCoils() {
+      this.searchLoading = true
+      try {
+        const params = {
+          page: this.searchParams.page,
+          page_size: this.searchParams.page_size,
+          coilid: this.searchCoilid || undefined
+        }
+        
+        // 添加顺序号筛选
+        if (this.searchSequencenb) {
+          const seqNb = parseInt(this.searchSequencenb)
+          if (!isNaN(seqNb)) {
+            params.sequencenb_min = seqNb
+            params.sequencenb_max = seqNb
+          }
+        }
+        
+        const res = await axios.get('/api/track/available-coils', { params })
+        this.availableCoils = res.data.data || []
+        this.searchTotal = res.data.total || 0
+      } catch (e) {
+        this.$message.error('搜索钢卷失败: ' + e.message)
+      } finally {
+        this.searchLoading = false
+      }
+    },
+    async selectStartCoil(row) {
+      this.$confirm(`确认设置钢卷 [${row.coilid}] 作为追踪起始点？\n设置后将自动加载该钢卷及后续3个钢卷到追踪表。`, '设置起始钢卷', {
+        confirmButtonText: '确认设置',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        try {
+          // 设置起始钢卷
+          const res = await axios.post('/api/track/set-start-coil', { coilid: row.coilid })
+          this.$message.success(res.data.message)
+          
+          // 更新起始钢卷信息并保存到localStorage
+          this.startCoilInfo = {
+            coilid: row.coilid,
+            sequencenb: row.sequencenb,
+            set_time: new Date().toLocaleString('zh-CN')
+          }
+          this.saveStartCoilToStorage()
+          
+          // 重新加载钢卷列表
+          this.loadCoils()
+          
+          this.startCoilDialogVisible = false
+        } catch (e) {
+          this.$message.error(e.response?.data?.detail || e.message)
+        }
+      }).catch(() => {})
+    },
+    handleSizeChange(val) {
+      this.searchParams.page_size = val
+      this.searchParams.page = 1
+      this.searchAvailableCoils()
+    },
+    handleCurrentChange(val) {
+      this.searchParams.page = val
+      this.searchAvailableCoils()
     }
   }
 }