diff --git a/inventory-backend/app/services/print/network_print_service.py b/inventory-backend/app/services/print/network_print_service.py index 8b0650c..4a6426c 100644 --- a/inventory-backend/app/services/print/network_print_service.py +++ b/inventory-backend/app/services/print/network_print_service.py @@ -1,114 +1,40 @@ -import socket # .material -> .base refactor checked +import socket import datetime class NetworkPrintService: - def __init__(self, ip='192.168.9.205', port=9100): - """ - 初始化网络打印机服务 - :param ip: 打印机IP，默认 192.168.9.205 - :param port: 端口，默认 9100 - """ + def __init__(self, ip='192.168.9.250', port=9100): self.ip = ip self.port = port def _send_to_printer(self, content): - """底层发送方法""" - try: - # 建立 Socket 连接 - with socket.socket(socket.socket.AF_INET, socket.socket.SOCK_STREAM) as s: - s.settimeout(5) # 设置5秒超时 - s.connect((self.ip, self.port)) - - # 发送内容，使用 GB18030 编码以支持中文 - s.sendall(content.encode('gb18030')) - - # 发送切纸指令 (ESC/POS: GS V m) - # 十六进制: 1D 56 42 00 - s.sendall(b'\x1d\x56\x42\x00') - - return True, "打印成功" - except Exception as e: - print(f"[NetworkPrint Error] {str(e)}") - return False, f"打印失败: {str(e)}" + """ + 对于 A4 打印机，后端直接发送 Socket 指令通常无效或导致乱码。 + 因此这里只做日志记录，实际打印由前端浏览器完成。 + """ + print(f"--- [后端日志] 收到打印请求 (实际由前端处理) ---\n{content}\n----------------") + return True, "记录成功" def print_outbound_selection(self, items): """ - 打印出库选单 (拣货单) - :param items: 选中的物品列表 + 仅记录出库日志，不发送物理指令 """ - timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") + try: + timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M") + total_qty = sum([float(i.get('quantity', 0)) for i in items]) - lines = [] - lines.append("\n") - lines.append("********************************") - lines.append(" 出库拣货确认单 ") - lines.append("********************************") - lines.append(f"打印时间: {timestamp}") - lines.append(f"待出库总数: {len(items)} 件") - lines.append("--------------------------------") - lines.append(f"{'名称':<14}{'规格/批号':<10}") - lines.append("--------------------------------") + # 简单构造一个日志字符串 + log_content = f"出库时间: {timestamp}, 总数: {int(total_qty)}\n" + for item in items: + log_content += f"- {item.get('name')} (规格:{item.get('standard')}) x {item.get('quantity')}\n" - for item in items: - # 获取名称，优先取 material_name, 其次 product_name - name = item.get('material_name') or item.get('product_name') or "未知物品" - if len(name) > 14: name = name[:13] + "." # 名称过长截断 + # 调用虚拟发送 + return self._send_to_printer(log_content) - standard = item.get('standard', '') - batch = item.get('batch_no', '') - uuid = item.get('uuid', '')[-6:] # 只显示UUID后6位 - - lines.append(f"{name:<14} {standard}") - lines.append(f"批号: {batch} | 尾号: {uuid}") - lines.append("- - - - - - - - - - - - - - - -") - - lines.append("\n") - lines.append("库管员签字: ______________") - lines.append("领料人签字: ______________") - lines.append("\n\n\n") # 走纸 - - content = "\n".join(lines) - return self._send_to_printer(content) + except Exception as e: + print(f"日志记录失败: {e}") + return True, "记录忽略" # 即使失败也不要在前端报错 def print_stocktake_report(self, data): - """ - 打印盘点统计报告 - :param data: 包含 total, scanned, missing, missing_items - """ - total = data.get('total', 0) - scanned = data.get('scanned', 0) - missing = data.get('missing', 0) - missing_items = data.get('missing_items', []) - timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") - - lines = [] - lines.append("\n") - lines.append("================================") - lines.append(" 库存盘点统计报告 ") - lines.append("================================") - lines.append(f"盘点时间: {timestamp}") - lines.append(f"应盘总数: {total}") - lines.append(f"实盘(已扫): {scanned}") - lines.append(f"差异(未扫): {missing}") - lines.append("--------------------------------") - - if missing == 0: - lines.append("【结果】: 账实相符，库存完美！") - else: - lines.append("【差异明细 (未扫码物品)】:") - for item in missing_items: - name = item.get('material_name') or item.get('product_name') or "未知" - batch = item.get('batch_no', '-') - # 兼容不同模型的字段 - code = item.get('uuid', item.get('bar_code', 'N/A'))[-6:] - - lines.append(f"[ ] {name}") - lines.append(f" 批:{batch} 码:{code}") - - lines.append("\n") - lines.append("监盘人: ______________") - lines.append("\n\n\n") - - content = "\n".join(lines) - return self._send_to_printer(content) + # 同样处理 + return self._send_to_printer(f"盘点报告: 应盘{data.get('total')}, 实盘{data.get('scanned')}") \ No newline at end of file diff --git a/inventory-web/src/views/outbound/Selection.vue b/inventory-web/src/views/outbound/Selection.vue index a5cd086..8ae3270 100644 --- a/inventory-web/src/views/outbound/Selection.vue +++ b/inventory-web/src/views/outbound/Selection.vue @@ -1,14 +1,14 @@