朱萌萌 BigMeng
  • Joined on 2025-02-20
BigMeng pushed to main at BigMeng/jiateng_ws 2025-06-16 09:17:03 +08:00
cc33d9318d Merge branch 'dev'
e638b7395d 删除__pycache__文件夹并更新.gitignore以忽略这些目录
a1f9a56781 Merge branch '多数据源配置' into dev
7b0d0a28f2 完成净重计算
e9f94db1d6 多数据源配置
Compare 6 commits »
BigMeng pushed to dev at BigMeng/jiateng_ws 2025-06-16 08:59:24 +08:00
a1f9a56781 Merge branch '多数据源配置' into dev
e9f94db1d6 多数据源配置
Compare 2 commits »
BigMeng pushed to dev at BigMeng/jiateng_ws 2025-06-14 00:34:48 +08:00
7b0d0a28f2 完成净重计算
BigMeng pushed to dev at BigMeng/jiateng_ws 2025-06-13 15:57:34 +08:00
935fd44f78 新增上料下料按钮以及对应功能
BigMeng pushed to main at BigMeng/jiateng_ws 2025-06-13 09:28:47 +08:00
c26a52d1da Merge branch 'dev'
940c2e2008 米电阻获取测试完毕正常回写
6bd48663ed 更新串口设置界面以支持线径数据,添加线径数据的回调处理和配置加载,优化主窗口以集成线径功能,确保数据正确写入检验表格。
fa31dc734d 更新配置文件以支持串口功能,修改主窗口以初始化串口管理器并处理设置变更
7e2f359c9f 解决.gitignore合并冲突,使用dev分支版本
Compare 19 commits »
BigMeng pushed to dev at BigMeng/jiateng_ws 2025-06-13 09:25:10 +08:00
940c2e2008 米电阻获取测试完毕正常回写
BigMeng pushed to dev at BigMeng/jiateng_ws 2025-06-13 09:01:53 +08:00
6bd48663ed 更新串口设置界面以支持线径数据,添加线径数据的回调处理和配置加载,优化主窗口以集成线径功能,确保数据正确写入检验表格。
BigMeng pushed to dev at BigMeng/jiateng_ws 2025-06-12 17:29:45 +08:00
fa31dc734d 更新配置文件以支持串口功能,修改主窗口以初始化串口管理器并处理设置变更
BigMeng pushed tag backup_含有称重的逻辑 to BigMeng/jiateng_ws 2025-06-12 16:09:56 +08:00
BigMeng pushed to main at BigMeng/jiateng_ws 2025-06-12 10:26:22 +08:00
681bfca6df 添加 .gitignore 文件到 main 分支
BigMeng pushed to dev at BigMeng/jiateng_ws 2025-06-12 10:25:42 +08:00
79eca2b44f 完成寄存器监听以及对应业务操作
BigMeng pushed to dev at BigMeng/jiateng_ws 2025-06-11 17:00:13 +08:00
fddb83dcce 完成自动检测贴标信号后自动回填到包装区域中
BigMeng pushed to dev at BigMeng/jiateng_ws 2025-06-11 15:21:34 +08:00
266380f43f 修改新增工程信息的逻辑,新增的数据往后延续,方便实现 FIFO
BigMeng pushed to dev at BigMeng/jiateng_ws 2025-06-11 13:20:07 +08:00
4b214ee4a6 添加根据托盘号获取托盘类型的方法,更新主窗口以支持上料操作的对话框和托盘类型选择,完成上料下料的按钮操作。
BigMeng pushed to dev at BigMeng/jiateng_ws 2025-06-11 08:39:27 +08:00
27f844da9c 添加获取托盘类型信息的方法,更新主窗口以支持托盘类型的选择和显示
BigMeng pushed to dev at BigMeng/jiateng_ws 2025-06-10 16:24:33 +08:00
4db59048a6 remove: 删除不必要的代码
BigMeng pushed to dev at BigMeng/jiateng_ws 2025-06-10 16:13:33 +08:00
c36189f255 添加托盘类型配置表和相关UI功能,更新主窗口以支持托盘类型选择,增强设置界面以管理托盘类型,修改配置文件以包含Modbus设置。
BigMeng pushed to dev at BigMeng/jiateng_ws 2025-06-10 13:37:53 +08:00
b51848e2af 增强InspectionDAO以支持包装记录的保存和查询功能,更新主窗口以加载和显示已完成的检验数据,优化表格以适应新数据结构,添加包装记录统计功能。
BigMeng pushed to dev at BigMeng/jiateng_ws 2025-06-09 01:16:59 +08:00
703f03f0bb 更新InspectionDAO以支持托盘号,修改主窗口以处理托盘号输入并保存检验数据,增强数据库查询功能以根据托盘号过滤未完成的检验记录。
BigMeng pushed to dev at BigMeng/jiateng_ws 2025-06-08 01:24:36 +08:00
ca97662db6 添加获取未完成检验数据的方法,优化主窗口以加载并显示未完成的检验记录;实现表格上下文菜单功能以检查数据库记录。