From 61fd6cd78ba9bbb5c2f8c022c730b9dbd6ba8f11 Mon Sep 17 00:00:00 2001
From: zhu-mengmeng <15588200382@163.com>
Date: Thu, 24 Jul 2025 09:23:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=94=B5=E6=BA=90?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=90=AF=E5=8A=A8=E8=AE=BE=E7=BD=AE=E4=B8=BA?=
 =?UTF-8?q?false=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=B8=8A=E6=96=99=E5=92=8C?=
 =?UTF-8?q?=E4=B8=8B=E6=96=99=E5=AF=B9=E8=AF=9D=E6=A1=86=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E4=B8=BB=E7=AA=97=E5=8F=A3=E6=89=98?=
 =?UTF-8?q?=E7=9B=98=E5=8F=B7=E8=AE=BE=E7=BD=AE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/app_config.json |   2 +-
 db/jtDB.db             | Bin 262144 -> 262144 bytes
 widgets/main_window.py |  22 ++++++++++++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/config/app_config.json b/config/app_config.json
index fda7ed6..fabab93 100644
--- a/config/app_config.json
+++ b/config/app_config.json
@@ -122,7 +122,7 @@
         }
     },
     "electricity": {
-        "auto_start": true,
+        "auto_start": false,
         "interval_minutes": 30
     }
 }
