BigMeng/jiateng_ws
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 更新下料标签的属性检查，添加客户扩展信息到订单查询

Browse Source
This commit is contained in:
zhu-mengmeng 2025-07-20 14:08:49 +08:00
parent 516d7cb99b
commit dc92fb6eab
3 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
db/jtDB.db
View File

Binary file not shown.

9
widgets/main_window.py
View File

@ -2753,8 +2753,10 @@ class MainWindow(MainWindowUI):
QMessageBox.information(self, "下料完成", desc)
# 任务完成，清除状态显示
self.clear_operation_status("output")
self.unloading_level_label.setText("下料层数：--")
self.unloading_position_label.setText("下料位置：--")
if hasattr(self, 'unload_level_label'):
self.unload_level_label.setText("下料层数：--")
if hasattr(self, 'unload_position_label'):
self.unload_position_label.setText("下料位置：--")
# 下料任务完成，恢复下料按钮样式
self.restore_output_button_style()
logging.info("下料任务完成，恢复下料按钮样式")
@ -2899,7 +2901,8 @@ class MainWindow(MainWindowUI):
"""在主线程中更新下料层数UI"""
try:
# 更新显示
self.unloading_level_label.setText(f"下料层数：{level}")
if hasattr(self, 'unload_level_label'):
self.unload_level_label.setText(f"下料层数：{level}")
# 如果有下料信息且层数大于0，更新右上角显示
if level > 0 and self._current_unload_info:

71
widgets/order_query_dialog.py
View File

@ -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"},