From 2e5a31e904f285a3bbc27e9efd5d946ee45f4845 Mon Sep 17 00:00:00 2001 From: zhu-mengmeng <15588200382@163.com> Date: Wed, 23 Jul 2025 14:40:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=B8=BB=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E5=AD=97=E6=AE=B5=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E8=B7=B3=E8=BF=87=E7=BA=BF=E5=BE=84=E5=85=AC=E5=B7=AE?= =?UTF-8?q?=E3=80=81=E6=9D=90=E8=B4=A8=E5=92=8C=E6=89=93=E5=8D=B0=E6=9D=90?= =?UTF-8?q?=E8=B4=A8=E5=AD=97=E6=AE=B5=E7=9A=84=E6=97=A5=E5=BF=97=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=EF=BC=8C=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84?= =?UTF-8?q?IP=E5=9C=B0=E5=9D=80=E8=B5=8B=E5=80=BC=E5=92=8C=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E4=BF=A1=E6=81=AF=E6=B8=85=E7=A9=BA=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/jtDB.db | Bin 262144 -> 262144 bytes widgets/main_window.py | 7 ++----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/db/jtDB.db b/db/jtDB.db index 76564b0afaaa62ea3a9704f18abeb9650e1904bb..4d6151074ce6537f98d53b71e05e6cf159586aae 100644 GIT binary patch delta 98 zcmZo@5NK!+m>|u#f1->tJ zpTS?ppTh6OZ@@3MSy12)pOp9%4i*Mu4kH62Q(XgdT_a-!LlY|_b1M_m=?4FqF8~1D C_8cDo delta 69 zcmZo@5NK!+m>|u#Z=#GdJ YpTS?ppTh6OZ?IWVK!Sg|!GGop04y>VWdHyG diff --git a/widgets/main_window.py b/widgets/main_window.py index c7b798c..423db0d 100644 --- a/widgets/main_window.py +++ b/widgets/main_window.py @@ -2534,8 +2534,8 @@ class MainWindow(MainWindowUI): for field_name, field_key in self.FIELD_MAPPING.items(): # 过滤掉线径公差字段，因为线径数据是通过线径仪获取的，不需要从前端托盘入库地方获取 - if field_name == "线径公差": - logging.debug(f"跳过线径公差字段，该字段由线径仪获取") + if field_name == "线径公差" or field_name == "材质" or field_name == "打印材质": + logging.debug(f"跳过线径公差、材质、打印材质字段，该字段由接口获取") continue logging.debug(f"处理字段: {field_name} -> {field_key}") @@ -2613,7 +2613,6 @@ class MainWindow(MainWindowUI): logging.error(f"获取本机IP失败: {str(e)}") # 如果获取失败，使用本地回环地址 info['nw_ip'] = '127.0.0.1' - # info['nw_ip'] = '192.168.1.246' # 调试：检查线材类型字段 wire_type_value = info.get('xclx', 'NOT_FOUND') logging.info(f"准备调用接口，线材类型字段值: {wire_type_value}") @@ -2965,8 +2964,6 @@ class MainWindow(MainWindowUI): self._current_stow_num -= 1 if self._current_stow_num == 0: self._is_loading_active = False # 任务完成，标记为非活动 - self._loading_info = None - logging.info("所有层拆垛完成，清空上料信息") message = f"第 {completed_layer_num} 层(最后一层)拆垛完成！" # 重置寄存器 0 和 2 为 0 modbus.write_register_until_success(client, 0, 0)