\ No newline at end of file
diff --git a/db/jtDB.db b/db/jtDB.db
index 739fe4223c8f6aba98286e068bf491f70a0462f1..b157785c91c485aa307825d99e44b125c60e7bb5 100644
GIT binary patch
delta 1491
zcmZva%WKp?9LJN%ZnAAn-CDvBwxwG{#FmXSlbIwtLf5uFYg<=I!Cs0t4=qSVsJAxu
zq2fVHBN2R1Dd<sDa8dCAqWC~5;#JUpz=J2fIjtZ`cITFSn9qEFkGZ-0++6-@K`t$K
z49cYkC!h7n%PSp~ez`h7QMoWtk!uqbu(lUweoHxJL2iAjqn3NhLUWTgocpR8kJ|E6
zN^M~toRu@VyK<-aHszl4)aq^P>@}qA`o`(%Hf-I5hGCkLZb*`;>w65?UNGC+qn9^9
zXH;1P$5p~8#wc1|1YC7I<a#LjxCq8;BNxE9oRK8ST4~Go^qeQ9gu77hhADSzbZ!as
zH~)J8Sp-G->!28YTLLil(utn=LT^f4(al1^FuNsabZx}m1!33r9U}JnMKIIs6GRxo
z$Z?~Cmq1l@8S)s4qD$bGGOzB6PTv4V?d4@Kkm(ljb!k#+`lXe!Kcq=z8eEf~Y%S_P
zx4db&lDVJzAZj~Ydw3g+%C(bM!6`lZatnN4S_O|+l}u47W{pUDrR?6Oeb#2QqWWGv
zqZYESvs2lP34F>Ze$W<8-veeJEuu0fHmAg*WsI3Sv=Op|+!CorL;hgZuZkL6#N4tU
z<l_#)?Xu-!LS2$}#8JZGjRjky)jPnfY(9p|9N89gJzVEVpoGH_#k9tPV2|6LMJRDF
zN(D)vgoOHm9(TB$GK;#*w$sJnI7&EdKiCp?5RQmNh-e5+=ZK@Y!zO;v5_5>zFwqc)
zGQ?7j1d2Oc<Oj`hhs%j$A#5}1r5$nf-{BzaI)2a;cQ~9e3yVW>+7U<p9b!S8@>r1D
z9Bx#7uViZn-YGA3D#x_9E86;+*uoBN7KYV~WasKOjyNzp+K}Kf3`ZLf!U=`pNCSd7
z6?cZ~2`<lahGBT55#rQ^;ZOr2I>umlxB(G;5Vk}0L`(`37#^%6vs@q~YCTYg#BWZ8
gZhu2!3*Ejn@i-HkFJcciCJ2TDNm3j9qdZst0>a=;KL7v#

delta 422
zcmZo@5NK!+m>|t4I8nx#QE+3zZac<~$ujnij84sQ_U&=@jN9YvnHD>UbD1!3Ft;%B
z?cz1yUe4UYv5eh^O_}A#W<iA<=It%bOeKt3O&WUIg0kA849dJ9Ag?HD%quA_Dk{mq
zz$?nYAj!*XEh;W74dhO@Z)3`5G0-zKpMKyull=7SZA{|RH+C{bXf>(nqL?9#X@)q$
z4DIQfolK6?3p$ys!P>X`v@=C9>NRs~qZwk)D=94va)`L7JjfxM;^Okksz7%&*@{n2
zTq8X_sEa9L`j#%HfazS_OmkTn7#NFzUdw0PzPy_$ibaw4I0G+30t3fP)+;O>e4Cgg
z7;P95crWox<<8+UV-904oGhqdw|(bCrgUCz1_lNY27&1c^O+uO&z`{K$Jn-jY1;y3
z76oQ;4%O-G2blGN#=mE04sGO^zF;Af<n(}(%&gnpPB8CNXLjZ^n#_Ko9jIUl$9AKi
H%;(qu7cyiB

diff --git a/widgets/main_window.py b/widgets/main_window.py
index 9ecb1fa..3fbba78 100644
--- a/widgets/main_window.py
+++ b/widgets/main_window.py
@@ -112,6 +112,10 @@ class MainWindow(MainWindowUI):
         self._is_loading_active = False # 标识上料任务是否正在进行
         self._current_gc_qd = 0 # 当前工程号的强度数据
         
+        # 添加对上料和下料对话框的引用
+        self.loading_dialog = None  # 上料对话框
+        self.unloading_dialog = None  # 下料对话框
+        
         # 信号的连接在connect_signals方法中统一处理，不在这里连接
         
         # 称重相关变量
@@ -651,7 +655,14 @@ class MainWindow(MainWindowUI):
         
         # 创建上料对话框
         from widgets.loading_dialog_widget import LoadingDialog
-        dialog = LoadingDialog(parent=self,user_id=self.user_id,user_name=self.user_name,corp_id=self.corp_id)
+        self.loading_dialog = LoadingDialog(parent=self,user_id=self.user_id,user_name=self.user_name,corp_id=self.corp_id)
+        dialog = self.loading_dialog  # 使用类属性引用对话框
+        
+        # 获取当前主窗口中选择的托盘号，并设置到上料对话框中
+        current_tray_id = self.tray_edit.currentText()
+        if current_tray_id:
+            dialog.tray_input.setText(current_tray_id)
+            logging.info(f"将主窗口当前托盘号 {current_tray_id} 设置到上料对话框")
         
         # 如果已有上料信息，作为参考显示在对话框中，但允许用户修改
         if self._loading_info and self._current_stow_num > 0:
@@ -723,7 +734,14 @@ class MainWindow(MainWindowUI):
             self.serial_manager.auto_open_configured_ports()
             self.serial_manager.start_keyboard_listener()
 
-            dialog = UnloadingDialog(self, self.user_id)
+            self.unloading_dialog = UnloadingDialog(self, self.user_id)
+            dialog = self.unloading_dialog  # 使用类属性引用对话框
+            
+            # 获取当前主窗口中选择的托盘号，并设置到下料对话框中
+            current_tray_id = self.tray_edit.currentText()
+            if current_tray_id:
+                dialog.tray_input.setText(current_tray_id)
+                logging.info(f"将主窗口当前托盘号 {current_tray_id} 设置到下料对话框")
             
             # 如果有之前的下料信息，作为参考显示在对话框中，但允许用户修改
             if self._current_unload_info: