From e75761bc395d808fc28ee0c0f6cdffe9c696fb39 Mon Sep 17 00:00:00 2001
From: zhu-mengmeng <15588200382@163.com>
Date: Mon, 21 Jul 2025 13:34:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E6=89=98=E7=9B=98=E5=8F=B7=E8=8E=B7=E5=8F=96=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8E=A5=E5=8F=A3=E5=8F=8A=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BC=98=E5=8C=96=E6=89=98?=
 =?UTF-8?q?=E7=9B=98=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/gc_api.py                   |  26 +++++++++++++++++++++++++-
 config/app_config.json           |   3 ++-
 db/jtDB.db                       | Bin 200704 -> 200704 bytes
 widgets/loading_dialog_widget.py |  27 ++++++++++++++++++++++++---
 widgets/order_query_dialog.py    |  18 ++++++++++++++++++
 5 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/apis/gc_api.py b/apis/gc_api.py
index 10dfac2..266ad33 100644
--- a/apis/gc_api.py
+++ b/apis/gc_api.py
@@ -331,4 +331,28 @@ class GcApi:
             
         except Exception as e:
             logging.error(f"获取炉号列表失败: {str(e)}")
-            return {"status": False, "message": f"获取炉号列表失败: {str(e)}"}
\ No newline at end of file
+            return {"status": False, "message": f"获取炉号列表失败: {str(e)}"}
+
+    def get_order_info_by_xpack(self, xpack, corp_id):
+        """
+        通过托盘号获取订单信息
+        """
+        try:
+            # API 配置中的键名
+            api_key = "get_order_info_by_xpack"
+            order_dict = {
+                "xpack": xpack,
+                "data_corp": corp_id
+            }
+            data = {
+                "parms": json.dumps(order_dict),
+                "pageIndex": 0,
+                "pageSize": 10,
+                "sortField": "",
+                "sortOrder": ""
+            }
+            response = self.api_utils.post(api_key, data=data)
+            return response
+        except Exception as e:
+            logging.error(f"通过托盘号获取订单信息失败: {str(e)}")
+            return None
\ No newline at end of file
diff --git a/config/app_config.json b/config/app_config.json
index 963bb67..66d41c5 100644
--- a/config/app_config.json
+++ b/config/app_config.json
@@ -19,7 +19,8 @@
         "get_xpack": "/jsjt/xcsc/tprk/getXpackToWsbz.do",
         "ismt_option": "/jsjt/xcsc/tprk/ismtOptioTonWsbz.do",
         "get_params": "/select/getcombcodeWsbz.do",
-        "get_luno": "/common/luno/getLunoListWsbz.do"
+        "get_luno": "/common/luno/getLunoListWsbz.do",
+        "get_order_info_by_xpack": "/jsjt/xcsc/tprk/getXsddBzrkGridListByXpackToWsbz.do"
     },
     "database": {
         "default": "sqlite",
diff --git a/db/jtDB.db b/db/jtDB.db
index 969125934af3b458be9411b2e13f92b34ad43713..21aa07e32e6b7c96750e0b38f08df7c193f10b8f 100644
GIT binary patch
delta 448
zcmZozz|*jRXM!}N-b5K^M!k&*f9)7|Opdc}V=Iv4Wj1A+Jb_JQ^FMpG1<c+YNt4+x
zOy4XhaD=^He6j@#gE5DZfsv`Mfw``cp@N~Yl`#m3Pd3LYV`M2l*$j(}p_K_x#uU4Z
zsrY0QOc?_US+FK!bSWb%6GJNl!{&c4w*Py<$gy0efq`Qt>lLOKe47|Iv9hq3@E+%x
z%ALby#?ZiCI9X62j<-o)RZCD-TbMzfmsfkb&P*m*Ce`fe3turwNgL>y8JQZG8yFhu
z8a{39ecsmpV$zOhb5=ZGw{d#mOr{>5Cp&syPU(0#Y0;A%bEp5E$z;8K?gXZ04klxj
z>G`vn6t+jsVp`40ti$kWI{N~q2*yu93nwv!6ihE%&Ln9I2{02YLt{Nda}yIob1$^8
cM3(XjaSjLx0K3M-z#=3cY{d5Dg-mnv0N6!-_W%F@

delta 191
zcmV;w06_nMpbUVZ43HZECXpON0Vc6v{XPM*lU_fD25%V+12qDZkOma9{yzqw14Rh_
zlLyd?vk?$%2!sCUxBln>2&WvI00)8uy#dh<vH+U{?E@VR#|)JVYzj6B9|l^J5fFK|
zvXKIX2n-Y@DiIwk6969#4Gou#kOCb74QrR7>H-=JFfKMSH83|YF)=MMm*J2CjF)+l
t0y_aDmv5T_Ah%hX0;>fBD*;HC2cQC2lM)c=0#t98ai;<qw_~9Koo<IGJx%}s

diff --git a/widgets/loading_dialog_widget.py b/widgets/loading_dialog_widget.py
index 867416d..f6f0840 100644
--- a/widgets/loading_dialog_widget.py
+++ b/widgets/loading_dialog_widget.py
@@ -234,14 +234,35 @@ class LoadingDialog(LoadingDialogUI):
             logging.error(f"查询订单信息失败: {e}")
             QMessageBox.critical(self, "错误", f"查询订单信息失败: {str(e)}")
     
+    def on_xpack_query(self, tray_id):
+        """通过托盘号查询订单信息，并回显到页面（完全仿照on_order_query）"""
+        try:
+            query_params = {
+                "xpack": tray_id,
+                "corp_id": self.corp_id
+            }
+            dialog = OrderQueryDialog(self)
+            results = dialog.query_orders_xpack(query_params)
+            if results:
+                if len(results) == 1:
+                    self.on_order_selected(results[0])
+                    return
+                else:
+                    dialog.update_result_table(results)
+                    dialog.order_selected.connect(self.on_order_selected)
+                    dialog.exec()
+                    return
+            QMessageBox.warning(self, "提示", "未找到该托盘号对应的订单信息")
+        except Exception as e:
+            logging.error(f"托盘号查订单接口异常: {e}")
+            QMessageBox.warning(self, "错误", f"托盘号查订单接口异常: {str(e)}")
+
     def on_tray_entered(self):
-        """处理托盘号输入框回车事件"""
         tray_id = self.tray_input.text().strip()
         if not tray_id:
             QMessageBox.warning(self, "提示", "请输入托盘号")
             return
-        
-        # 设置焦点到托盘料输入框
+        self.on_xpack_query(tray_id)
         self.pallet_tier_value.setFocus()
     
     def keyPressEvent(self, event):
diff --git a/widgets/order_query_dialog.py b/widgets/order_query_dialog.py
index fa7af56..3448127 100644
--- a/widgets/order_query_dialog.py
+++ b/widgets/order_query_dialog.py
@@ -321,6 +321,24 @@ class OrderQueryDialog(OrderQueryDialogUI):
         
         return results
     
+    def query_orders_xpack(self, params):
+        """通过托盘号查订单数据，返回列表"""
+        try:
+            gc_api = GcApi()
+            response = gc_api.get_order_info_by_xpack(params.get("xpack"), params.get("corp_id"))
+            if response and response.get("status", False):
+                orders_data = response.get("data", [])
+                results = []
+                for order_data in orders_data:
+                    results.append(order_data)
+                self.query_results = results
+                return results
+            else:
+                return []
+        except Exception as e:
+            logging.error(f"通过托盘号查订单数据失败: {e}")
+            return []
+    
     def update_result_table(self, results):
         """更新结果表格