From a626aafbf31dc828728f5fe41b0e272492da6d18 Mon Sep 17 00:00:00 2001
From: zhu-mengmeng <15588200382@163.com>
Date: Sat, 19 Jul 2025 10:37:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A4=84=E7=90=86=20None=20=E5=80=BC?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/jtDB.db             | Bin 180224 -> 180224 bytes
 widgets/main_window.py |  21 ++++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/db/jtDB.db b/db/jtDB.db
index 649277a5512c9f0edbb058f03efa4c6e5206b356..7c311cc246d4d3807c8bf82c89b1e1885855b7d7 100644
GIT binary patch
delta 209
zcmZo@;BIK(o*>N_I#I@%F?3_XUpvMxljH2$*gPb8nN67{Phb<-{Lh|k1G6M=*<|($
z#+wBNY<SJZCzh}<7;_jI7@6uCnClu^Di|7A8Jk%d8;MUW#wufECO)xf^25Kv%?JK&
zKk%2)Wf2bx-wFo)Rs11*|M*q_jh(^A6yh;$J(HXn&>#~dJwrotV`Bp^3_B1~ULno_
VApu6F2IdCFMi$%utz%*m1OS-qIwJr8

delta 93
zcmV-j0HXhZfD3?t3y>QDQjr`(0aCGG{XPNmlU_fD21gkU12qDZkOma9{yzq=0~Zad
zlLyc*vk?$<4FeaEa+Bfx6NAA0x4``YM4}1<4*mcSst;5S{<9Gf@D8{Bt^xuP1vesN

diff --git a/widgets/main_window.py b/widgets/main_window.py
index f37d0ef..d71188d 100644
--- a/widgets/main_window.py
+++ b/widgets/main_window.py
@@ -3679,21 +3679,40 @@ class MainWindow(MainWindowUI):
                     # 获取API返回的新值
                     new_value = ""
                     if field_key and field_key in order_info:
-                        new_value = str(order_info[field_key])
+                        raw_value = order_info[field_key]
+                        # 处理None值，将其转换为空字符串
+                        if raw_value is None:
+                            new_value = ""
+                        else:
+                            new_value = str(raw_value)
                     
                     # 特殊处理线径公差
                     if field_name == "线径公差" and "bccd" in order_info and "tccd" in order_info:
                         bccd = order_info.get("bccd")
                         tccd = order_info.get("tccd")
+                        # 处理None值，只有两个值都不为None时才组合
                         if bccd is not None and tccd is not None:
                             new_value = f"{bccd} - {tccd}"
+                        elif bccd is not None:
+                            new_value = str(bccd)
+                        elif tccd is not None:
+                            new_value = str(tccd)
+                        else:
+                            new_value = ""
                     
                     # 特殊处理强度范围
                     if field_name == "强度范围" and "bqd" in order_info and "tqd" in order_info:
                         bqd = order_info.get("bqd")
                         tqd = order_info.get("tqd")
+                        # 处理None值，只有两个值都不为None时才组合
                         if bqd is not None and tqd is not None:
                             new_value = f"{bqd} - {tqd}"
+                        elif bqd is not None:
+                            new_value = str(bqd)
+                        elif tqd is not None:
+                            new_value = str(tqd)
+                        else:
+                            new_value = ""
                     
                     # 智能更新逻辑：如果新值不为空且与当前值不同，则更新；如果新值为空但当前值不为空，则保持当前值
                     if new_value and new_value != current_value: