From c257150bdd016eb7ae3310c8f4e889e00dd7f0f8 Mon Sep 17 00:00:00 2001
From: zhu-mengmeng <15588200382@163.com>
Date: Thu, 19 Jun 2025 08:40:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8F=B7=E7=9A=84=20API=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=E6=96=B0=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=BC=98=E5=8C=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95=E5=92=8C=E7=94=A8=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/gc_api.py          |  19 +++++++++++++++++++
 config/app_config.json  |  13 +++++++------
 dao/inspection_dao.py   |   2 +-
 db/jtDB.db              | Bin 77824 -> 77824 bytes
 widgets/login_widget.py |  13 +++++++++++++
 widgets/main_window.py  |   6 ++++--
 6 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/apis/gc_api.py b/apis/gc_api.py
index b981c21..61b7bf9 100644
--- a/apis/gc_api.py
+++ b/apis/gc_api.py
@@ -80,4 +80,23 @@ class GcApi:
             return response
         except Exception as e:
             logging.error(f"添加订单信息失败: {str(e)}")
+            return None
+    
+    def get_xpack(self, order_id):
+        """
+        获取包装号
+        """
+        try:
+            # API 配置中的键名
+            api_key = "get_xpack"
+            # 构建 form-data 格式的数据
+            data = {
+                "ddmo": order_id,   
+                "data_corp":"JT"
+            }
+            # 将工程号作为参数传递，使用 data 参数传递 form-data 格式数据
+            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 a46b7fb..9c7ef30 100644
--- a/config/app_config.json
+++ b/config/app_config.json
@@ -14,7 +14,8 @@
         "get_tray_info": "/apjt/xcsc/tpda/getByTp_note/",
         "get_gc_info": "/jsjt/xcsc/tprk/getBZGCInfoToWsbz.do",
         "get_order_info": "/jsjt/xcsc/tprk/getXsddBzrkGridListToWsbz.do",
