diff --git a/config/app_config.json b/config/app_config.json
index fda7ed6..4dce8f8 100644
--- a/config/app_config.json
+++ b/config/app_config.json
@@ -7,7 +7,7 @@
             "enable_keyboard_listener": false,
             "enable_camera": false
         },
-        "base_url": "http://localhost:8085",
+        "base_url": "https://jsjtnew.tengzhicn.com/",
         "mode": "api"
     },
     "apis": {
diff --git a/db/jtDB.db b/db/jtDB.db
index 6518455..b0e337c 100644
Binary files a/db/jtDB.db and b/db/jtDB.db differ
diff --git a/from pymodbus.py b/from pymodbus.py
index eba5284..631e8bb 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=[3562])
+client.write_registers(address=11, values=[4562])
 # client.write_registers(address=3, values=[0])
 # time.sleep(2)
 # client.write_registers(address=0, values=[0])
@@ -13,7 +13,7 @@ client.write_registers(address=11, values=[3562])
 # 贴标完成
 # client.write_registers(address=24, values=[1])
 # client.write_registers(address=2, values=[0])
-# client.write_registers(address=13, values=[1])
+client.write_registers(address=13, values=[1])
 # time.sleep(2)
 # client.write_registers(address=20, values=[0])
 # time.sleep(3)
diff --git a/widgets/loading_dialog_widget.py b/widgets/loading_dialog_widget.py
index 2624576..9447cef 100644
--- a/widgets/loading_dialog_widget.py
+++ b/widgets/loading_dialog_widget.py
@@ -23,7 +23,7 @@ class LoadingDialog(LoadingDialogUI):
         self.corp_id = corp_id
         
         # 存储订单数据
-        # self.order_data = None
+        self.order_data = None
         
         # 彻底禁用对话框的回车键关闭功能
         self.setModal(True)
@@ -107,6 +107,7 @@ class LoadingDialog(LoadingDialogUI):
         try:
             # 存储订单数据
             self.order_data = order_data
+            logging.info(f"已存储订单数据: {order_data.get('mo', '')}")
             
             # 更新UI
             # 注意：此时order_data["note"]已经被修改为order_data["mo"]的值
@@ -198,6 +199,7 @@ class LoadingDialog(LoadingDialogUI):
                 
                 # 存储订单数据
                 self.order_data = order_info
+                logging.info(f"已存储订单数据: {order_code}")
             else:
                 QMessageBox.warning(self, "提示", f"未找到订单: {order_code}")
                 return
@@ -372,7 +374,7 @@ class LoadingDialog(LoadingDialogUI):
         """
         # 获取spack值，如果order_data中有则使用，否则默认使用tray_id
         spack = ""
-        if hasattr(self, 'order_data') and self.order_data and 'spack' in self.order_data:
+        if self.order_data and isinstance(self.order_data, dict) and 'spack' in self.order_data:
             spack = self.order_data['spack']
         else:
             spack = self.tray_input.text().strip()
@@ -382,5 +384,5 @@ class LoadingDialog(LoadingDialogUI):
             "tray_id": self.tray_input.text().strip(),
             "spack": spack,  # 添加spack字段
             "pallet_tier": self.pallet_tier_value.text().strip(),
-            "order_data": self.order_data
+            "order_data": self.order_data if self.order_data else {}
         } 
\ No newline at end of file
diff --git a/widgets/main_window.py b/widgets/main_window.py
index 67a78ad..cf0312e 100644
--- a/widgets/main_window.py
+++ b/widgets/main_window.py
@@ -669,16 +669,25 @@ class MainWindow(MainWindowUI):
         # 如果用户确认，则执行上料操作
         if result == QDialog.Accepted:
             # 从对话框中获取订单号、托盘号和spack，并更新到主窗口
-            loading_data = dialog.get_loading_data()
-            order_code = loading_data["order_id"].strip()
-            tray_code = loading_data["tray_id"].strip()
-            spack = loading_data.get("spack", tray_code).strip()  # 如果没有spack，使用tray_id作为默认值
-            
-            self._current_order_code = order_code
-            self._current_spack = spack  # 保存spack到全局变量
-            self.tray_edit.setText(tray_code)
-            
-            logging.info(f"从上料对话框获取数据: order_code={order_code}, tray_code={tray_code}, spack={spack}")
+            try:
+                loading_data = dialog.get_loading_data()
+                order_code = loading_data.get("order_id", "").strip()
+                tray_code = loading_data.get("tray_id", "").strip()
+                spack = loading_data.get("spack", tray_code).strip() if loading_data.get("spack") else tray_code.strip()
+                
+                self._current_order_code = order_code
+                self._current_spack = spack  # 保存spack到全局变量
+                self.tray_edit.setText(tray_code)
+                
+                logging.info(f"从上料对话框获取数据: order_code={order_code}, tray_code={tray_code}, spack={spack}")
+            except Exception as e:
+                logging.error(f"获取上料数据失败: {str(e)}")
+                order_code = dialog.order_input.text().strip()
+                tray_code = dialog.tray_input.text().strip()
+                self._current_order_code = order_code
+                self._current_spack = tray_code  # 如果获取失败，使用托盘号作为spack
+                self.tray_edit.setText(tray_code)
+                logging.info(f"从上料对话框直接获取数据: order_code={order_code}, tray_code={tray_code}")
             
             # 获取托盘料值作为拆垛层数
             stow_num = dialog.pallet_tier_value.text()