fix: 文件删除
This commit is contained in:
Generated
-12
@@ -1,12 +0,0 @@
|
||||
# 默认忽略的文件
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# 已忽略包含查询文件的默认文件夹
|
||||
/queries/
|
||||
# Datasource local storage ignored files
|
||||
/dataSources/
|
||||
/dataSources.local.xml
|
||||
# 基于编辑器的 HTTP 客户端请求
|
||||
/httpRequests/
|
||||
/go.imports.xml
|
||||
/MarsCodeWorkspaceAppSettings.xml
|
||||
Generated
-8
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/ssp.iml" filepath="$PROJECT_DIR$/.idea/ssp.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
Generated
+1
-6
@@ -1,9 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="WEB_MODULE" version="4">
|
||||
<module version="4">
|
||||
<component name="Go" enabled="true" />
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
Generated
+105
@@ -0,0 +1,105 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="AutoImportSettings">
|
||||
<option name="autoReloadType" value="ALL" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="5db5cc8f-5d2a-4f2f-97b5-7b9eba909e66" name="更改" comment="fix(order): 修改设备状态显示问题">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/ssp.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/ssp.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ssp.pro.user" beforeDir="false" afterPath="$PROJECT_DIR$/ssp.pro.user" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="GOROOT" url="file://D:/GoPath/pkg/mod/golang.org/toolchain@v0.0.1-go1.26.5.windows-amd64" />
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="ProjectColorInfo">{
|
||||
"associatedIndex": 0
|
||||
}</component>
|
||||
<component name="ProjectId" id="3I4I0dCX6m5Jmayd8vIaWzjij7V" />
|
||||
<component name="ProjectViewState">
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">{
|
||||
"keyToString": {
|
||||
"ModuleVcsDetector.initialDetectionPerformed": "true",
|
||||
"RunOnceActivity.GoLinterPluginOnboardingV2": "true",
|
||||
"RunOnceActivity.GoLinterPluginStorageMigration": "true",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
|
||||
"RunOnceActivity.git.unshallow": "true",
|
||||
"RunOnceActivity.go.formatter.settings.were.checked": "true",
|
||||
"RunOnceActivity.go.modules.go.list.on.any.changes.was.set": "true",
|
||||
"RunOnceActivity.typescript.service.memoryLimit.init": "true",
|
||||
"git-widget-placeholder": "master",
|
||||
"go.sdk.automatically.set": "true",
|
||||
"last_opened_file_path": "E:/QTCode/ssp/ssp",
|
||||
"nodejs_package_manager_path": "npm"
|
||||
}
|
||||
}</component>
|
||||
<component name="SharedIndexes">
|
||||
<attachedChunks>
|
||||
<set>
|
||||
<option value="bundled-gosdk-72a9cf600ed8-448e06e64ec5-org.jetbrains.plugins.go.sharedIndexes.bundled-GO-253.28294.337" />
|
||||
<option value="bundled-js-predefined-d6986cc7102b-c7e53b3be11b-JavaScript-GO-253.28294.337" />
|
||||
</set>
|
||||
</attachedChunks>
|
||||
</component>
|
||||
<component name="TaskManager">
|
||||
<task active="true" id="Default" summary="默认任务">
|
||||
<changelist id="5db5cc8f-5d2a-4f2f-97b5-7b9eba909e66" name="更改" comment="" />
|
||||
<created>1787017192111</created>
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1787017192111</updated>
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="3" />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="TAB_STATES">
|
||||
<map>
|
||||
<entry key="MAIN">
|
||||
<value>
|
||||
<State />
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="first commit" />
|
||||
<MESSAGE value="订单流程添加修改" />
|
||||
<MESSAGE value="订单流程修改--QThread事件循环导致的逻辑修改" />
|
||||
<MESSAGE value="添加状态点位表" />
|
||||
<MESSAGE value="Commit" />
|
||||
<MESSAGE value="添加管控软件和相机的通讯" />
|
||||
<MESSAGE value="feat(vision): 新增拍照到位前置流程并支持视觉失败降级取料 - 在普通 RackPick 前写托盘号、格位并置 M850,收到 M851 后清除两位 - 使用 vision/enabled 控制识别,关闭时仍执行拍照到位流程 - 识别成功且 R60 写入确认后写 M852=1,视觉关闭或失败时写 M852=0 - 确认 M852 写入后启动 RackPick,动作结束保留 M852 - 移除旧 850–854 五信号握手,更新配置和协议文档 - 允许未就绪的视觉服务接收测量,扩展超时以覆盖初始化重试 - 保留 PLC 写入失败阻断、暂停发送门控及迟到结果拒绝 - 持久化未完成事务,支持 PLC 暂停后的视觉维护与人工恢复 验证:MinGW 32/64 位编译通过;生产流程47、IPC14、PLC11项测试通过" />
|
||||
<MESSAGE value="feat(vision): 状态栏增加相机状态" />
|
||||
<MESSAGE value="feat: 重构视觉取料流程及生产故障恢复 - 删除订单启动、暂停、复位相关 PLC 握手及无效反馈配置 - 清除报警改为仅写 clearAlarmCommand,不等待反馈 - 将拍照位移动、视觉处理和 RackPick 拆分为三个独立动作 - 增加 M850/M851 拍照位动作及 R60/M852 视觉结果流程 - 暂停改为等待当前机器人动作完成,视觉结果不确定时转人工确认 - 删除复位按钮,合并为恢复/重试按钮 - 普通 PAUSED 订单通过启动按钮继续 - 恢复前检查 PLC、安全状态、订单及动作命令反馈 - 支持在途动作接管、已完成动作收尾、安全重试和人工确认 - 故障状态保持订单 RUNNING,并持久化实际恢复阶段 - 恢复成功后仅清除本次软件故障对应的报警 - 更新小轴 PLC 地址、Modbus 配置和视觉集成文档" />
|
||||
<MESSAGE value="feat: 视觉引导页面优化 - 点击各个按钮后,能在界面显示操作后结果 - 对排版进行优化 - 下面的位姿拍照删除" />
|
||||
<MESSAGE value="feat(production): 持久化动作检查点并完善恢复重试流程 - production_runs 新增动作阶段、尝试次数、版本及人工确认字段 - 提供兼容 PostgreSQL 9.5 的幂等升级脚本和数据库结构检查 - 工序推进、动作完成检查点和审计记录使用同一事务 - 机器人命令单次发送,完成反馈先持久化再清握手 - 已完成动作恢复仅补握手或数据库记录,避免重复执行 - 恢复/重试按钮固定显示在清除报警前,加入明确人工处理选项 - 记录人工决定、操作人及现场核对信息,拒绝过期确认 - 区分普通暂停继续、故障恢复与终止后的视觉锁解除 - 补齐视觉目标跨重启校验、异步失败及迟到回调防护 - 检测结果关联动作和尝试次数,重试清除旧结果缓存" />
|
||||
<MESSAGE value="feat(production): modify - 添加终止按钮 - 点击操作前进行提示 - 取放料的时候,除了写slot,也写行和列" />
|
||||
<MESSAGE value="feat(production): 界面表格优化" />
|
||||
<MESSAGE value="feat(production): 删除动作记录、释放料位、删除工件及订单等" />
|
||||
<MESSAGE value="feat(production): 修改订单流程卡死流程问题" />
|
||||
<MESSAGE value="feat(production): 修改删除订单问题" />
|
||||
<MESSAGE value="feat(production): 修改订单清除按钮功能---除了清除报警、也复位状态,让订单能继续执行" />
|
||||
<MESSAGE value="feat(production): 修改订单加工位置不一致问题 -创建订单时解除所有占用 -修改数据库位置唯一约束 -严格按照订单起始位置分配 -订单启动时重新初始化位置" />
|
||||
<MESSAGE value="feat(production): 放料流程前需要加两个步骤 -1、移动相机到拍照位置 -2、相机识别凹槽是否有料(这个步骤先用伪代码实现);" />
|
||||
<MESSAGE value="fix(dashboard): 显示问题修改 -PLC-未采集、机器人-未采集、安全回路-未采集 问题修改 -生成工件,成功后添加弹出提示生成成功" />
|
||||
<MESSAGE value="fix(Tray): 托盘传感器显示修改" />
|
||||
<MESSAGE value="fix(order): 工序耗时--下面的累计耗时和表格没有数据" />
|
||||
<MESSAGE value="fix(order): 修改设备状态显示问题" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="fix(order): 修改设备状态显示问题" />
|
||||
</component>
|
||||
</project>
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE QtCreatorProject>
|
||||
<!-- Written by QtCreator 4.11.0, 2026-11-09T14:41:28. -->
|
||||
<!-- Written by QtCreator 4.11.0, 2026-11-09T19:39:43. -->
|
||||
<qtcreator>
|
||||
<data>
|
||||
<variable>EnvironmentId</variable>
|
||||
|
||||
Reference in New Issue
Block a user