From dc92fb6eab1c4766511fca1438fc5564f20246d0 Mon Sep 17 00:00:00 2001 From: zhu-mengmeng <15588200382@163.com> Date: Sun, 20 Jul 2025 14:08:49 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E4=B8=8B=E6=96=99?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=9A=84=E5=B1=9E=E6=80=A7=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=B0=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/jtDB.db | Bin 192512 -> 192512 bytes widgets/main_window.py | 9 +++-- widgets/order_query_dialog.py | 71 ++++++++++++++++++---------------- 3 files changed, 43 insertions(+), 37 deletions(-) diff --git a/db/jtDB.db b/db/jtDB.db index 4765c2899daf0010048ec0eb2b7578cb815c4927..c3f565614ec7d07f73130cdab02b794b05eb5470 100644 GIT binary patch delta 1503 zcmZ{kZA@Eb6vyv#ZfR-D<-L?)7h0h@v21Mtd5ItkG0R3ahR)&0R7|$$)EHbCH4#U9 zo1nlZFVEocQXPfC3OE=x0fGV{@r#LxCD9n85YXKVWB8UuGZS^*7NOl>pKfw~=YP(* z=XsvLeMxO!Qa3+Ds#!gj5oP^L1dNdbbS@m7&=QM_6ZynmPs&=)dkrqM=;xl&pCFGY9be z1>otyz5;Nvw7$JnU@8KGdD?+;KJi+dMxeE93kia@>DdSPX16qf}^BS39K#z5Re zzZl{}8Jw2kJLlkGHqKz6uHiBK_AQ8}&wgx&Gprw^5(D;}1Mf!MdyR)`z=i5So0B6R zx!BexzCVFOHb{k&1bxz1YE&{hAis$oVUqX$F&b6K*0M=d;k)aNiH?U_ZELxV$q2Wa zty$^j>~yPHZ^_8Z%FWBPXj@NgCz+N!OP03v`TL1=Q&YB`Sab8TtlHM&JCW=_qvv)& z8F`sG+SX$`6SLEId%|~{SX{f=vy7T7Fk~U}buL*wuj*GWC^g|}@;hN)$vUNfoF%L? zHVJ=sNxLxO<&VG{Ac4kRCg^Lo4+A%B;J^`-9PL%0!J01V zxg=v_7j!7a&JodjU78hBx}lC7#G!6~bM$qCN50zFB#sZ@+b*z?Sp3Z;k-*;5vFJmn z+rIqq9*`I6=9oy4`!eDab%&}-Ssq@f(1qQR{mC}L9%fE5gv-F6!n;d>TJ|5oghfA) znr*eRuw;>x!KuXd<-lo6nVttGX@f~7{A=++<&J}+7Ndp0a@~VzSRsJpo;PdIpkqyH z7ceRVZC+R53nDoFcdHUG#BbxZD?v`Qcyv{&zTtD&yDGiu4WlaoZ7i0qZk9IT)XgB1 z?xuZhQxk{tOD8^k3v delta 645 zcmYk3T}YE*6vy9l9^KbFrzVr-*PQGnY8nLIRz^3DP`B(tluQV^i7=+l1e5Ju*%yoC zsSZMx(nYh(QlTe|^rpL{UZu=Fv_;soTwr$5&7ijo^XeRa|Nr^moKRd2#pNsc;O!~c z58jcc)E=lEYup=a%A1lhx7o_AGjgk?&D>%9Y3NEfvvaU0O>zJ7eay9ra0GJ!BTjy2 zKoO3Mcp7-sZAFYW`Y^46 zonjg{YO7<}S#ucC)`YeOyKWRpk|eW$WNWv6mt&Tr<{DGf_}s9P{xt0-3+UcMjH%n* zqhCEh)7MbpzHh&nT3R9=Ov6q97cI=d0u)oc7u~#hrH?-L>ZaxueeYLr5{ksW*N_8P z=;8iByEs0p7m=$E6*2J!TmbnZJ_qLk@<@*d#glhX4v+fLP*ISQY)cuM^|9P<=`tTP zRU1nUmUJ5%!#XL&v$NhawQeg_&4ZuppRkiAKR^^5LI?FgJ)iXfQww@87VgO9zCrh& zQ+lX!5yMp3f;-S@CuaiPG<+6|xi4v@17CE>dj_jfby86RmH$$6LYEr4(FZy7GN~77 z-TGUuE@5z;ZrMbKm)B_xIq#$d 0 and self._current_unload_info: diff --git a/widgets/order_query_dialog.py b/widgets/order_query_dialog.py index 9f4c33d..1210217 100644 --- a/widgets/order_query_dialog.py +++ b/widgets/order_query_dialog.py @@ -129,6 +129,7 @@ class OrderQueryDialog(OrderQueryDialogUI): "note": order_data.get("note", ""), "mo": order_data.get("mo", ""), "customer": order_data.get("customer", ""), + "customerexp": order_data.get("customerexp", ""), "khno": order_data.get("khno", ""), "ddzl": order_data.get("ddzl", ""), "khjq": order_data.get("khjq", ""), @@ -228,7 +229,7 @@ class OrderQueryDialog(OrderQueryDialogUI): # 构建SQL查询 sql = """ SELECT - o.note, o.mo, o.customer, o.khno, o.ddzl, o.khjq, o.code, o.type, + o.note, o.mo, o.customer, o.customerexp, o.khno, o.ddzl, o.khjq, o.code, o.type, o.cz, o.size, o.cd, o.maxsl, o.spack, o.zx_name, o.zx_code, o.zx_zl, o.template_name, o.bqlb, o.dycz, o.luno, o.corp, o.sl, o.tccd, o.bccd, o.ysl, o.qfqd, o.yzgg, o.tqd, o.bqd, o.bzfs, o.ddyq, o.remarks_hb, @@ -274,39 +275,40 @@ class OrderQueryDialog(OrderQueryDialogUI): "note": row[0], "mo": row[1], "customer": row[2], - "khno": row[3], - "ddzl": row[4], - "khjq": row[5], - "code": row[6], - "type": row[7], - "cz": row[8], - "size": row[9], - "cd": row[10], - "maxsl": row[11], - "spack": row[12], - "zx_name": row[13], - "zx_code": row[14], - "zx_zl": row[15], - "template_name": row[16], - "bqlb": row[17], - "dycz": row[18], - "luno": row[19], - "corp": row[20], - "sl": row[21], - "tccd": row[22], - "bccd": row[23], - "ysl": row[24], - "qfqd": row[25], - "yzgg": row[26], - "tqd": row[27], - "bqd": row[28], - "bzfs": row[29], - "ddyq": row[30], - "remarks_hb": row[31], - "bz_tqd": row[32], - "bz_bqd": row[33], - "zzyq": row[34], - "rq": row[35] + "customerexp": row[3], + "khno": row[4], + "ddzl": row[5], + "khjq": row[6], + "code": row[7], + "type": row[8], + "cz": row[9], + "size": row[10], + "cd": row[11], + "maxsl": row[12], + "spack": row[13], + "zx_name": row[14], + "zx_code": row[15], + "zx_zl": row[16], + "template_name": row[17], + "bqlb": row[18], + "dycz": row[19], + "luno": row[20], + "corp": row[21], + "sl": row[22], + "tccd": row[23], + "bccd": row[24], + "ysl": row[25], + "qfqd": row[26], + "yzgg": row[27], + "tqd": row[28], + "bqd": row[29], + "bzfs": row[30], + "ddyq": row[31], + "remarks_hb": row[32], + "bz_tqd": row[33], + "bz_bqd": row[34], + "zzyq": row[35], + "rq": row[36] } results.append(order_data) @@ -334,6 +336,7 @@ class OrderQueryDialog(OrderQueryDialogUI): {"title": "订单号", "field": "note"}, {"title": "订单明细", "field": "mo"}, {"title": "客户", "field": "customer"}, + {"title": "客户名称", "field": "customerexp"}, {"title": "客户订单号", "field": "khno"}, # 修改标题以区分 {"title": "订单类别", "field": "ddzl"}, {"title": "客户交期", "field": "khjq"},