From bc2ca6919ebd5665847f40a9da303d274fc6e7d2 Mon Sep 17 00:00:00 2001
From: zhu-mengmeng <15588200382@163.com>
Date: Sun, 20 Jul 2025 23:01:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9Modbus=E5=86=99?=
 =?UTF-8?q?=E5=85=A5=E5=80=BC=EF=BC=8C=E6=9B=B4=E6=96=B0SQL=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BB=A5=E5=A4=84=E7=90=86=E7=A9=BA=E5=80=BC=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=89=E5=85=A8=E5=AD=97=E7=AC=A6=E4=B8=B2?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dao/inspection_dao.py  |   2 +-
 db/jtDB.db             | Bin 196608 -> 200704 bytes
 from pymodbus.py       |   2 +-
 widgets/main_window.py |   5 ++++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dao/inspection_dao.py b/dao/inspection_dao.py
index 0337638..eda0d20 100644
--- a/dao/inspection_dao.py
+++ b/dao/inspection_dao.py
@@ -827,7 +827,7 @@ class InspectionDAO:
         try:
             sql = """
             SELECT DISTINCT data_corp, user_id, user_name, gzl_zl, mzl, ddmo, xpack, qd, spack_type, mxzs, jt, ddnote, code, type, lable, lib, gzl, maxsl, cz, size, cd, luno,
-                            qfqd, pono, xj, ysl, dycz, zx_code, edit_id, remarks, zx_name, bccd, tccd, zzyq, customer, customerexp, bz_bqd as bqd, bz_tqd as tqd, type_name, remarks_hb
+                            coalesce(qfqd,'') as qfqd, pono, xj, ysl, dycz, zx_code, edit_id, remarks, zx_name, bccd, tccd, zzyq, customer, customerexp, bz_bqd as bqd, bz_tqd as tqd, type_name, remarks_hb
             FROM wsbz_order_info WHERE ddmo = ?
             """
             params = (order_id,)
