Accept Merge Request #1384: (feature/制造功能优化 -> develop)

Merge Request: 调整依赖、配置

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1384?initial=true

sf_dlm/__manifest__.py

@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_base', 'web_widget_model_viewer', 'mrp_subcontracting', 'purchase_stock', 'uom', ],
+    'depends': ['sf_base', 'mrp_subcontracting', 'purchase_stock', 'uom'],
     'data': [
         'data/product_data.xml',
         'data/uom_data.xml',

sf_machine_connect/__manifest__.py

@@ -12,7 +12,7 @@
     'category': 'sf',
     'author': 'jikimo',
     'website': 'https://sf.cs.jikimo.com',
-    'depends': ['web', 'mail', 'sf_base', 'sf_manufacturing', 'barcodes', ],
+    'depends': ['web', 'sf_manufacturing', 'barcodes'],
     'data': [
         # 定义权限组放在最上面
         # 权限组

sf_machine_connect/controllers/controllers.py

@@ -15,7 +15,7 @@ db_config = {
     "user": "postgres",
     "password": "postgres",
     "port": "5432",
-    "host": "172.16.10.113"
+    "host": "172.16.10.131"
 }
 
 
@@ -1306,9 +1306,9 @@ class Sf_Dashboard_Connect(http.Controller):
             res['data'][item] = {
                 'wait_time': last_all_time['run_time'] if last_all_time['run_time'] is not None else 0,
                 'cut_time': last_all_time['process_time'] if last_all_time['process_time'] is not None else 0,
-                'cut_24_time': last_24_time['process_time'] if last_24_time['process_time'] is not None else 0,
+                'cut_24_time': last_24_time['process_time'] if last_24_time else 0,
                 'power_on_time': last_all_time['power_on_time'] if last_all_time['power_on_time'] is not None else 0,
-                'power_on_24_time': last_24_time['power_on_time'] if last_24_time['power_on_time'] is not None else 0,
+                'power_on_24_time': last_24_time['power_on_time'] if last_24_time else 0,
                 'alarm_last_24_time': alarm_last_24_time,
                 'alarm_last_24_nums': len(list(set(alarm_last_24_nums))),
                 'idle_count': idle_count,

sf_tool_management/__manifest__.py

@@ -6,7 +6,7 @@
     'summary': '智能工厂刀具管理',
     'sequence': 1,
     'description': """
-在本模块，定义了主要的角色、菜单、基础业务对象
+在本模块，定义了刀具相关的模型和视图，以及相关的业务逻辑。
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',

tool_service/装夹自动保存检测文件服务/app.py

@@ -0,0 +1,160 @@
+from fastapi import FastAPI, HTTPException
+from pydantic import BaseModel
+import os
+from ftplib import FTP
+import win32gui
+import win32con
+import logging
+import time
+
+# 配置日志记录
+logging.basicConfig(filename='service.log', level=logging.INFO,
+                    format='%(asctime)s - %(levelname)s - %(message)s')
+
+app = FastAPI()
+
+
+class FileUploadRequest(BaseModel):
+    filename: str
+
+
+# FTP 服务器配置信息
+ftp_host = '110.52.114.162'
+ftp_port = 10021
+ftp_user = 'ftpuser'
+ftp_password = '123456'
+ftp_directory = '/home/ftp/ftp_root/ThreeTest/XT/Before/'
+
+
+def find_child_window(parent_hwnd, class_name):
+    def enum_child_windows(hwnd, lparam):
+        class_name = win32gui.GetClassName(hwnd)
+        if class_name == lparam:
+            child_hwnds.append(hwnd)
+        return True
+
+    child_hwnds = []
+    win32gui.EnumChildWindows(parent_hwnd, enum_child_windows, class_name)
+    return child_hwnds
+
+
+def find_child_window_by_partial_title(parent_hwnd, partial_title):
+    def enum_child_windows(hwnd, lparam):
+        # 获取窗口的标题
+        title = win32gui.GetWindowText(hwnd)
+        # 检查标题是否包含指定的部分标题
+        if partial_title in title:
+            child_hwnds.append(hwnd)
+        return True
+
+    child_hwnds = []
+    win32gui.EnumChildWindows(parent_hwnd, enum_child_windows, None)
+    return child_hwnds
+
+
+def find_child_window_by_title(parent_hwnd, title):
+    def enum_child_windows(hwnd, lparam):
+        if win32gui.GetWindowText(hwnd) == lparam:
+            child_hwnds.append(hwnd)
+        return True
+
+    child_hwnds = []
+    win32gui.EnumChildWindows(parent_hwnd, enum_child_windows, title)
+    return child_hwnds
+
+
+def set_path_and_save(filename):
+    parent_hwnd = win32gui.FindWindow(None, '另存为')
+
+    if parent_hwnd == 0:
+        raise HTTPException(status_code=404, detail="没有找到保存报告的窗口，请检查！")
+
+    # 这里假设“地址:”是你需要的部分标题
+    address_hwnds = find_child_window_by_partial_title(parent_hwnd, "地址:")
+
+    # 确保找到的窗口句柄有效
+    if not address_hwnds:
+        raise HTTPException(status_code=404, detail="未找到地址框，请联系管理员！")
+
+    # 假设找到的第一个窗口是目标组件
+    address_hwnd = address_hwnds[0]
+    logging.info(f"找到地址框地址: {win32gui.GetWindowText(address_hwnd)}")
+
+    # 设置路径
+    local_file_path = os.path.join(win32gui.GetWindowText(address_hwnd).split(' ')[1], filename)
+    logging.info(f"设置路径: {local_file_path}")
+
+    path_hwnds = find_child_window(parent_hwnd, 'Edit')
+
+    if not path_hwnds:
+        raise HTTPException(status_code=404, detail="未找到路径框")
+
+    path_hwnd = path_hwnds[0]
+    win32gui.SendMessage(path_hwnd, win32con.WM_SETTEXT, 0, filename)
+
+    button_hwnds = find_child_window_by_title(parent_hwnd, '保存(&S)')
+
+    if not button_hwnds:
+        raise HTTPException(status_code=404, detail="未找到保存按钮")
+
+    save_button_hwnd = button_hwnds[0]
+    win32gui.PostMessage(save_button_hwnd, win32con.BM_CLICK, 0, 0)
+
+    return local_file_path
+
+
+def wait_for_file_to_save(filepath, timeout=30):
+    start_time = time.time()
+
+    while time.time() - start_time < timeout:
+        if os.path.isfile(filepath):
+            return True
+        time.sleep(0.1)
+
+    return False
+
+
+def upload_file_to_ftp(local_file):
+
+    if not os.path.isfile(local_file):
+        raise HTTPException(status_code=204, detail="文件未找到")
+
+    ftp = FTP()
+    try:
+        ftp.connect(ftp_host, ftp_port)
+        ftp.login(ftp_user, ftp_password)
+        ftp.cwd(ftp_directory)
+        with open(local_file, 'rb') as file:
+            ftp.storbinary(f'STOR {os.path.basename(local_file)}', file)
+        return True
+    except Exception as e:
+        print(f"文件上传失败: {e}")
+        return False
+    finally:
+        ftp.quit()
+
+
+@app.post("/get/check/report")
+async def upload_file(request: FileUploadRequest):
+    # 设置路径框并点击保存
+    local_file_path = set_path_and_save(request.filename)
+    logging.info(f"文件上传请求: {request.filename}")
+    logging.info(f"文件保存路径: {local_file_path}")
+
+    # 等待文件保存完成
+    if not wait_for_file_to_save(local_file_path):
+        raise HTTPException(status_code=500, detail="文件保存超时")
+
+    # 上传文件到 FTP
+    success = upload_file_to_ftp(local_file_path)
+    if success:
+        ftp_file_path = os.path.join(ftp_directory, request.filename)
+        return {"ftp_file_path": ftp_file_path}
+    else:
+        raise HTTPException(status_code=500, detail="文件上传失败")
+
+
+if __name__ == "__main__":
+    import uvicorn
+
+    uvicorn.run(app, host="0.0.0.0", port=8000)

tool_service/装夹自动保存检测文件服务/readme.md

@@ -0,0 +1,5 @@
+app.py是主程序文件，主要功能是监听装夹自动保存文件，并将其上传到FTP服务器。
+
+需要讲app.py做成一个exe文件，可以用pyinstaller工具。
+
+然后在windows的计划任务中执行此exe文件即可。