-        "add_order_info": "/jsjt/xcsc/tprk/bzrkAdd01.do"
+        "add_order_info": "/jsjt/xcsc/tprk/bzrkAdd01.do",
+        "get_xpack":"/jsjt/xcsc/tprk/getXpackToWsbz.do"
     },
     "database": {
         "default": "sqlite",
@@ -24,11 +25,11 @@
                 "description": "默认SQLite数据库"
             },
             "postgresql": {
-                "host": "localhost",
-                "port": "5432",
-                "user": "postgres",
-                "password": "",
-                "name": "jtDB",
+                "host": "221.229.106.186",
+                "port": "54321",
+                "user": "tzwalechat",
+                "password": "jsjt@2024",
+                "name": "tz_tzwalechat",
                 "description": "PostgreSQL数据库"
             },
             "mysql": {
diff --git a/dao/inspection_dao.py b/dao/inspection_dao.py
index d9e1f59..751f934 100644
--- a/dao/inspection_dao.py
+++ b/dao/inspection_dao.py
@@ -244,7 +244,7 @@ class InspectionDAO:
                 data.get("user_id", ""),
                 data.get("user_name", ""),
                 data.get("zx_zl", ""),
-                data.get("note", ""),
+                data.get("mo", ""),
                 data.get("xpack", ""),
                 order_id if order_id else "",
                 data.get("qd", ""),
diff --git a/db/jtDB.db b/db/jtDB.db
index e64b73d84755e8e528e284bd5f83650e37a9309e..f50f68c8d727f13cfb0f7a8da3610a5ffac10ce1 100644
GIT binary patch
delta 2102
zcmd5+U1%It6ux(6(%DV+&Tg`f*-09+F<CV+Gntv)`PnISO{r41q*@3zsl?sHnkMGQ
zgss>L)m=u4NGh?nbg3ZXL*EpQ^B{@ZsGv^;p~a#Il0v{2v8hNywG{8{X4|Q$)CC`$
z;V_)}=A84L@18mN6(+yJ%r|jt8UPR`<|D?w^^i`n>4og66kKrDQ?=1nxD9lGTnIG;
z&jfdY9Q=qr?fcxPp^LDOy+9i{n(YXHi-C{1cc>iwC$|mPhuZP{SbD;+6wQjqb4PNA
zo|{VdKe<!YWL=i!_=w%jff$55kK#gH@WlrD)BOZYBxKW|C|Od>nc-Ycl~qlYbx|>+
zif$!TD`Av#c>z*Hwi5W#WSFNKKm%#Pb7k#DoIN1GB>rGbz$=qJoS6zRBt*w>l&3Rx
zLoweDBQ>TO2q<`AtkcCbyf(@+)DK{obTUL|?H)IWYSh&!ay7IRHxEnLFhk%Ol4?Jx
zCzR?H*Cfb5w;+Ezsr*+isc?l9LM2kr!0&z+A%I*0cAExaTNM*azQZZh94mF0alSb4
z6r|X5#n}$H%gK&T!dl-vaEWK^$Oe^US)ZG9x4IfyYGU)*4%j?iI4|JUsU}zKmhy+{
z<`4btKqRVk2A{R>DNRFTc^a@Vt==W_7cfF1GtRN`uOa<DkciXe9G*x(KRN=o05D*S
zE{ATzJ1GBRf=<lT(8D%|zdb16hVh;)?l4#i?)@h0s=>v<5UDgs@3-$QzSjvO#j`yy
zgg=}@E?st`QG98P_ql%(QBNtUr<n#h$ZF54xbPqhQ?^v9)MFYnU1c*A0Qma!yr&6#
z=7k*|_rwe<5V1fVG57aJ#5iIBVj(9wvl@)lvN~XwSUvbMca<AQt7u=~e4wvx+1Z-!
z@KJODpM5EUe>#kugRl3~Y=IHELY;`u%?V^=GjmO^8kVeCsv;RlUD1?jZwFq;*qEcc
z;g38$c$!>q7pQJ720*O7*WWAj3O>JQe<VGN20uR+93+JlOVy;fY{-WGw-PrIQ@+z`
zxfNN#3)I7v()jZ6`|!jZw^z3`GF(YXF;tz{ZCmRWqG_8ecq28vj2CLV@Z_5hIQiqR
z-5+3(2!fAtZ=lOabm~Jb=!rr~h}O5Xgh4xsksGx(^C=_<&AiYC1ilp@gwkZ2W_ow_
zJ-(;%lqJ2iU=>+5Ma83*fq(nskUtV}Q}Uo4FWqQvtprt`vJ}_K>sgMQqKbdLF$f#+
zm1~R6W6Mj?E_ZAg)CPhn?kM^Uwb3vB(@h%KP5&<%*vF8um++VCi+FZzkqP`*^L@$r
z`HJf>BgFZHL8ri{?px==?>!WGUH0(u`XY&@V+7h!TZk~#NjKo%PFEuKUfnFVA|)$g
eD@jqov)5kPlcN6f6W<Q2BXRU3WE^Jgdg?DMbSPl}

delta 766
zcmY*WTSyd97(QobW_NPuvg_{bj-@%8me*x3GqdA7<OK||7at^{l6LX7(rT7LmJz#*
zNLhyRLraeaJ=H@ozT`tiQ4~q^(rc_>^cD$WggtZy%eJ5M9nSy%-}(42xgwn_(o6dV
z_bNgtK)@0(%MH5Az4|zHryW1Af3%k=)yzCPNDor%ws>FcVVCGZ;jU1|zv1WjTF*N7
z5R_CM$CQ}u_wh89vdW<^U4aeg7zx3<p|D#sRozsf^L4;}K70bZ*l6K=9qzGHqghO)
zEx9n*jAggc#&NM26f;d8)r_mArh<PwK%GP>@cT}~bgI`wgpwxV)J#fHK5^XfiEx7O
zB-}z+4fg!_D@=Vy5#lu2GiOyybz2qS`xq*Gjo=Uz(+p&XSh(?mqlJN88g<4B7jlQN
z%ouH6ZxS{#jkHq$;Fl8BX@wv?D#O-9mGg;ew<M^^%FvfN;P_&%6%<fC#$kz1R3HTF
znK+4yxQi5Ul#C+ajDj(Eo>aY&k>LGMkansrth8bYeoZdz^#JGk_uizxDzXwp6L<-n
z9q|OhAD^?8sZCL4Jv#ENd35oLuq}-9oBROxmg{mqvMY0Stc$)0PcO;vX@<AQuJ==r
zn`L>;n7%xHabzOHe?eE_!|a89d2fqQk5IiIQi}@g+!7ke<PB4eM^r7E(4tfEXk2TJ
z>a8(DiIt{w9ahGImH)VUa#y<}?`{5H@`z@}$Vo=p;(Ag|OqNQPrXV^TtS$|xe<e>*
z3CHqfO_05P*v>7^)v_*O0g2thg6;QR6R5lqhOM7Z>|@W?6oDag!r~6O5hw20e&w^c
N+~;-qq<h~wegiCR%+vq?

diff --git a/widgets/login_widget.py b/widgets/login_widget.py
index 9ffb786..1808602 100644
--- a/widgets/login_widget.py
+++ b/widgets/login_widget.py
@@ -6,10 +6,17 @@ from widgets.main_window import MainWindow
 from utils.sql_utils import SQLUtils
 import logging
 import threading
+from utils.app_mode import AppMode
 
 def check_user_login(user_id, password):
     """验证用户登录"""
     try:
+        if AppMode.is_api():
+            db = SQLUtils(source_name='postgresql')
+            db.execute_query("select user_id from x_userinfo t1 where t1.user_id = %s and t1.user_pwd = md5(%s)", (user_id, password))
+            result = db.fetchone()
+            db.close()
+            return result is not None
         # 始终使用SQLite数据源验证登录
         db = SQLUtils(source_name='sqlite')
         db.execute_query("SELECT id FROM wsbz_user WHERE username = ? AND password = ? AND is_deleted = 0", (user_id, password))
@@ -23,6 +30,12 @@ def check_user_login(user_id, password):
 def get_user_info(user_id):
     """获取用户信息"""
     try:
+        if AppMode.is_api():
+            db = SQLUtils(source_name='postgresql')
+            db.execute_query("select t1.user_id,t2.corp_name,t1.corp_id from x_userinfo t1 left join x_corp t2 on t1.corp_id = t2.corp_id where user_id = %s", (user_id,))
+            result = db.fetchone()
+            db.close()
+            return result
         # 始终使用SQLite数据源获取用户信息
         db = SQLUtils(source_name='sqlite')
         db.execute_query("SELECT username,  corp_id as corp_name, corp_id FROM wsbz_user WHERE username = ?", (user_id,))
diff --git a/widgets/main_window.py b/widgets/main_window.py
index f96befb..3e653b9 100644
--- a/widgets/main_window.py
+++ b/widgets/main_window.py
@@ -1139,7 +1139,6 @@ class MainWindow(MainWindowUI):
                     pass
                 
                 # 加载包装记录
-                self.show_pack_item()
                 return
             
             logging.info(f"已加载未完成的检验数据，共 {len(unfinished_data)} 条记录")
@@ -1865,7 +1864,10 @@ class MainWindow(MainWindowUI):
                     info = {}
                     order_info = inspection_dao.get_order_info(order_id)
                     info.update(order_info)
-                    
+                    # 获取包装号
+                    xpack = gc_api.get_xpack(order_info["ddmo"])
+                    info['xpack'] = xpack['xpack']
+                    info['spack'] = xpack['spack']
                     order_others_info = inspection_dao.get_order_others_info(order_id, tray_id)
                     info.update(order_others_info)
                     info['data_corp'] = 'T'