diff --git a/db/jtDB.db b/db/jtDB.db
index 128bcfc780ea769bf27d2117d495af5022d05919..23878a9c48163c0350e52d075d9b1e79b1757aa3 100644
GIT binary patch
delta 2925
zcmb`JUrbY19LMiHx3s0bf2b6$<&UedJxJH?-gEEmZ7+^e6cbPr5}Db9!71WIK^Qfw
zx-5mck?h7LCHLVxEvcLOYOtFmi!ipmZN`{AY;hrrb9*q`&@GY4)crZVg)D_$kV(>q
zp7TBTe15;*{hr^s!^8A&hE7+PTq6iV9P`J>YvZqc*F*-5##kNsp3xN>wfFiMN&!aN
z?gb^Smz!<=G8=aXFDFFqA$Om<%iYO({NHkvptof24pf$Tovzyi*Tr6CtC*AYH*|x0
z)O9<%arjGDYGiYeCF-{XIEN!1_r-nA_D-k>svt&#QhVpNj?NBqC@V4)a{r*PA3`}Q
zDzMqt_DPo#d$XDUanFP6H~E|%6x1LT{19q#R8t}$C_yn2u~MR9B6TWpqNm?-0Zf?s
z$mZw&N02HEi>n3Mu0c5zfjFP=vLF@|HJlH^QdjeOw&Cndxvh^N`V3cQkKr%ln2~*C
zgQqr7PSi6DV;s%YQVh=+<L7;>5)u{*tp-Koqs(Y_$GNE{%1=)ljvMi;r|cx1;tj?|
zNX|mAq-b)OH|XVxkXPJG6;WGw#<g4#1r0`cqjaev;Af7TAm?&v0pwVsh*3?38WecL
zzFZMhO^NbG$x<bvDS{?SykRqbm@PjuJv%WyOYZo<d4aI+rN)R0h)sica4|P9Z?)9~
za4{>)VxmkM)RGLEN`nBpmj<H~BV*tUOFc*JMve?<1JrI@!$$zT)Qh-_pn7Z0lBxz_
zNEH-O71|4nS|AnLp4xW=O<n{w6Q6$wV!L+YLsmzO5nP(9V=uEU%-768`ab<O?RB4b
z%dRh69i=m+-Oit#Nhffeb$IN^{%pymlBn%dTPyVyd5YQ#Zh^z(ucVzAGdyLj;UT?+
zBkD<#sb(af<a2HbEcyZ;K#EHC^uBte=TKp^N(6PJfOkKXG(p6_y#ETr&ONbkT9t?>
z59)D@DJ?CESqYL_6J)D3r0>ANp1!4-;4UF57RO78<b+sHzhz>%Hk8zx&HC}h>c=n&
z8cc%9L-~fZ3TjnS%$h{gVI-agmEG$>O6W}{i7S?q+l|Igfbs+D0UFX@G(kmOfqtJM
zy{YxUB=tt?$^jsRBuOf64;A_6fOls;2q>>&bQyR2q^?=B3jBb(fpuqpB2v_vwCD%(
zH9ajUp+`(oQ9qy?Sx~Vqm?2#?F{`-YX|oyB!x&@HiY#of@Tww3J{6wG6=?fBIE|ip
z1l~aJ&VgT0{7;aeUe`CF_#~)A-G70b)N6VT8c*O6{0Cg8j_XzE+!P)ekHO1SzwSey
z&4Vg5@Bnzxra2J9QycSBnUDXQ;&W3Wa{+Qa27}IHdWD%Q8vh$qpx>^54SBKdA-IL6
z=D{G|$CKY@_zK?V-aLq*pZ);fvkWT{6f;RMlkEH4D89=sF=|5JX6*yFTUx1)zp#cr
x&hf-id^sI%OzPWBVA1AE(@H2BhU*2z7wZ6q9>dU9YbZX!p|H3jG_ZzD{{>B)*B1Z)

delta 633
zcmY+BUr19?9LLZ7ox8ia-E*(k>snWxTb58;*`01k6s}PSNrcphz-B%gVSiAvKM+&P
zawKft;AB)>O{AiiwO|G*!`^xbdkG4m0udxO2rTnob$kfwJbusT_x=11CvJ-IxR@-r
z3?qc}lsC)`r`tX@aDHQNxQe@Ow1)eIc8%Z=7)hZNETQN7d9Q@!0>hCmugHsXA)|Od
z$(e8G)Z$V>^dY%bdL@;SOX7Rc=NNLJ%;xwTdu1e|MKoKqHW&!#dN6vRIoezs((83y
z-xIA3Wt3tcm+{@6Rrwe~F~e>iBRyw0pW^nbXe%MAaoKd^Y8NrmW114G(VN&1n-0|P
z3d~c}$eI1(+{EC*om&e-qjM7vGL0is4cJAV8rGTJth|e0m%$rf@@ii$pUvgD#!;Jr
zgyT4c3@RnzhQGI^!q05Z4Vy-Yr`%ahG|lbQwjkp4AQtU#xlp;Ls?~HR34USz{^R+9
zyL2@P|Ese-Dd>~%HateHCLCh&D29{mbaEUjveS<se7MdMLry-AtVe}8q02U9AF@{!
zy%6n=d(sm=FJ6%cWsSThO+^vQZ_9wgV>@Vxv6`1W4X(m@-a3tT8cOkY+?lAOIrcC*
zz69@ZM?#@D*Pw<zTL(wB@C!;fzNiNEGV~hmPK2l_F*N-H+8A0wU4K#fa2<lG1CYA$
zrT-k-{S!K~i)(O%<HfJYor-8wS%RyybPYb^vxzb~G6kFH><XOVrG4lW6Sd%riAoxo
eWHDZb4?Jt@VDV`>#umpH5*0Mv$?m={!`naT=f=+f

diff --git a/from pymodbus.py b/from pymodbus.py
index bff86fa..62e789a 100644
--- a/from pymodbus.py	
+++ b/from pymodbus.py	
@@ -2,7 +2,7 @@ from pymodbus.client import ModbusTcpClient
 import time
 client = ModbusTcpClient('localhost', port=5020)
 client.connect()
-client.write_registers(address=11, values=[14322])
+client.write_registers(address=11, values=[5962])
 # client.write_registers(address=3, values=[0])
 # time.sleep(2)
 # client.write_registers(address=0, values=[0])
diff --git a/widgets/main_window.py b/widgets/main_window.py
index abde4b4..ddc3f42 100644
--- a/widgets/main_window.py
+++ b/widgets/main_window.py
@@ -4738,4 +4738,7 @@ class MainWindow(MainWindowUI):
         except Exception as e:
             logging.error(f"处理炉号选择失败: {str(e)}")
             from PySide6.QtWidgets import QMessageBox
-            QMessageBox.critical(self, "错误", f"处理炉号选择失败: {str(e)}")
\ No newline at end of file
+            QMessageBox.critical(self, "错误", f"处理炉号选择失败: {str(e)}")
+
+def safe_str(val):
+    return "" if val is None else str(val)
\ No newline at end of file