Ver código fonte

拍照机效率提升

rambo 5 meses atrás
pai
commit
34114426b8

+ 109 - 105
python/api.py

@@ -106,143 +106,147 @@ def fromExcelHandler(params: HandlerDetail):
     goods_art_dirs = excel_df.groupby(excel_df["款号"])
     obj = None
     run_main = RunMain(obj, token)
+    temp_class = {}
+    temp_name_list = []
+    for tempItem in params.temp_list:
+        temp_class[tempItem.template_id] = tempItem.template_local_classes
+        temp_name_list.append(tempItem.template_id)
+    goods_art_no_arrays = []
     for index, row in excel_df.iterrows():
         goods_art_no_image_dir = str(row["文件夹名称"])
         goods_art_no = str(row["商品货号"])
+        goods_art_no_arrays.append(goods_art_no)
         print("货号数据", goods_art_no)
         goods_no = str(row["款号"])
         a001_df = goods_art_dirs.get_group(goods_no)
         goods_art_nos = a001_df["商品货号"].tolist()
         print("goods_art_nos", goods_art_nos)
-        try:
-            if not goods_art_no:
-                raise UnicornException("货号不能为空")
-            session = SqlQuery()
-            pr = CRUD(PhotoRecord)
-            images = pr.read_all(session, conditions={"goods_art_no": goods_art_no})
-            if not images:
-                raise UnicornException("没有可用货号数据")
-            image_dir = "{}/data/{}".format(os.getcwd(), goods_no).replace("\\", "/")
-            check_path(image_dir)
-            for itemImg in images:
-                if itemImg.image_path == "" or itemImg.image_path == None:
-                    raise UnicornException(
-                        f"货号【{goods_art_no}】存在没有拍摄完成的图片,请重拍或删除后重试"
+        if not goods_art_no:
+            raise UnicornException("货号不能为空")
+        session = SqlQuery()
+        pr = CRUD(PhotoRecord)
+        images = pr.read_all(session, conditions={"goods_art_no": goods_art_no})
+        if not images:
+            raise UnicornException("没有可用货号数据")
+        image_dir = "{}/data/{}".format(os.getcwd(), goods_no).replace("\\", "/")
+        check_path(image_dir)
+        for itemImg in images:
+            if itemImg.image_path == "" or itemImg.image_path == None:
+                raise UnicornException(
+                    f"货号【{goods_art_no}】存在没有拍摄完成的图片,请重拍或删除后重试"
+                )
+            new_file_name = (
+                            str(itemImg.goods_art_no) + "_" + str(itemImg.id) + ".jpg"
                     )
-                new_file_name = (
-                        str(itemImg.goods_art_no) + "_" + str(itemImg.id) + ".jpg"
+            if not os.path.exists(
+                            image_dir + "/" + os.path.basename(new_file_name)
+                    ):
+                shutil.copy(itemImg.image_path, image_dir + "/" + new_file_name)
+        dealImage = DealImage(image_dir)
+        resFlag, path = dealImage.dealMoveImage(
+                    image_dir=image_dir,
+                    callback_func=None,
+                    goods_art_no=goods_art_no_image_dir,
                 )
-                if not os.path.exists(
-                        image_dir + "/" + os.path.basename(new_file_name)
-                ):
-                    shutil.copy(itemImg.image_path, image_dir + "/" + new_file_name)
-            dealImage = DealImage(image_dir)
-            resFlag, path = dealImage.dealMoveImage(
-                image_dir=image_dir,
-                callback_func=None,
-                goods_art_no=goods_art_no_image_dir,
-            )
-            if not resFlag:
-                raise UnicornException(path)
-            temp_class = {}
-            temp_name_list = []
-            for tempItem in params.temp_list:
-                temp_class[tempItem.template_id] = tempItem.template_local_classes
-                temp_name_list.append(tempItem.template_id)
-            # if goods_art_no_image_dir not in path:
-            #     path = path + "/" + goods_art_no_image_dir
-            config_data = {
-                "image_dir": path,
-                "image_order": params.template_image_order,
-                "goods_art_no": goods_art_no,
-                "goods_art_nos": goods_art_nos,
-                "is_check_number": False,
-                "resize_image_view": "后跟",
-                "cutout_mode": settings.CUTOUT_MODE,
-                "logo_path": params.logo_path,
-                "special_goods_art_no_folder_line": "",
-                "is_use_excel": (
-                    False if params.excel_path == "" else True
-                ),  # 是否使用excel
-                "excel_path": params.excel_path,  # excel路径
-                "is_check_color_is_all": False,
-                "cutout_is_pass": True,
-                "assigned_page_dict": {},
-                "detail_is_pass": False,
-                "upload_is_pass": False,
-                "upload_is_enable": False,
-                "is_filter": False,
-                "temp_class": temp_class,
-                "temp_name": params.temp_name,
-                "temp_name_list": temp_name_list,
-                "target_error_folder": f"{path}/软件-生成详情错误",
-            }
-            # 动态导入类
-            temp_class_dict = {}
-            for key, class_path in config_data["temp_class"].items():
-                module_path, class_name = class_path.rsplit(".", 1)
-                module = importlib.import_module(module_path)
-                cls = getattr(module, class_name)
-                temp_class_dict[key] = cls
-
-            config_data["temp_class"] = temp_class_dict
-            return_data = run_main.check_before_cutout(config_data)
-            cutout_res = run_main.check_for_cutout_image_first_call_back(return_data)
-            check_for_detail_first_res = None
-            if cutout_res:
-                return_data_check_before_detail = run_main.check_before_detail(
+        if not resFlag:
+            raise UnicornException(path)
+        # if goods_art_no_image_dir not in path:
+        #     path = path + "/" + goods_art_no_image_dir
+        path = os.path.dirname(path)
+    try:
+        print("path", path)
+        config_data = {
+            "image_dir": path,
+            "image_order": params.template_image_order,
+            "goods_art_no": goods_art_no,
+            "goods_art_nos": goods_art_no_arrays,
+            "is_check_number": False,
+            "resize_image_view": "后跟",
+            "cutout_mode": settings.CUTOUT_MODE,
+            "logo_path": params.logo_path,
+            "special_goods_art_no_folder_line": "",
+            "is_use_excel": (
+                False if params.excel_path == "" else True
+            ),  # 是否使用excel
+            "excel_path": params.excel_path,  # excel路径
+            "is_check_color_is_all": False,
+            "cutout_is_pass": True,
+            "assigned_page_dict": {},
+            "detail_is_pass": True,
+            "upload_is_pass": False,
+            "upload_is_enable": False,
+            "is_filter": False,
+            "temp_class": temp_class,
+            "temp_name": params.temp_name,
+            "temp_name_list": temp_name_list,
+            "target_error_folder": f"{path}/软件-生成详情错误",
+        }
+        # 动态导入类
+        temp_class_dict = {}
+        for key, class_path in config_data["temp_class"].items():
+            module_path, class_name = class_path.rsplit(".", 1)
+            module = importlib.import_module(module_path)
+            cls = getattr(module, class_name)
+            temp_class_dict[key] = cls
+
+        config_data["temp_class"] = temp_class_dict
+        return_data = run_main.check_before_cutout(config_data)
+        cutout_res = run_main.check_for_cutout_image_first_call_back(return_data)
+        check_for_detail_first_res = None
+        if cutout_res:
+            return_data_check_before_detail = run_main.check_before_detail(
                     config_data
                 )
-                print(
+            print(
                     "return_data_check_before_detail======> 测试 ==>",
                     return_data_check_before_detail,
                 )
-                check_for_detail_first_res = run_main.check_for_detail_first_call_back(
+            check_for_detail_first_res = run_main.check_for_detail_first_call_back(
                     return_data_check_before_detail
                 )
-            if isinstance(check_for_detail_first_res, partial):
-                result = check_for_detail_first_res()
-                try:
-                    config_data = result["config_data"]
-                except:
-                    config_data = result
-            if config_data["sign_text"] == "已结束详情处理":
-                # at_pic = AutoDealPics()
-                print("config_data", config_data)
-                if config_data["upload_is_enable"]:
-                    to_deal_dir = "{}/软件-详情图生成".format(config_data["image_dir"])
-                    check_path(to_deal_dir)
-                    print("to_deal_dir", to_deal_dir)
-                    if os.path.exists(to_deal_dir):
-                        upload_pic = UploadPic(
+        if isinstance(check_for_detail_first_res, partial):
+            result = check_for_detail_first_res()
+            try:
+                config_data = result["config_data"]
+            except:
+                config_data = result
+        if config_data["sign_text"] == "已结束详情处理":
+            # at_pic = AutoDealPics()
+            print("config_data", config_data)
+            if config_data["upload_is_enable"]:
+                to_deal_dir = "{}/软件-详情图生成".format(config_data["image_dir"])
+                check_path(to_deal_dir)
+                print("to_deal_dir", to_deal_dir)
+                if os.path.exists(to_deal_dir):
+                    upload_pic = UploadPic(
                             windows=None,
                             to_deal_dir=to_deal_dir,
                             config_data=config_data,
                             token=token,
                         )
-                        upload_pic.run()
-                out_put_dir = config_data["out_put_dir"]
-                out_put_dir_path = "{}/{}".format(os.getcwd(), out_put_dir).replace(
+                    upload_pic.run()
+            out_put_dir = config_data["out_put_dir"]
+            out_put_dir_path = "{}/{}".format(os.getcwd(), out_put_dir).replace(
                     "\\", "/"
                 )
-                handler_result_folder = os.path.dirname(out_put_dir_path)
-                handler_result.append(
+            handler_result_folder = os.path.dirname(out_put_dir_path)
+            handler_result.append(
                     {"goods_art_no": goods_art_no, "success": True, "info": "处理成功"}
                 )
-            else:
-                handler_result.append(
+        else:
+            handler_result.append(
                     {"goods_art_no": goods_art_no, "success": False, "info": "处理失败"}
                 )
-        except Exception as e:
-            handler_result.append(
+    except Exception as e:
+        handler_result.append(
                 {"goods_art_no": goods_art_no, "success": False, "info": str(e)}
             )
     handler_result_folder = "/".join(handler_result_folder.split("/")[:-1])
     return {
-        "code": 0,
-        "msg": "",
-        "data": {"output_folder": handler_result_folder, "list": handler_result},
-    }
+            "code": 0,
+            "msg": "",
+            "data": {"output_folder": handler_result_folder, "list": handler_result},
+        }
 
 
 def group_by_style_number(data):

+ 0 - 726
python/service/AutoDealPics.py

@@ -1,726 +0,0 @@
-import os
-
-
-#
-from .data import DataModeGenerateDetail
-from .base_deal import BaseDealImage
-from .run_main import RunMain
-from utils.utils_func import check_path
-from .upload_pic import UploadPic
-
-# 手动移动图片等操作
-from .manual_image_matching.m_image_matching_cotrol import (
-    MainMatchingWindow,
-)
-
-# 每个详情的模板
-from .detail_temp import TempItem
-
-from .load_plugins import LoadAllPlugins
-
-from functools import partial
-from threading import Lock
-
-# from module.view_control.MineQWidget import MineQWidget, DialogShow
-# from module.base_mode.base import *
-import threading
-import settings
-
-
-def queren_get_config():
-    config_data = {}
-    # config_data["cutout_is_enable"] = self.ui.cutout_is_enable.isChecked()
-    # config_data["cutout_is_pass"] = self.ui.cutout_is_pass.isChecked()
-    # config_data["detail_is_enable"] = self.ui.detail_is_enable.isChecked()
-    # config_data["detail_is_pass"] = self.ui.detail_is_pass.isChecked()
-    # config_data["upload_is_enable"] = self.ui.upload_is_enable.isChecked()
-    # config_data["upload_is_pass"] = self.ui.upload_is_pass.isChecked()
-
-    # # 保存配置
-    # settings.GOODS_DETAIL_CUTOUT_IS_ENABLE = self.ui.cutout_is_enable.isChecked()
-    # settings.GOODS_DETAIL_CUTOUT_IS_PASS = self.ui.cutout_is_pass.isChecked()
-    # settings.GOODS_DETAIL_DETAIL_IS_ENABLE = self.ui.detail_is_enable.isChecked()
-    # settings.GOODS_DETAIL_DETAIL_IS_PASS = self.ui.detail_is_pass.isChecked()
-    # settings.GOODS_DETAIL_UPLOAD_IS_ENABLE = self.ui.upload_is_enable.isChecked()
-    # settings.GOODS_DETAIL_UPLOAD_IS_PASS = self.ui.upload_is_pass.isChecked()
-
-    data_dict = {
-        # "goods_detail_cutout_is_enable": (
-        #     "是" if settings.GOODS_DETAIL_CUTOUT_IS_ENABLE else "否"
-        # ),
-        # "goods_detail_cutout_is_pass": (
-        #     "是" if settings.GOODS_DETAIL_CUTOUT_IS_PASS else "否"
-        # ),
-        # "goods_detail_detail_is_enable": (
-        #     "是" if settings.GOODS_DETAIL_DETAIL_IS_ENABLE else "否"
-        # ),
-        # "goods_detail_detail_is_pass": (
-        #     "是" if settings.GOODS_DETAIL_DETAIL_IS_PASS else "否"
-        # ),
-        # "goods_detail_upload_is_enable": (
-        #     "是" if settings.GOODS_DETAIL_UPLOAD_IS_ENABLE else "否"
-        # ),
-        # "goods_detail_upload_is_pass": (
-        #     "是" if settings.GOODS_DETAIL_UPLOAD_IS_PASS else "否"
-        # ),
-        "goods_detail_cutout_is_enable": "是",
-        "goods_detail_cutout_is_pass": "是",
-        "goods_detail_detail_is_enable": "是",
-        "goods_detail_detail_is_pass": "是",
-        "goods_detail_upload_is_enable": "是",
-        "goods_detail_upload_is_pass": "是",
-    }
-    settings.set_config(data_dict=data_dict, section="goods_detail")
-    return config_data
-
-
-# 抠图与详情生成
-class AutoDealPics:
-    # progress_sign = Signal(dict)
-    # text_show = Signal(str)
-    # progress_show_sign = Signal(bool)
-    # progress_end_sign = Signal()
-    # send_dialog_sign = Signal()
-    # change_state_sign = Signal(int)
-    # run_end_sign = Signal(dict)
-
-    def __init__(self, windows=None, top_windows=None):
-        super().__init__()
-        self.windows = windows
-        self.top_windows = top_windows
-        # self.ui = generate_goods_no_detail_pic_Ui_Form()
-        # self.ui.setupUi(self)
-        # self.setWindowFlags(self.windowFlags() & ~Qt.WindowStaysOnTopHint)
-
-        self.run_main = RunMain(windows=self)
-        # self.run_main.run_end_sign.connect(self.deal_run_end_sign)
-        # self.run_main.show_dialog_sign.connect(self.show_dialog)
-        # self.run_main.show_progress_detail_sign.connect(self.show_progress_detail)
-
-        # 程序执行信号
-        # self.run_end_sign.connect(self.deal_run_end_sign)
-
-        # # 改变状态
-        # self.change_state_sign.connect(self.set_state)
-
-        # self.setWindowTitle("详情生成(new)")
-        # 线程锁
-        self.lock = Lock()
-        self.image_dir = ""
-        # 0禁用  1进行中  2已结束 99等待结束
-        self.state = 2
-        self.data_mode_generate_detail = DataModeGenerateDetail()
-        self.init_cutout()
-        self.init_detail()
-        # self.init_schedule()
-        self.set_state(0)
-        # self.show()
-        # 延时检查是否存在匹配图片
-        # QTimer.singleShot(1000, self.check_and_matching_pics)
-
-    # 添加进度页面
-    # def init_schedule(self, *args):
-    #     self.ui.back.clicked.connect(self.back)
-    #     self.ui.stop.clicked.connect(self.to_stop)
-    #     self.ui.progressBar.hide()
-
-    def back(self, *args):
-        self.set_state(0)
-
-    def to_stop(self, *args):
-        self.state = 99
-
-    # 自动检查匹配图片
-    def check_and_matching_pics(self, *args, **kwargs):
-        func = partial(self.run_matching)
-        self.do_thread_run(func=func, call_back=self.run_matching_call, time_out=30)
-
-    # 运行自动匹配
-    def run_matching(self, *args):
-        image_dir = "{}/data".format(os.getcwd())
-        check_path(image_dir)
-        baseDealImage = BaseDealImage(image_dir=image_dir)
-        result = baseDealImage.dealMoveImage(image_dir=image_dir, callback_func=None)
-        # return {'code': 0, 'msg': '处理完成', 'target_path': output_path, 'data': {}}
-        return result
-
-    # 自动匹配的回调函数
-    def run_matching_call(self, return_data):
-
-        print(return_data)
-        code = return_data["code"]
-        if code == 0:
-            output_path = return_data["target_path"]
-            self.image_dir = "{}/{}".format(os.getcwd(), output_path)
-            self.show_img_dir()
-
-    def show_progress_detail(self, text):
-        self.ui.textBrowser_4.append(text)
-
-    # todo ===========主方法入口===========
-    def deal_run_end_sign(self, config_data: dict):
-        if config_data["sign_text"] == "开始抠图":
-            # 先做整体校验
-            func = partial(self.run_main.check_before_cutout, config_data=config_data)
-            self.do_thread_run(
-                func=func,
-                call_back=self.run_main.check_for_cutout_image_first_call_back,
-                time_out=30,
-                is_show_mask=False,
-            )
-
-        print(config_data)
-        if config_data["sign_text"] == "已结束抠图处理":
-            if config_data["detail_is_enable"]:
-                # 先做整体校验
-                # temp_name=self.last_temp, temp_name_list=self.temp_list
-                func = partial(
-                    self.run_main.check_before_detail, config_data=config_data
-                )
-                self.do_thread_run(
-                    func=func,
-                    call_back=self.run_main.check_for_detail_first_call_back,
-                    time_out=30,
-                    is_show_mask=False,
-                )
-            else:
-                self.set_state(state_value=2)
-
-        if config_data["sign_text"] == "已结束详情处理":
-            if config_data["upload_is_enable"]:
-                to_deal_dir = "{}/软件-详情图生成".format(config_data["image_dir"])
-                print("to_deal_dir", to_deal_dir)
-                if os.path.exists(to_deal_dir):
-                    self.upload_pic = UploadPic(
-                        windows=self, to_deal_dir=to_deal_dir, config_data=config_data
-                    )
-                    self.upload_pic.run_end_sign.connect(self.deal_run_end_sign)
-                    self.upload_pic.show_progress_detail_sign.connect(
-                        self.show_progress_detail
-                    )
-                    self.upload_pic.run()
-                    # threading.Thread(target=self.upload_pic.run_by_thread, args=()).start()
-                else:
-                    self.set_state(state_value=2)
-            else:
-                self.set_state(state_value=2)
-
-        if config_data["sign_text"] == "结束":
-            self.set_state(state_value=2)
-
-    def change_temp_mode(self, *args, **kwargs):
-        if self.ui.check_use_excel.isChecked():
-            self.ui.temp_list_get.hide()
-        else:
-            self.ui.temp_list_get.show()
-
-    # 重新载入模块
-    def reload_temp_mode(self, *args, **kwargs):
-        a = QMessageBox.question(
-            self, "确认", "是否重启加载模板", QMessageBox.Yes | QMessageBox.No
-        )
-        if a != QMessageBox.Yes:
-            return
-
-        # 检查资源包
-        if settings.env == "prod":
-            if self.top_windows:
-                self.top_windows.check_resources_download()
-
-        settings.PLUGINS_DICT = LoadAllPlugins(windows=None).load()
-        # 重新载入模板
-        self.load_temp_list()
-
-    #  获取页面配置
-    def get_config(self, *args):
-        if not settings.IsLogin:
-            QMessageBox.question(
-                self, "确认", "请先登录", QMessageBox.Yes | QMessageBox.No
-            )
-            return
-
-        logo_name = self.ui.logo_select_ui.currentText()
-        if logo_name == "请选择":
-            QMessageBox.question(
-                self, "确认", "请先选择logo模板", QMessageBox.Yes | QMessageBox.No
-            )
-            return
-
-        if self.ui.cutout_exquisite.isChecked() and not bool(settings.IsExquisiteMode):
-            QMessageBox.question(
-                self, "确认", "暂无 精细化抠图权限", QMessageBox.Yes | QMessageBox.No
-            )
-            return
-
-        if "失败" in self.image_dir:
-            self.WaringMessage("文件夹路径不能含有 失败 字样")
-            return
-
-        image_dir = self.ui.path_name.text()
-        image_order = self.ui.line_image_pos.text()
-        is_check_number = self.ui.check_image_total.isChecked()
-        resize_image_view = self.ui.need_resize.text()
-        logo_name = self.ui.logo_select_ui.currentText()
-        settings.MATCHING_LAST_LOGO_TEMP = logo_name
-        logo_path = self.logo_path_dict[logo_name]
-
-        cutout_mode = "1"
-        if self.ui.cutout_exquisite.isChecked():
-            cutout_mode = "2"
-        configData = {
-            "imageorder": image_order,
-            "resize_image_view": resize_image_view,
-            "is_check_number": str(is_check_number),
-            "cutout_mode": str(cutout_mode),
-            "matching_mode_last": settings.MATCHING_MODE_LAST,
-            "matching_last_temp": self.last_temp,
-            "matching_last_logo_temp": logo_name,
-        }
-        settings.cutimage_dict["imageorder"] = image_order
-        settings.cutimage_dict["resize_image_view"] = resize_image_view
-        settings.cutimage_dict["is_check_number"] = str(is_check_number)
-        settings.cutimage_dict["cutout_mode"] = str(cutout_mode)
-        settings.set_config(data_dict=configData, section="cutimage")
-        config_data = {}
-        config_data["image_dir"] = image_dir
-        config_data["image_order"] = image_order
-        config_data["is_check_number"] = is_check_number
-        config_data["resize_image_view"] = resize_image_view
-        config_data["cutout_mode"] = cutout_mode
-        config_data["logo_path"] = logo_path
-        config_data["special_goods_art_no_folder_line"] = ""
-
-        # =======================================
-
-        settings.GOODS_DETAIL_IS_USE_EXCEL = self.is_use_excel
-        settings.GOODS_DETAIL_EXCEL_PATH = self.excel_path
-        settings.GOODS_DETAIL_LAST_IMAGE_PATH = self.image_dir
-        settings.GOODS_DETAIL_IS_CHECK_COLOR_IS_ALL = self.is_check_color_is_all
-        settings.GOODS_DETAIL_IS_PASS = self.is_check_is_pass
-        settings.GOODS_DETAIL_LAST_TEMP = self.last_temp
-
-        data_dict = {
-            "is_use_excel": "是" if self.is_use_excel else "否",
-            "excel_path": self.excel_path if self.excel_path else "",
-            "last_image_path": self.image_dir if self.image_dir else "",
-            "is_check_color_is_all": "是" if self.is_check_color_is_all else "否",
-            "last_temp": self.last_temp,
-            "goods_detail_temp_mode_last": settings.GOODS_DETAIL_TEMP_MODE_LAST,
-        }
-        settings.set_config(data_dict=data_dict, section="goods_detail")
-        # 红蜻蜓/惠利玛,且为非表格数据必须需要登录处理
-        assigned_page = self.ui.assigned_page.text()
-        if assigned_page:
-            assigned_page_dict = self.check_assigned_page(assigned_page)
-            if not assigned_page_dict:
-                self.WaringMessage("指定模板填写格式不合规")
-        else:
-            assigned_page_dict = {}
-
-        config_data["is_use_excel"] = self.is_use_excel
-        config_data["excel_path"] = self.excel_path
-        config_data["is_check_color_is_all"] = self.is_check_color_is_all
-        config_data["assigned_page_dict"] = assigned_page_dict
-        config_data["temp_class"] = self.temp_class
-        config_data["temp_name"] = self.last_temp
-        config_data["temp_name_list"] = self.temp_list
-        config_data["target_error_folder"] = self.target_error_folder
-        print("=============config_data=============")
-        print(config_data)
-        return config_data
-
-    # 抠图相关处理
-    def init_cutout(self):
-        # 指定单独处理的颜色文件夹
-        self.special_goods_art_no_folder = []
-        self.show_img_dir()
-        self.ui.select_path.mousePressEvent = self.change_img_dir
-        self.ui.line_image_pos.setText(settings.cutimage_dict["imageorder"])
-        self.ui.need_resize.setText(settings.cutimage_dict["resize_image_view"])
-        self.ui.check_image_total.setChecked(
-            bool(settings.cutimage_dict["is_check_number"])
-        )
-
-        if settings.DEFAULT_CUTOUT_MODE == "普通抠图":
-            self.ui.cutout_nomal.setChecked(True)
-        elif settings.DEFAULT_CUTOUT_MODE == " 精细化抠图":
-            self.ui.cutout_exquisite.setChecked(True)
-
-        if not bool(settings.IsExquisiteMode):
-            self.ui.cutout_exquisite.setEnabled(False)
-
-        self.progress_sign.connect(self.show_progress)
-        self.ui.run.clicked.connect(self.run)  # 抠图与主图加工
-
-        self.set_logo_selected()
-        # 手动匹配图片
-        self.ui.manual_matching_pic.mousePressEvent = (
-            self.manual_matching_pic_mousePressEvent
-        )
-
-    def init_detail(self):
-        # 使用使用表格数据
-        self.is_use_excel = settings.GOODS_DETAIL_IS_USE_EXCEL
-        self.excel_path = settings.GOODS_DETAIL_EXCEL_PATH
-
-        # 目标文件夹
-        self.image_dir = settings.GOODS_DETAIL_LAST_IMAGE_PATH
-        # 对应的错误文件夹目录
-        if self.image_dir and os.path.exists(self.image_dir):
-            self.target_error_folder = "{}/软件-生成详情错误".format(self.image_dir)
-        else:
-            self.target_error_folder = ""
-
-        # 检查颜色是否齐全
-        self.is_check_color_is_all = settings.GOODS_DETAIL_IS_CHECK_COLOR_IS_ALL
-        # 已生成主图的自动过滤
-        self.is_check_is_pass = settings.GOODS_DETAIL_IS_PASS
-
-        # 上次使用的详情模板
-        self.last_temp = settings.GOODS_DETAIL_LAST_TEMP
-
-        # 重新载入模块
-        self.ui.reload_func.mousePressEvent = self.reload_temp_mode
-        # 手工整理数据
-        self.ui.manual_matching_pic.mousePressEvent = self.manual_matching_pic
-
-        # -------初始化页面--------
-        if self.is_use_excel:
-            self.ui.check_use_excel.setChecked(True)
-        else:
-            self.ui.check_use_excel.setChecked(False)
-
-        if self.excel_path:
-            self.ui.excel_path_show.setText(self.excel_path)
-
-        if self.image_dir:
-            self.ui.path_name.setText(self.image_dir)
-
-        if self.is_check_color_is_all:
-            self.ui.check_image_total_2.setChecked(True)
-        else:
-            self.ui.check_image_total_2.setChecked(False)
-
-        # 是否开启使用外部数据
-        self.ui.check_use_excel.toggled.connect(self.check_box_change)
-        self.ui.check_image_total_2.toggled.connect(self.check_box_change)
-        self.check_box_change()
-
-        self.ui.select_path.mousePressEvent = self.change_img_dir
-        self.ui.select_excel.mousePressEvent = self.select_excel_path
-
-        # ====================================
-        self.progress_sign.connect(self.show_progress)
-
-        # 复制Excel模板
-        self.ui.get_excel_temp.mousePressEvent = self.copy_excel
-        self.change_temp_mode()
-
-        # 加载模板
-        QTimer.singleShot(1000, self.load_temp_list)
-
-    def manual_matching_pic_mousePressEvent(self, event):
-        if not self.image_dir:
-            a = QMessageBox.question(
-                self,
-                "确认",
-                "请先选择目标文件夹",
-                QMessageBox.Yes,
-            )
-            return
-        self.manual = MainMatchingWindow(root_path=self.image_dir)
-
-    # 手工整理数据
-    def manual_matching_pic(self, *args, **kwargs):
-        if not self.image_dir:
-            a = QMessageBox.question(
-                self,
-                "确认",
-                "请先选择目标文件夹",
-                QMessageBox.Yes,
-            )
-            return
-        self.manual = MainMatchingWindow(root_path=self.image_dir)
-
-    def load_temp_list(self):
-        # 注册模板类
-        self.temp_class = {}
-        self.temp_list = []
-        plugins_company_name = "企业名称"
-
-        if settings.PROJECT == "红蜻蜓":
-            self.temp_class = {}
-            plugins_company_name = "红蜻蜓"
-
-        elif settings.PROJECT == "惠利玛":
-            if "惠利玛" in settings.Company:
-                self.temp_class = {}
-                plugins_company_name = "惠利玛"
-            if "小苏" in settings.Company:
-                self.temp_class = {}
-                plugins_company_name = "小苏"
-
-        # 通过动态进行加载获取
-        if settings.PLUGINS_DICT:
-            print("554  settings.PLUGINS_DICT")
-            for _key, _value in settings.PLUGINS_DICT["detail_template"].items():
-                print(_key, _value)
-            try:
-                if "全部" in settings.PLUGINS_DICT["detail_template"]:
-                    for i, v in settings.PLUGINS_DICT["detail_template"][
-                        "全部"
-                    ].items():
-                        self.temp_class[i] = v
-                if plugins_company_name in settings.PLUGINS_DICT["detail_template"]:
-                    for i, v in settings.PLUGINS_DICT["detail_template"][
-                        plugins_company_name
-                    ].items():
-                        self.temp_class[i] = v
-            except BaseException as e:
-                print("209  通过动态进行加载详情获取error", e)
-                pass
-
-        # 模板名称列表
-        self.temp_list = [x for x in self.temp_class]
-        print("570 temp_list", self.temp_list)
-
-        # 删除已渲染的模板
-        for i in self.ui.show_temp_list.findChildren(TempItem):
-            i.deleteLater()
-
-        # 模板列表
-        x, y = 10, 10
-        self.ui.show_temp_list.setMinimumSize(self.ui.widget_10.width(), 100)
-        self.ui.show_temp_list.resize(self.ui.widget_10.width(), 100)
-        temp_high = 100
-        for temp_name in self.temp_list:
-            _class = self.temp_class[temp_name]
-            _d = _class.get_temp_pic_info(_class.root)
-            temp_image_path = _d["temp_pic_path"]
-            # print("224 temp_image_path",temp_image_path)
-            # temp_item = TempItem(self.ui.scrollArea, temp_name, temp_image_path)
-            # temp_item.select_sign.connect(self.change_temp_select)
-            # self.ui.horizontalLayout_18.insertWidget(
-            #     self.ui.horizontalLayout_18.count() - 1, temp_item
-            # )
-            temp_item = TempItem(self.ui.show_temp_list, temp_name, temp_image_path)
-            temp_high = temp_item.height()
-            temp_item.select_sign.connect(self.change_temp_select)
-            temp_item.move(x, y)
-            x += temp_item.width()
-            x += 10
-            if x > self.ui.show_temp_list.width() - temp_item.width():
-                y += temp_item.height()
-                y += 10
-                x = 10
-
-        y += 100
-        y += temp_high
-        print(y)
-        self.ui.scrollAreaWidgetContents_3.setMinimumSize(x, self.height() + y)
-        self.ui.show_temp_list.setMinimumSize(x, y)
-        self.ui.show_temp_list.resize(x, y)
-        print(self.ui.show_temp_list.height())
-
-        # 设置默认值
-        if self.last_temp not in self.temp_list:
-            if self.temp_list:
-                self.last_temp = self.temp_list[0]
-
-        # 设置值
-        for temp_item in self.ui.show_temp_list.findChildren(TempItem):
-            temp_item.select()
-            break
-
-    def change_temp_select(self, _id):
-        self.last_temp = _id
-        print("已设置模板的值为:{}".format(self.last_temp))
-        for temp_item in self.ui.show_temp_list.findChildren(TempItem):
-            if temp_item.id != _id:
-                temp_item.cancel_select()
-
-    def copy_excel(self, *args, **kwargs):
-        excel_path = r"{}\resources\init\goods_excel_temp.xlsx".format(os.getcwd())
-        if not os.path.exists(excel_path):
-            return
-
-        self.check_path(r"{}\temp".format(os.getcwd()))
-        self.check_path(r"{}\temp\excel_temp".format(os.getcwd()))
-        new_excel_path = r"{}\temp\excel_temp\goods_excel_temp.xlsx".format(os.getcwd())
-        if not os.path.exists(new_excel_path):
-            shutil.copy(excel_path, new_excel_path)
-        # 打开文件夹
-        os.startfile(r"{}\temp\excel_temp".format(os.getcwd()))
-
-    def check_box_change(self, *args):
-        if self.ui.check_use_excel.isChecked():
-            self.is_use_excel = True
-            self.ui.widget.show()
-            self.ui.temp_list_get.hide()
-        else:
-            self.is_use_excel = False
-            self.ui.widget.hide()
-            self.ui.temp_list_get.show()
-
-        if self.ui.check_image_total_2.isChecked():
-            self.is_check_color_is_all = True
-        else:
-            self.is_check_color_is_all = False
-
-    # 设置选择logo模板
-    def set_logo_selected(self):
-        logo_root_path = ""
-        if settings.PROJECT == "红蜻蜓":
-            logo_root_path = r"{}\resources\LOGO\HQT".format(os.getcwd())
-        elif settings.PROJECT == "惠利玛":
-            if "小苏" in settings.Company:
-                logo_root_path = r"{}\resources\LOGO\xiaosushuoxie".format(os.getcwd())
-            if "惠利玛" in settings.Company:
-                logo_root_path = r"{}\resources\LOGO\HLM".format(os.getcwd())
-
-        self.logo_path_dict = {"请选择": "", "无logo": ""}
-
-        if logo_root_path:
-            if os.path.exists(logo_root_path):
-                image_list = get_images(logo_root_path)
-                for image_data in image_list:
-                    self.logo_path_dict[image_data["file_name"]] = image_data[
-                        "file_path"
-                    ]
-
-        self.ui.logo_select_ui.addItems([x for x in self.logo_path_dict])
-
-        self.ui.logo_select_ui.setCurrentText("请选择")
-        if settings.MATCHING_LAST_LOGO_TEMP:
-            if settings.MATCHING_LAST_LOGO_TEMP in [x for x in self.logo_path_dict]:
-                self.ui.logo_select_ui.setCurrentText(settings.MATCHING_LAST_LOGO_TEMP)
-
-    def select_excel_path(self, *args, **kwargs):
-        folder = QFileDialog.getOpenFileName(self, "选取excel", "./")[0]
-        if "xlsx" in folder:
-            # if len(folder) > 20:
-            #     text = folder[-20:]
-            # else:
-            #     text = folder
-
-            self.ui.excel_path_show.setText(folder)
-            self.excel_path = folder
-            print("folder", folder)
-
-    def change_img_dir(self, *args):
-        folder = QFileDialog.getExistingDirectory(
-            self, "选取文件夹", settings.GOODS_DETAIL_LAST_IMAGE_PATH
-        )
-        if folder:
-            # todo 增加检测是否有正常文件文件夹
-            folder = check_goods_folder(folder)
-            if folder is None:
-                QMessageBox.question(
-                    self,
-                    "确认",
-                    "您已选的文件夹下不存在任何有效数据",
-                    QMessageBox.Yes,
-                )
-                return
-            else:
-                self.image_dir = folder
-                self.target_error_folder = "{}/软件-生成详情错误".format(self.image_dir)
-                self.show_img_dir()
-
-    def change_img_dir_by_text(self, folder):
-        self.image_dir = folder
-        self.target_error_folder = "{}/软件-生成详情错误".format(self.image_dir)
-        self.show_img_dir()
-
-    def show_img_dir(self):
-        self.ui.path_name.setText(self.image_dir)
-
-    def set_state(self, state_value: int):
-        # 0禁用  1进行中  2已结束
-        if state_value not in [0, 1, 2, 99]:
-            return
-        self.state = state_value
-        # if self.state == 0:
-        #     self.ui.stackedWidget.setCurrentIndex(0)
-        # if self.state == 1:
-        #     self.ui.stackedWidget.setCurrentIndex(1)
-        #     self.ui.progressBar.setValue(0)
-        #     self.ui.textBrowser_4.clear()
-        #     self.ui.back.hide()
-        #     self.ui.stop.show()
-
-        # if self.state == 2:
-        #     self.ui.back.show()
-        #     self.ui.stop.hide()
-
-        #     pass
-
-    def check_path(self, _path):
-        if not os.path.exists(_path):
-            os.mkdir(_path)
-        return True
-
-    def show_progress(self, *args, **kwargs):
-        pass
-
-    # todo 主程序处理
-    def run(self):
-        config_data = self.get_config()
-        if not config_data:
-            return
-        # self.queren = QueRen(self)
-        # ret = self.queren.exec()
-        # if ret == QDialog.Accepted:
-        #     print("对话框以接受状态关闭")
-        for key, value in queren_get_config().items():
-            config_data[key] = value
-        config_data["sign_text"] = "开始抠图"
-        for key, value in config_data.items():
-            print("key:{},  value:{}".format(key, value))
-        self.set_state(state_value=1)
-        self.run_end_sign.emit(config_data)
-
-    # 解析指定模板页面数据
-    def check_assigned_page(self, text: str):
-
-        try:
-            # temp_dict 示例{“4”:“xiaosushuoxie-4”}
-            temp_dict = {}
-            for i in self.temp_list:
-                temp_dict[i[-1]] = i
-
-            text = text.replace(" ", "")
-            text = text.replace(",", ",")
-            text = text.replace(":", ":")
-            text = text.replace(";", ",")
-            assigned_page_list = text.split(",")
-            assigned_page_dict = {}
-            for i in assigned_page_list:
-                if not i:
-                    continue
-                _k, _v = i.split(":")
-                _k = temp_dict[_k]
-                if _k not in assigned_page_dict:
-                    assigned_page_dict[_k] = []
-                if _v not in assigned_page_dict[_k]:
-                    assigned_page_dict[_k].append(_v)
-            # assigned_page_dict 数据结构,一个模板中存在多个页面数值。
-            return assigned_page_dict
-        except:
-            return {}
-
-    # 弹出对话框
-    def show_dialog(self, data):
-        windows = data["windows"]
-        windows.dialog_result = ""
-        my_dialog = DialogShow(
-            self,
-            text=data["text"],
-            button_1=data["button_1"] if "button_1" in data else None,
-            button_2=data["button_2"] if "button_2" in data else None,
-            button_3=data["button_3"] if "button_3" in data else None,
-        )
-        ret = my_dialog.exec()
-        print("641  my_dialog.flag_name", my_dialog.flag_name)
-        # 根据用户的选择发出相应的信号
-        windows.dialog_result_signal.emit(my_dialog.flag_name)

+ 0 - 648
python/service/auto_deal_pics/main_control.py

@@ -1,648 +0,0 @@
-import os
-
-from UI.auto_deal_pics_ui.auto_main import Ui_Form as generate_goods_no_detail_pic_Ui_Form
-
-#
-from module.view_control.generate_goods_no_detail_pic.data import DataModeGenerateDetail
-from module.view_control.auto_deal_pics.base_deal import BaseDealImage
-from module.view_control.auto_deal_pics.run_main import RunMain
-from module.view_control.auto_deal_pics.upload_pic import UploadPic
-from module.view_control.auto_deal_pics.queren_control import QueRen
-
-# 手动移动图片等操作
-from module.view_control.manual_image_matching.m_image_matching_cotrol import MainMatchingWindow
-
-# 每个详情的模板
-from module.view_control.auto_deal_pics.detail_temp import TempItem
-
-from module.base_mode.load_plugins import LoadAllPlugins
-
-from import_qt_mode import *
-from functools import partial
-from threading import Lock
-from module.view_control.MineQWidget import MineQWidget, DialogShow
-from module.base_mode.base import *
-import threading
-import settings
-
-
-# 抠图与详情生成
-class AutoDealPics(MineQWidget):
-    progress_sign = Signal(dict)
-    text_show = Signal(str)
-    progress_show_sign = Signal(bool)
-    progress_end_sign = Signal()
-    send_dialog_sign = Signal()
-    change_state_sign = Signal(int)
-    run_end_sign = Signal(dict)
-
-    def __init__(self, windows=None, top_windows=None):
-        super().__init__()
-        self.windows = windows
-        self.top_windows = top_windows
-        self.ui = generate_goods_no_detail_pic_Ui_Form()
-        self.ui.setupUi(self)
-        self.setWindowFlags(self.windowFlags() & ~Qt.WindowStaysOnTopHint)
-
-        self.run_main = RunMain(windows=self)
-        self.run_main.run_end_sign.connect(self.deal_run_end_sign)
-        self.run_main.show_dialog_sign.connect(self.show_dialog)
-        self.run_main.show_progress_detail_sign.connect(self.show_progress_detail)
-
-        # 程序执行信号
-        self.run_end_sign.connect(self.deal_run_end_sign)
-
-        # 改变状态
-        self.change_state_sign.connect(self.set_state)
-
-        self.setWindowTitle("详情生成(new)")
-        # 线程锁
-        self.lock = Lock()
-        self.image_dir = ""
-        # 0禁用  1进行中  2已结束 99等待结束
-        self.state = 2
-        self.data_mode_generate_detail = DataModeGenerateDetail()
-        self.init_cutout()
-        self.init_detail()
-        self.init_schedule()
-        self.set_state(0)
-        self.show()
-        # 延时检查是否存在匹配图片
-        QTimer.singleShot(1000, self.check_and_matching_pics)
-
-    # 添加进度页面
-    def init_schedule(self, *args):
-        self.ui.back.clicked.connect(self.back)
-        self.ui.stop.clicked.connect(self.to_stop)
-        self.ui.progressBar.hide()
-
-    def back(self, *args):
-        self.set_state(0)
-
-    def to_stop(self, *args):
-        self.state = 99
-
-    # 自动检查匹配图片
-    def check_and_matching_pics(self, *args, **kwargs):
-        func = partial(self.run_matching)
-        self.do_thread_run(func=func, call_back=self.run_matching_call, time_out=30)
-
-    # 运行自动匹配
-    def run_matching(self, *args):
-        image_dir = "{}/data".format(os.getcwd())
-        check_path(image_dir)
-        baseDealImage = BaseDealImage(image_dir=image_dir)
-        result = baseDealImage.dealMoveImage(image_dir=image_dir, callback_func=None)
-        # return {'code': 0, 'msg': '处理完成', 'target_path': output_path, 'data': {}}
-        return result
-
-    # 自动匹配的回调函数
-    def run_matching_call(self, return_data):
-
-        print(return_data)
-        code = return_data["code"]
-        if code == 0:
-            output_path = return_data["target_path"]
-            self.image_dir = "{}/{}".format(os.getcwd(), output_path)
-            self.show_img_dir()
-
-    def show_progress_detail(self, text):
-        self.ui.textBrowser_4.append(text)
-
-    # todo ===========主方法入口===========
-    def deal_run_end_sign(self, config_data: dict):
-        if config_data["sign_text"] == "开始抠图":
-            # 先做整体校验
-            func = partial(self.run_main.check_before_cutout, config_data=config_data)
-            self.do_thread_run(func=func, call_back=self.run_main.check_for_cutout_image_first_call_back, time_out=30,
-                               is_show_mask=False)
-
-        print(config_data)
-        if config_data["sign_text"] == "已结束抠图处理":
-            if config_data["detail_is_enable"]:
-                # 先做整体校验
-                # temp_name=self.last_temp, temp_name_list=self.temp_list
-                func = partial(self.run_main.check_before_detail, config_data=config_data)
-                self.do_thread_run(func=func,
-                                   call_back=self.run_main.check_for_detail_first_call_back,
-                                   time_out=30,
-                                   is_show_mask=False)
-            else:
-                self.set_state(state_value=2)
-
-        if config_data["sign_text"] == "已结束详情处理":
-            if config_data["upload_is_enable"]:
-                to_deal_dir = "{}/软件-详情图生成".format(config_data["image_dir"])
-                print("to_deal_dir", to_deal_dir)
-                if os.path.exists(to_deal_dir):
-                    self.upload_pic = UploadPic(windows=self, to_deal_dir=to_deal_dir, config_data=config_data)
-                    self.upload_pic.run_end_sign.connect(self.deal_run_end_sign)
-                    self.upload_pic.show_progress_detail_sign.connect(self.show_progress_detail)
-                    self.upload_pic.run()
-                    # threading.Thread(target=self.upload_pic.run_by_thread, args=()).start()
-                else:
-                    self.set_state(state_value=2)
-            else:
-                self.set_state(state_value=2)
-
-        if config_data["sign_text"] == "结束":
-            self.set_state(state_value=2)
-
-    def change_temp_mode(self, *args, **kwargs):
-        if self.ui.check_use_excel.isChecked():
-            self.ui.temp_list_get.hide()
-        else:
-            self.ui.temp_list_get.show()
-
-    # 重新载入模块
-    def reload_temp_mode(self, *args, **kwargs):
-        a = QMessageBox.question(
-            self, "确认", "是否重启加载模板", QMessageBox.Yes | QMessageBox.No
-        )
-        if a != QMessageBox.Yes:
-            return
-
-        # 检查资源包
-        if settings.env == "prod":
-            if self.top_windows:
-                self.top_windows.check_resources_download()
-
-        settings.PLUGINS_DICT = LoadAllPlugins(windows=None).load()
-        # 重新载入模板
-        self.load_temp_list()
-
-    #  获取页面配置
-    def get_config(self, *args):
-        if not settings.IsLogin:
-            QMessageBox.question(
-                self, "确认", "请先登录", QMessageBox.Yes | QMessageBox.No
-            )
-            return
-
-        logo_name = self.ui.logo_select_ui.currentText()
-        if logo_name == "请选择":
-            QMessageBox.question(
-                self, "确认", "请先选择logo模板", QMessageBox.Yes | QMessageBox.No
-            )
-            return
-
-        if self.ui.cutout_exquisite.isChecked() and not bool(settings.IsExquisiteMode):
-            QMessageBox.question(
-                self, "确认", "暂无 精细化抠图权限", QMessageBox.Yes | QMessageBox.No
-            )
-            return
-
-        if "失败" in self.image_dir:
-            self.WaringMessage("文件夹路径不能含有 失败 字样")
-            return
-
-        image_dir = self.ui.path_name.text()
-        image_order = self.ui.line_image_pos.text()
-        is_check_number = self.ui.check_image_total.isChecked()
-        resize_image_view = self.ui.need_resize.text()
-        logo_name = self.ui.logo_select_ui.currentText()
-        settings.MATCHING_LAST_LOGO_TEMP = logo_name
-        logo_path = self.logo_path_dict[logo_name]
-
-        cutout_mode = '1'
-        if self.ui.cutout_exquisite.isChecked():
-            cutout_mode = '2'
-        configData = {
-            'imageorder': image_order,
-            'resize_image_view': resize_image_view,
-            'is_check_number': str(is_check_number),
-            'cutout_mode': str(cutout_mode),
-            'matching_mode_last': settings.MATCHING_MODE_LAST,
-            "matching_last_temp": self.last_temp,
-            "matching_last_logo_temp": logo_name,
-        }
-        settings.cutimage_dict['imageorder'] = image_order
-        settings.cutimage_dict['resize_image_view'] = resize_image_view
-        settings.cutimage_dict['is_check_number'] = str(is_check_number)
-        settings.cutimage_dict['cutout_mode'] = str(cutout_mode)
-        settings.set_config(data_dict=configData, section='cutimage')
-        config_data = {}
-        config_data["image_dir"] = image_dir
-        config_data["image_order"] = image_order
-        config_data["is_check_number"] = is_check_number
-        config_data["resize_image_view"] = resize_image_view
-        config_data["cutout_mode"] = cutout_mode
-        config_data["logo_path"] = logo_path
-        config_data["special_goods_art_no_folder_line"] = ""
-
-        # =======================================
-
-        settings.GOODS_DETAIL_IS_USE_EXCEL = self.is_use_excel
-        settings.GOODS_DETAIL_EXCEL_PATH = self.excel_path
-        settings.GOODS_DETAIL_LAST_IMAGE_PATH = self.image_dir
-        settings.GOODS_DETAIL_IS_CHECK_COLOR_IS_ALL = self.is_check_color_is_all
-        settings.GOODS_DETAIL_IS_PASS = self.is_check_is_pass
-        settings.GOODS_DETAIL_LAST_TEMP = self.last_temp
-
-        data_dict = {
-            "is_use_excel": "是" if self.is_use_excel else "否",
-            "excel_path": self.excel_path if self.excel_path else "",
-            "last_image_path": self.image_dir if self.image_dir else "",
-            "is_check_color_is_all": "是" if self.is_check_color_is_all else "否",
-            "last_temp": self.last_temp,
-            "goods_detail_temp_mode_last": settings.GOODS_DETAIL_TEMP_MODE_LAST,
-        }
-        settings.set_config(data_dict=data_dict, section="goods_detail")
-        # 红蜻蜓/惠利玛,且为非表格数据必须需要登录处理
-        assigned_page = self.ui.assigned_page.text()
-        if assigned_page:
-            assigned_page_dict = self.check_assigned_page(assigned_page)
-            if not assigned_page_dict:
-                self.WaringMessage("指定模板填写格式不合规")
-        else:
-            assigned_page_dict = {}
-
-        config_data["is_use_excel"] = self.is_use_excel
-        config_data["excel_path"] = self.excel_path
-        config_data["is_check_color_is_all"] = self.is_check_color_is_all
-        config_data["assigned_page_dict"] = assigned_page_dict
-        config_data["temp_class"] = self.temp_class
-        config_data["temp_name"] = self.last_temp
-        config_data["temp_name_list"] = self.temp_list
-        config_data["target_error_folder"] = self.target_error_folder
-        print("=============config_data=============")
-        print(
-            config_data
-        )
-        return config_data
-
-    # 抠图相关处理
-    def init_cutout(self):
-        # 指定单独处理的颜色文件夹
-        self.special_goods_art_no_folder = []
-        self.show_img_dir()
-        self.ui.select_path.mousePressEvent = self.change_img_dir
-        self.ui.line_image_pos.setText(settings.cutimage_dict['imageorder'])
-        self.ui.need_resize.setText(settings.cutimage_dict['resize_image_view'])
-        self.ui.check_image_total.setChecked(bool(settings.cutimage_dict['is_check_number']))
-
-        if settings.DEFAULT_CUTOUT_MODE == '普通抠图':
-            self.ui.cutout_nomal.setChecked(True)
-        elif settings.DEFAULT_CUTOUT_MODE == ' 精细化抠图':
-            self.ui.cutout_exquisite.setChecked(True)
-
-        if not bool(settings.IsExquisiteMode):
-            self.ui.cutout_exquisite.setEnabled(False)
-
-        self.progress_sign.connect(self.show_progress)
-        self.ui.run.clicked.connect(self.run)  # 抠图与主图加工
-
-        self.set_logo_selected()
-        # 手动匹配图片
-        self.ui.manual_matching_pic.mousePressEvent = self.manual_matching_pic_mousePressEvent
-
-    def init_detail(self):
-        # 使用使用表格数据
-        self.is_use_excel = settings.GOODS_DETAIL_IS_USE_EXCEL
-        self.excel_path = settings.GOODS_DETAIL_EXCEL_PATH
-
-        # 目标文件夹
-        self.image_dir = settings.GOODS_DETAIL_LAST_IMAGE_PATH
-        # 对应的错误文件夹目录
-        if self.image_dir and os.path.exists(self.image_dir):
-            self.target_error_folder = "{}/软件-生成详情错误".format(self.image_dir)
-        else:
-            self.target_error_folder = ""
-
-        # 检查颜色是否齐全
-        self.is_check_color_is_all = settings.GOODS_DETAIL_IS_CHECK_COLOR_IS_ALL
-        # 已生成主图的自动过滤
-        self.is_check_is_pass = settings.GOODS_DETAIL_IS_PASS
-
-        # 上次使用的详情模板
-        self.last_temp = settings.GOODS_DETAIL_LAST_TEMP
-
-        # 重新载入模块
-        self.ui.reload_func.mousePressEvent = self.reload_temp_mode
-        # 手工整理数据
-        self.ui.manual_matching_pic.mousePressEvent = self.manual_matching_pic
-
-        # -------初始化页面--------
-        if self.is_use_excel:
-            self.ui.check_use_excel.setChecked(True)
-        else:
-            self.ui.check_use_excel.setChecked(False)
-
-        if self.excel_path:
-            self.ui.excel_path_show.setText(self.excel_path)
-
-        if self.image_dir:
-            self.ui.path_name.setText(self.image_dir)
-
-        if self.is_check_color_is_all:
-            self.ui.check_image_total_2.setChecked(True)
-        else:
-            self.ui.check_image_total_2.setChecked(False)
-
-        # 是否开启使用外部数据
-        self.ui.check_use_excel.toggled.connect(self.check_box_change)
-        self.ui.check_image_total_2.toggled.connect(self.check_box_change)
-        self.check_box_change()
-
-        self.ui.select_path.mousePressEvent = self.change_img_dir
-        self.ui.select_excel.mousePressEvent = self.select_excel_path
-
-        # ====================================
-        self.progress_sign.connect(self.show_progress)
-
-        # 复制Excel模板
-        self.ui.get_excel_temp.mousePressEvent = self.copy_excel
-        self.change_temp_mode()
-
-        # 加载模板
-        QTimer.singleShot(1000, self.load_temp_list)
-
-    def manual_matching_pic_mousePressEvent(self, event):
-        if not self.image_dir:
-            a = QMessageBox.question(
-                self,
-                "确认",
-                "请先选择目标文件夹",
-                QMessageBox.Yes,
-            )
-            return
-        self.manual = MainMatchingWindow(root_path=self.image_dir)
-
-    # 手工整理数据
-    def manual_matching_pic(self, *args, **kwargs):
-        if not self.image_dir:
-            a = QMessageBox.question(
-                self,
-                "确认",
-                "请先选择目标文件夹",
-                QMessageBox.Yes,
-            )
-            return
-        self.manual = MainMatchingWindow(root_path=self.image_dir)
-
-    def load_temp_list(self):
-        # 注册模板类
-        self.temp_class = {}
-        self.temp_list = []
-        plugins_company_name = "企业名称"
-
-        if settings.PROJECT == "红蜻蜓":
-            self.temp_class = {}
-            plugins_company_name = "红蜻蜓"
-
-        elif settings.PROJECT == "惠利玛":
-            if "惠利玛" in settings.Company:
-                self.temp_class = {}
-                plugins_company_name = "惠利玛"
-            if "小苏" in settings.Company:
-                self.temp_class = {}
-                plugins_company_name = "小苏"
-
-        # 通过动态进行加载获取
-        if settings.PLUGINS_DICT:
-            print("554  settings.PLUGINS_DICT")
-            for _key, _value in settings.PLUGINS_DICT["detail_template"].items():
-                print(_key, _value)
-            try:
-                if "全部" in settings.PLUGINS_DICT["detail_template"]:
-                    for i, v in settings.PLUGINS_DICT["detail_template"]["全部"].items():
-                        self.temp_class[i] = v
-                if plugins_company_name in settings.PLUGINS_DICT["detail_template"]:
-                    for i, v in settings.PLUGINS_DICT["detail_template"][plugins_company_name].items():
-                        self.temp_class[i] = v
-            except BaseException as e:
-                print("209  通过动态进行加载详情获取error", e)
-                pass
-
-        # 模板名称列表
-        self.temp_list = [x for x in self.temp_class]
-        print("570 temp_list", self.temp_list)
-
-        # 删除已渲染的模板
-        for i in self.ui.show_temp_list.findChildren(TempItem):
-            i.deleteLater()
-
-        # 模板列表
-        x, y = 10, 10
-        self.ui.show_temp_list.setMinimumSize(self.ui.widget_10.width(), 100)
-        self.ui.show_temp_list.resize(self.ui.widget_10.width(), 100)
-        temp_high = 100
-        for temp_name in self.temp_list:
-            _class = self.temp_class[temp_name]
-            _d = _class.get_temp_pic_info(_class.root)
-            temp_image_path = _d["temp_pic_path"]
-            # print("224 temp_image_path",temp_image_path)
-            # temp_item = TempItem(self.ui.scrollArea, temp_name, temp_image_path)
-            # temp_item.select_sign.connect(self.change_temp_select)
-            # self.ui.horizontalLayout_18.insertWidget(
-            #     self.ui.horizontalLayout_18.count() - 1, temp_item
-            # )
-            temp_item = TempItem(self.ui.show_temp_list, temp_name, temp_image_path)
-            temp_high = temp_item.height()
-            temp_item.select_sign.connect(self.change_temp_select)
-            temp_item.move(x, y)
-            x += temp_item.width()
-            x += 10
-            if x > self.ui.show_temp_list.width() - temp_item.width():
-                y += temp_item.height()
-                y += 10
-                x = 10
-
-        y += 100
-        y += temp_high
-        print(y)
-        self.ui.scrollAreaWidgetContents_3.setMinimumSize(x, self.height() + y)
-        self.ui.show_temp_list.setMinimumSize(x, y)
-        self.ui.show_temp_list.resize(x, y)
-        print(self.ui.show_temp_list.height())
-
-        # 设置默认值
-        if self.last_temp not in self.temp_list:
-            if self.temp_list:
-                self.last_temp = self.temp_list[0]
-
-        # 设置值
-        for temp_item in self.ui.show_temp_list.findChildren(TempItem):
-            temp_item.select()
-            break
-
-    def change_temp_select(self, _id):
-        self.last_temp = _id
-        print("已设置模板的值为:{}".format(self.last_temp))
-        for temp_item in self.ui.show_temp_list.findChildren(TempItem):
-            if temp_item.id != _id:
-                temp_item.cancel_select()
-
-    def copy_excel(self, *args, **kwargs):
-        excel_path = r"{}\resources\init\goods_excel_temp.xlsx".format(os.getcwd())
-        if not os.path.exists(excel_path):
-            return
-
-        self.check_path(r"{}\temp".format(os.getcwd()))
-        self.check_path(r"{}\temp\excel_temp".format(os.getcwd()))
-        new_excel_path = r"{}\temp\excel_temp\goods_excel_temp.xlsx".format(os.getcwd())
-        if not os.path.exists(new_excel_path):
-            shutil.copy(excel_path, new_excel_path)
-        # 打开文件夹
-        os.startfile(r"{}\temp\excel_temp".format(os.getcwd()))
-
-    def check_box_change(self, *args):
-        if self.ui.check_use_excel.isChecked():
-            self.is_use_excel = True
-            self.ui.widget.show()
-            self.ui.temp_list_get.hide()
-        else:
-            self.is_use_excel = False
-            self.ui.widget.hide()
-            self.ui.temp_list_get.show()
-
-        if self.ui.check_image_total_2.isChecked():
-            self.is_check_color_is_all = True
-        else:
-            self.is_check_color_is_all = False
-
-    # 设置选择logo模板
-    def set_logo_selected(self):
-        logo_root_path = ""
-        if settings.PROJECT == "红蜻蜓":
-            logo_root_path = r"{}\resources\LOGO\HQT".format(os.getcwd())
-        elif settings.PROJECT == "惠利玛":
-            if "小苏" in settings.Company:
-                logo_root_path = r"{}\resources\LOGO\xiaosushuoxie".format(os.getcwd())
-            if "惠利玛" in settings.Company:
-                logo_root_path = r"{}\resources\LOGO\HLM".format(os.getcwd())
-
-        self.logo_path_dict = {"请选择": "", "无logo": ""}
-
-        if logo_root_path:
-            if os.path.exists(logo_root_path):
-                image_list = get_images(logo_root_path)
-                for image_data in image_list:
-                    self.logo_path_dict[image_data["file_name"]] = image_data["file_path"]
-
-        self.ui.logo_select_ui.addItems([x for x in self.logo_path_dict])
-
-        self.ui.logo_select_ui.setCurrentText("请选择")
-        if settings.MATCHING_LAST_LOGO_TEMP:
-            if settings.MATCHING_LAST_LOGO_TEMP in [x for x in self.logo_path_dict]:
-                self.ui.logo_select_ui.setCurrentText(settings.MATCHING_LAST_LOGO_TEMP)
-
-    def select_excel_path(self, *args, **kwargs):
-        folder = QFileDialog.getOpenFileName(self, "选取excel", "./")[0]
-        if "xlsx" in folder:
-            # if len(folder) > 20:
-            #     text = folder[-20:]
-            # else:
-            #     text = folder
-
-            self.ui.excel_path_show.setText(folder)
-            self.excel_path = folder
-            print("folder", folder)
-
-    def change_img_dir(self, *args):
-        folder = QFileDialog.getExistingDirectory(self, "选取文件夹", settings.GOODS_DETAIL_LAST_IMAGE_PATH)
-        if folder:
-            # todo 增加检测是否有正常文件文件夹
-            folder = check_goods_folder(folder)
-            if folder is None:
-                QMessageBox.question(self, "确认", "您已选的文件夹下不存在任何有效数据", QMessageBox.Yes, )
-                return
-            else:
-                self.image_dir = folder
-                self.target_error_folder = "{}/软件-生成详情错误".format(self.image_dir)
-                self.show_img_dir()
-
-    def change_img_dir_by_text(self, folder):
-        self.image_dir = folder
-        self.target_error_folder = "{}/软件-生成详情错误".format(self.image_dir)
-        self.show_img_dir()
-
-    def show_img_dir(self):
-        self.ui.path_name.setText(self.image_dir)
-
-    def set_state(self, state_value: int):
-        # 0禁用  1进行中  2已结束
-        if state_value not in [0, 1, 2, 99]:
-            return
-        self.state = state_value
-        if self.state == 0:
-            self.ui.stackedWidget.setCurrentIndex(0)
-        if self.state == 1:
-            self.ui.stackedWidget.setCurrentIndex(1)
-            self.ui.progressBar.setValue(0)
-            self.ui.textBrowser_4.clear()
-            self.ui.back.hide()
-            self.ui.stop.show()
-
-        if self.state == 2:
-            self.ui.back.show()
-            self.ui.stop.hide()
-
-            pass
-
-    def check_path(self, _path):
-        if not os.path.exists(_path):
-            os.mkdir(_path)
-        return True
-
-    def show_progress(self, *args, **kwargs):
-        pass
-
-    # todo 主程序处理
-    def run(self):
-        config_data = self.get_config()
-        if not config_data:
-            return
-        self.queren = QueRen(self)
-        ret = self.queren.exec()
-        if ret == QDialog.Accepted:
-            print("对话框以接受状态关闭")
-            for key, value in self.queren.get_config().items():
-                config_data[key] = value
-            config_data["sign_text"] = "开始抠图"
-            for key, value in config_data.items():
-                print("key:{},  value:{}".format(key, value))
-            self.set_state(state_value=1)
-            self.run_end_sign.emit(config_data)
-
-    # 解析指定模板页面数据
-    def check_assigned_page(self, text: str):
-
-        try:
-            # temp_dict 示例{“4”:“xiaosushuoxie-4”}
-            temp_dict = {}
-            for i in self.temp_list:
-                temp_dict[i[-1]] = i
-
-            text = text.replace(" ", "")
-            text = text.replace(",", ",")
-            text = text.replace(":", ":")
-            text = text.replace(";", ",")
-            assigned_page_list = text.split(",")
-            assigned_page_dict = {}
-            for i in assigned_page_list:
-                if not i:
-                    continue
-                _k, _v = i.split(":")
-                _k = temp_dict[_k]
-                if _k not in assigned_page_dict:
-                    assigned_page_dict[_k] = []
-                if _v not in assigned_page_dict[_k]:
-                    assigned_page_dict[_k].append(_v)
-            # assigned_page_dict 数据结构,一个模板中存在多个页面数值。
-            return assigned_page_dict
-        except:
-            return {}
-
-    # 弹出对话框
-    def show_dialog(self, data):
-        windows = data["windows"]
-        windows.dialog_result = ""
-        my_dialog = DialogShow(self, text=data["text"],
-                               button_1=data["button_1"] if "button_1" in data else None,
-                               button_2=data["button_2"] if "button_2" in data else None,
-                               button_3=data["button_3"] if "button_3" in data else None, )
-        ret = my_dialog.exec()
-        print("641  my_dialog.flag_name", my_dialog.flag_name)
-        # 根据用户的选择发出相应的信号
-        windows.dialog_result_signal.emit(my_dialog.flag_name)

+ 0 - 77
python/service/auto_deal_pics/queren_control.py

@@ -1,77 +0,0 @@
-from UI.auto_deal_pics_ui.queren import Ui_Dialog as queren_Ui_Dialog
-from import_qt_mode import *
-import settings
-
-
-class QueRen(QDialog):
-    def __init__(self, parent):
-        super().__init__(parent)
-        self.ui = queren_Ui_Dialog()
-        self.ui.setupUi(self)
-        self.init()
-        self.show()
-
-    def get_config(self):
-        config_data = {}
-        config_data["cutout_is_enable"] = self.ui.cutout_is_enable.isChecked()
-        config_data["cutout_is_pass"] = self.ui.cutout_is_pass.isChecked()
-        config_data["detail_is_enable"] = self.ui.detail_is_enable.isChecked()
-        config_data["detail_is_pass"] = self.ui.detail_is_pass.isChecked()
-        config_data["upload_is_enable"] = self.ui.upload_is_enable.isChecked()
-        config_data["upload_is_pass"] = self.ui.upload_is_pass.isChecked()
-
-        # 保存配置
-        settings.GOODS_DETAIL_CUTOUT_IS_ENABLE = self.ui.cutout_is_enable.isChecked()
-        settings.GOODS_DETAIL_CUTOUT_IS_PASS = self.ui.cutout_is_pass.isChecked()
-        settings.GOODS_DETAIL_DETAIL_IS_ENABLE = self.ui.detail_is_enable.isChecked()
-        settings.GOODS_DETAIL_DETAIL_IS_PASS = self.ui.detail_is_pass.isChecked()
-        settings.GOODS_DETAIL_UPLOAD_IS_ENABLE = self.ui.upload_is_enable.isChecked()
-        settings.GOODS_DETAIL_UPLOAD_IS_PASS = self.ui.upload_is_pass.isChecked()
-
-        data_dict = {
-            "goods_detail_cutout_is_enable": "是" if settings.GOODS_DETAIL_CUTOUT_IS_ENABLE else "否",
-            "goods_detail_cutout_is_pass": "是" if settings.GOODS_DETAIL_CUTOUT_IS_PASS else "否",
-            "goods_detail_detail_is_enable": "是" if settings.GOODS_DETAIL_DETAIL_IS_ENABLE else "否",
-            "goods_detail_detail_is_pass": "是" if settings.GOODS_DETAIL_DETAIL_IS_PASS else "否",
-            "goods_detail_upload_is_enable": "是" if settings.GOODS_DETAIL_UPLOAD_IS_ENABLE else "否",
-            "goods_detail_upload_is_pass": "是" if settings.GOODS_DETAIL_UPLOAD_IS_PASS else "否",
-        }
-        settings.set_config(data_dict=data_dict, section="goods_detail")
-        return config_data
-
-    def result(self):
-        if self.result() == QDialog.Accepted:
-            print("用户点击了确认")
-        else:
-            print("用户点击了取消")
-
-    def init(self):
-        # 修改按钮文本
-        self.ui.buttonBox.button(QDialogButtonBox.Ok).setText("确认")
-        self.ui.buttonBox.button(QDialogButtonBox.Cancel).setText("取消")
-        # 连接 accepted和rejected信号到槽函数
-        self.ui.buttonBox.accepted.connect(self.accept)
-        self.ui.buttonBox.rejected.connect(self.reject)
-
-        # GOODS_DETAIL_CUTOUT_IS_ENABLE = get_dict_value(cutimage_dict, "goods_detail_cutout_is_enable", True)  # 上次的模式
-        # GOODS_DETAIL_CUTOUT_IS_PASS = get_dict_value(cutimage_dict, "goods_detail_cutout_is_pass", True)  # 上次的模式
-        # GOODS_DETAIL_DETAIL_IS_ENABLE = get_dict_value(cutimage_dict, "goods_detail_detail_is_enable", True)  # 上次的模式
-        # GOODS_DETAIL_DETAIL_IS_PASS = get_dict_value(cutimage_dict, "goods_detail_detail_is_pass", True)  # 上次的模式
-        # GOODS_DETAIL_UPLOAD_IS_ENABLE = get_dict_value(cutimage_dict, "goods_detail_upload_is_enable", True)  # 上次的模式
-        self.ui.cutout_is_enable.setChecked(settings.GOODS_DETAIL_CUTOUT_IS_ENABLE)
-        self.ui.cutout_is_pass.setChecked(settings.GOODS_DETAIL_CUTOUT_IS_PASS)
-        self.ui.detail_is_enable.setChecked(settings.GOODS_DETAIL_DETAIL_IS_ENABLE)
-        self.ui.detail_is_pass.setChecked(settings.GOODS_DETAIL_DETAIL_IS_PASS)
-
-        print("settings.Company", settings.Company)
-        if "红蜻蜓" in settings.Company or "惠利玛" in settings.Company:
-            self.ui.upload_is_enable.show()
-            self.ui.label_3.show()
-            self.ui.upload_is_enable.setChecked(settings.GOODS_DETAIL_UPLOAD_IS_ENABLE)
-            self.ui.upload_is_pass.setChecked(settings.GOODS_DETAIL_UPLOAD_IS_PASS)
-        else:
-            self.ui.upload_is_enable.hide()
-            self.ui.label_3.hide()
-            self.ui.upload_is_pass.hide()
-            self.ui.upload_is_enable.setChecked(False)
-            self.ui.upload_is_pass.setChecked(False)

+ 0 - 1005
python/service/auto_deal_pics/run_main.py

@@ -1,1005 +0,0 @@
-import settings
-from module.view_control.generate_goods_no_detail_pic import detail_func
-import json
-from module.base_mode.base import *
-from import_qt_mode import *
-from module.view_control.match_and_cutout_mode_control.base_deal_image_v2 import BaseDealImage
-from module.view_control.MineQWidget import DialogShow, WorkerOneThread
-import threading
-from concurrent.futures import ThreadPoolExecutor
-import concurrent.futures
-from module.view_control.generate_goods_no_detail_pic.data import DataModeGenerateDetail, DataModeUploadPic
-from module.view_control.generate_goods_no_detail_pic.detail_func import create_folder
-import time
-from PIL import Image
-from io import BytesIO
-import os, re
-from functools import partial
-# from multiprocessing import Process, Queue
-import pickle
-
-
-class RunMain(QThread):
-    run_end_sign = Signal(dict)
-    show_dialog_sign = Signal(dict)
-    show_progress_detail_sign = Signal(str)
-
-    # 定义一个信号用于请求显示对话框
-    show_dialog_signal = Signal()
-    # 定义一个信号用于返回对话框的结果
-    dialog_result_signal = Signal(str)
-
-    # dialog_result_signal = Signal(str)
-
-    def __init__(self, windows):
-        super().__init__()
-        self.windows = windows
-        self.dialog_result = ""
-        self.data_mode_generate_detail = DataModeGenerateDetail()
-        self.dialog_result_signal.connect(self.on_dialog_result)
-        self.event = threading.Event()
-
-    def set_state(self, state_value: int):
-        # 0禁用  1进行中  2已结束
-        if state_value not in [0, 1, 2, 99]:
-            return
-        self.windows.change_state_sign.emit(state_value)
-        # self.windows.set_state(state_value)
-
-    # 抠图前先做数据规整处理;类似详情图生成逻辑
-    def check_before_cutout(self, config_data):
-        return_data = {
-            "code": 99,
-            "message": "",
-            "data": {
-                "all_goods_art_no_folder_data": [],
-                "config_data": config_data,
-            },
-        }
-
-        image_dir = config_data["image_dir"]
-        image_order = config_data["image_order"]
-        is_check_number = config_data["is_check_number"]
-        is_filter = config_data["cutout_is_pass"]
-        resize_image_view = config_data["resize_image_view"]
-        logo_path = config_data["logo_path"]
-        cutout_mode = config_data["cutout_mode"]  # 是否精细化抠图,默认为普通抠图
-        special_goods_art_no_folder_line = config_data["special_goods_art_no_folder_line"]
-
-        # 自动处理红蜻蜓货号,进行重命名
-        if settings.PROJECT == "红蜻蜓":
-            # 规整红蜻蜓货号图
-            all_goods_art_no_folder_data = get_all_goods_art_no_folder(path=image_dir)
-            BaseDealImage().rename_folder_for_hqt(all_goods_art_no_folder_data=all_goods_art_no_folder_data)
-
-        # 重新获取文件夹信息
-        all_goods_art_no_folder_data = get_all_goods_art_no_folder(path=image_dir)
-
-        f = True
-        is_do_other = False
-        if is_do_other:
-            for i in all_goods_art_no_folder_data:
-                i["label"] = "不处理"
-            is_filter = False
-            specified_goods_art_no_folder = special_goods_art_no_folder_line
-            specified_goods_art_no_folder = specified_goods_art_no_folder.strip()
-            specified_goods_art_no_folder = specified_goods_art_no_folder.replace(",", ",")
-            specified_goods_art_no_folder_list = specified_goods_art_no_folder.split(",")
-            specified_goods_art_no_folder_list = [x for x in specified_goods_art_no_folder_list if x]
-            if not specified_goods_art_no_folder_list:
-                return_data["message"] += '请手动输入文件夹名称(多选),或关闭指定文件夹模式\n'
-            else:
-                for i in all_goods_art_no_folder_data:
-                    if i["folder_path"] in specified_goods_art_no_folder_list:
-                        i["label"] = "待处理"
-            # 哪些数据不合规
-            all_folder_name_list = [x["folder_name"] for x in all_goods_art_no_folder_data]
-            for goods_art_no_folder_name in specified_goods_art_no_folder_list:
-                if goods_art_no_folder_name not in all_folder_name_list:
-                    return_data["message"] += '文件夹:{},在您选的目录下不存在\n'.format(goods_art_no_folder_name)
-                    f = False
-
-        if not f:
-            self.set_state(state_value=2)
-            return
-
-        # 清空指定文件夹的已抠图文件
-        if is_do_other:
-            for folder_data in all_goods_art_no_folder_data:
-                goods_art_no_folder_path = "{}/原始图_已抠图".format(folder_data["folder_path"])
-                if os.path.exists(goods_art_no_folder_path):
-                    remove_all_file(goods_art_no_folder_path)
-
-        return_data["data"]["succeed_folder_list"] = 1
-
-        # ==================检查填写的图片视角是否符合要求
-        res = BaseDealImage().getImageOrder(image_order=image_order, resize_image_view=resize_image_view)
-        if res['code'] != 0:
-            return_data["message"] += "{}\n".format(res['msg'])
-            return return_data
-        else:
-            # 图片命名顺序
-            image_order_list = res['imageOrderList']
-            for goods_art_no_folder_data in all_goods_art_no_folder_data:
-                if goods_art_no_folder_data["label"] != "待处理":
-                    continue
-                goods_art_no_folder_data["image_order_list"] = image_order_list
-
-        # ================是否过滤已有生成的文件夹
-        if is_filter:
-            for goods_art_no_folder_data in all_goods_art_no_folder_data:
-                if goods_art_no_folder_data["label"] != "待处理":
-                    continue
-                folder_path = goods_art_no_folder_data["folder_path"]
-                _p = "{}/800x800".format(folder_path)
-                if os.path.exists(_p):
-                    if len(os.listdir(_p)):
-                        goods_art_no_folder_data["label"] = "不处理"
-
-        # ================检查每个货号文件夹图片数量是否符合要求
-        all_goods_art_no_folder_data, message = BaseDealImage().check_folders_image_amount(all_goods_art_no_folder_data,
-                                                                                           image_order_list)
-        if message:
-            return_data["message"] += "{}\n".format(message)
-        return_data["code"] = 0
-        return_data["data"]["all_goods_art_no_folder_data"] = all_goods_art_no_folder_data
-        return_data["data"]["image_dir"] = image_dir
-        return_data["data"]["resize_image_view"] = resize_image_view
-        return_data["data"]["cutout_mode"] = cutout_mode
-        return_data["data"]["image_order_list"] = image_order_list
-        return_data["data"]["logo_path"] = logo_path
-        return return_data
-
-    # 抠图校验后的回调函数处理
-    def check_for_cutout_image_first_call_back(self, return_data):
-        # return_data = {
-        #     "code": 99,
-        #     "message": "",
-        #     "data": {
-        #         "all_goods_art_no_folder_data": [],
-        #     },
-        # }
-        code = return_data["code"]
-        config_data = return_data["data"]["config_data"]
-        config_data["sign_text"] = ""
-        if code != 0:
-            # self.windows.show_message(return_data["message"])
-            # self.show_progress_detail(return_data["message"])
-            _dialog_dict = {"text": return_data["message"],
-                            "windows": self,
-                            }
-            self.show_dialog_sign.emit(_dialog_dict)
-            self.event.wait()
-            return
-
-        do_next = False
-        text = ""
-        all_goods_art_no_folder_data = return_data["data"]["all_goods_art_no_folder_data"]
-        button_1, button_2, button_3 = None, None, None
-        text += return_data["message"]
-        # 存在错误文件夹
-        error_folder = [x for x in all_goods_art_no_folder_data if x["label"] == "错误"]
-        todo_folder = [x for x in all_goods_art_no_folder_data if x["label"] == "待处理"]
-        if error_folder:
-            button_2 = "移除错误文件"
-        if error_folder and todo_folder:
-            button_1 = "移除并继续"
-            button_3 = "继续(忽略其他)"
-        if not error_folder and todo_folder:
-            button_1 = "继续"
-            # do_next = True
-        text += "\n==================\n错误数据:{}个,校验无误数据:{}个".format(len(error_folder), len(todo_folder))
-        self.show_progress_detail(text)
-        if button_1 is None and button_2 is None and button_3 is None:
-            pass
-        elif button_1 == "继续" and button_2 is None and button_3 is None:
-            do_next = True
-        else:
-            print("runmain  179----------------")
-            # print(self)
-            # print(self.windows)
-            _dialog_dict = {"text": text,
-                            "button_1": button_1,
-                            "button_2": button_2,
-                            "button_3": button_3,
-                            "windows": self,
-                            }
-            self.show_dialog_sign.emit(_dialog_dict)
-            # self.exec_()
-            # 等待事件被设置
-            self.event.wait()
-            print("self.dialog_result", self.dialog_result)
-            #
-            # my_dialog = DialogShow(self.windows, text=text, button_1=button_1, button_2=button_2,
-            #                        button_3=button_3)
-            # ret = my_dialog.exec()
-            print("460  ===============my_dialog.flag_name===============")
-            # print(my_dialog.flag_name)
-
-            if "移除" in self.dialog_result:
-                for error_folder_data in [x for x in all_goods_art_no_folder_data if x["label"] == "错误"]:
-                    self.move_error_folders(
-                        one_path=error_folder_data["folder_path"],
-                        target_folder="{}/软件-处理失败".format(config_data["image_dir"]),
-                    )
-            if "继续" in self.dialog_result:
-                do_next = True
-
-        if do_next:
-            all_goods_art_no_folder_data = [x for x in all_goods_art_no_folder_data if x["label"] == "待处理"]
-            print("===============all_goods_art_no_folder_data===============")
-            print(all_goods_art_no_folder_data)
-
-            new_func = partial(self.do_run_cutout_image,
-                               all_goods_art_no_folder_data=all_goods_art_no_folder_data,
-                               callback_func=self.show_progress_detail,
-                               image_order_list=return_data["data"]["image_order_list"],
-                               cutout_mode=return_data["data"]["cutout_mode"],
-                               resize_image_view=return_data["data"]["resize_image_view"],
-                               windows=self.windows,
-                               logo_path=return_data["data"]["logo_path"],
-                               config_data=config_data)
-            self._w_3 = WorkerOneThread(func=new_func, name="_w_3")
-            self._w_3.start()
-
-            # self.t = threading.Thread(target=self.do_run_cutout_image,
-            #                           kwargs={"all_goods_art_no_folder_data": all_goods_art_no_folder_data,
-            #                                   "callback_func": self.show_progress_detail,
-            #                                   "image_order_list": return_data["data"]["image_order_list"],
-            #                                   "cutout_mode": return_data["data"]["cutout_mode"],
-            #                                   "resize_image_view": return_data["data"]["resize_image_view"],
-            #                                   "windows": self.windows,
-            #                                   "logo_path": return_data["data"]["logo_path"],
-            #                                   "config_data": config_data,
-            #                                   })
-            # self.t.start()
-
-        else:
-            config_data["sign_text"] = "已结束抠图处理"
-            self.run_end_sign.emit(config_data)
-
-    def do_run_cutout_image(self,
-                            all_goods_art_no_folder_data,
-                            callback_func,
-                            image_order_list,
-                            cutout_mode,
-                            resize_image_view,
-                            windows,
-                            logo_path,
-                            config_data):
-
-        BaseDealImage().run_main(all_goods_art_no_folder_data=all_goods_art_no_folder_data,
-                                 callback_func=callback_func,
-                                 image_order_list=image_order_list,
-                                 cutout_mode=cutout_mode,
-                                 resize_image_view=resize_image_view,
-                                 windows=windows,
-                                 logo_path=logo_path,
-                                 )
-
-        # ==============完成处理==============
-        # self.set_state(state_value=2)
-        callback_func("已结束抠图处理")
-        config_data["sign_text"] = "已结束抠图处理"
-        self.run_end_sign.emit(config_data)
-
-    def do_run_cutout_image1111(self, all_goods_art_no_folder_data,
-                                callback_func,
-                                image_order_list,
-                                cutout_mode,
-                                resize_image_view,
-                                windows,
-                                logo_path,
-                                config_data):
-
-        max_workers = 1
-        with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
-            futures = []
-            futures.append(executor.submit(
-                BaseDealImage().run_main,
-                all_goods_art_no_folder_data=all_goods_art_no_folder_data,
-                callback_func=callback_func,
-                image_order_list=image_order_list,
-                cutout_mode=cutout_mode,
-                resize_image_view=resize_image_view,
-                windows=windows,
-                logo_path=logo_path,
-            ))
-
-            # 使用 wait 方法等待所有任务完成
-            done, not_done = concurrent.futures.wait(futures, timeout=60)
-            # 处理完成的任务
-            for future in done:
-                if settings.IS_TEST:
-                    result = future.result()
-                else:
-                    try:
-                        result = future.result()
-                    except BaseException as e:
-                        print("2039 图片处理失败.{}".format(e))
-                        callback_func("2039 处理失败.{}".format(e))
-
-        # ==============完成处理==============
-
-        # self.set_state(state_value=2)
-        callback_func("已结束抠图处理")
-        config_data["sign_text"] = "已结束抠图处理"
-        self.run_end_sign.emit(config_data)
-
-    def check_before_detail(self, config_data):
-
-        # =============
-        # 整体数据校验,返回错误内容,以及
-        # temp_name:模板名称
-        """
-        步骤:
-        1、 整体文件夹检查,并输出数据结构
-        2、数据进行对应规整(可能有excel,红蜻蜓等)
-        3、执行单个款数据处理
-        """
-        return_data = {
-            "code": 99,
-            "message": "",
-            "data": {
-                "error_folder_list": [],
-                "goods_no_dict": {},
-                "succeed_folder_list": [],
-                "temp_name": config_data["temp_name"],
-                "temp_name_list": config_data["temp_name_list"],
-                "assigned_page_dict": config_data["assigned_page_dict"],
-                "excel_temp_goods_no_data": {},  # 表格数据可能存在多模板,数据结构为一个款号下的多个模板的数据列表
-                "finally_goods_no_need_temps": {},  # 每个款号需要生成的模板数据
-                "config_data": config_data,
-            },
-        }
-        temp_name = config_data["temp_name"]
-        temp_name_list = config_data["temp_name_list"]
-        assigned_page_dict = config_data["assigned_page_dict"]
-        image_dir = config_data["image_dir"]
-        is_use_excel = config_data["is_use_excel"]
-        excel_path = config_data["excel_path"]
-        temp_class = config_data["temp_class"]
-        is_check_color_is_all = config_data["is_check_color_is_all"]
-        detail_is_pass = config_data["detail_is_pass"]
-
-        error_folder_list = []
-        # 遍历货号获取所有货号--可能为编号
-        folder_name_list = detail_func.get_all_dir_info(image_dir=image_dir)
-        if not folder_name_list:
-            return_data["message"] += "不存在任何货号/编号文件夹\n"
-            print("不存在任何货号/编号文件夹")
-            return return_data
-
-        # =========================组装数据---数据来源多种途径=========================
-        _result = {"code": 99, "message": "无法解析到数据,请检查登录企业"}
-        if not is_use_excel:
-            if settings.PROJECT == "红蜻蜓":
-                # goods_no_dict输出为文件夹下涉及到的所有款为key的字典,后续通过解析字典,进行提取对应文件夹
-                _result = self.data_mode_generate_detail.get_basic_goods_art_data_by_hqt_and_hlm(
-                    folder_name_list
-                )
-
-            elif settings.PROJECT == "惠利玛":
-                if settings.Company:
-                    if "惠利玛" in settings.Company:
-                        _result = self.data_mode_generate_detail.get_basic_goods_art_data_by_hqt_and_hlm(
-                            folder_name_list
-                        )
-        else:
-            keys = settings.keys
-            _result = (
-                self.data_mode_generate_detail.get_basic_goods_art_data_form_excel(
-                    folder_name_list,
-                    excel_path,
-                    keys,
-                )
-            )
-
-        if _result["code"] == 0:
-            remote_data = _result["data"]
-        else:
-            return_data["message"] += _result["message"] + "\n"
-            return return_data
-        # print(json.dumps(remote_data))
-        # =========================拼接数据组合为款数据=========================
-        """
-        1、获取所有文件夹基础数据内容
-        2、结合上述返回结果进行数据组合拼接
-        3、输出结果为按款为主键信息
-        4、注意模板ID
-        """
-        # 获取所有文件夹基础数据内容  检查不满足要求的文件不满足要求移动到错误文件夹
-        need_view_list = temp_class[temp_name].need_view
-        _all_dir_info_data = detail_func.get_all_dir_info_and_pic_info(
-            image_dir, folder_name_list, need_view_list
-        )
-        all_dir_info_data = {}
-        for one_folder, value in _all_dir_info_data.items():
-            if "message" in value:
-                if value["message"]:
-                    error_folder_list.append(
-                        {
-                            "folder_name": one_folder,
-                            "folder_path": "{}/{}".format(image_dir, one_folder),
-                        }
-                    )
-                    return_data["message"] += "文件夹:{} 结构错误:{}\n".format(
-                        one_folder, value["message"]
-                    )
-                    continue
-
-            # 符合要求的数据处理
-            all_dir_info_data[one_folder] = value
-
-        # 结合上述返回结果进行数据组合拼接
-        # 返回可能存在的情况:1、存在文件夹不匹配数据,2、存在货号数据缺失
-        goods_no_dict, error_folder_name_list = detail_func.merge_local_and_remote_data(
-            all_dir_info_data=all_dir_info_data, remote_data=remote_data
-        )
-        # 文件在系统中没有匹配的结果
-        if error_folder_name_list:
-            for one_folder in error_folder_name_list:
-                error_folder_list.append(
-                    {
-                        "folder_name": one_folder,
-                        "folder_path": "{}/{}".format(image_dir, one_folder),
-                    }
-                )
-                return_data["message"] += "文件夹:{} 找不到对应数据\n".format(
-                    one_folder
-                )
-
-        print("===============goods_no_dict==================")
-        if settings.IS_TEST:
-            _text = json.dumps(goods_no_dict)
-            print(goods_no_dict)
-            create_folder("qt_test")
-            with open("qt_test/goods_no_dict.txt", 'w', encoding='utf-8') as file:
-                file.write(_text)
-        print("===============goods_no_dict==================")
-
-        # ===================================是否齐色检查=============================================
-        # 如为红蜻蜓企业则还需要检查同款下是否齐全;数据返回结果为款号列表
-        error_data_dict = {}
-        if is_check_color_is_all:
-            if not is_use_excel:
-                if settings.PROJECT == "红蜻蜓":
-                    error_data_dict = (
-                        self.data_mode_generate_detail.check_goods_is_not_deficiency(
-                            goods_no_dict
-                        )
-                    )
-            else:
-                error_data_dict = self.data_mode_generate_detail.check_goods_is_not_deficiency_form_excel(
-                    goods_no_dict, excel_path
-                )
-
-        if error_data_dict:
-            print("----error_data_dict----")
-            print(json.dumps(error_data_dict))
-
-            # 款号反向映射;因为部分key键格式为KUM9999999
-            _x = {}
-            for i, v in goods_no_dict.items():
-                _x[v["款号"]] = i
-
-            for goods_no, value in error_data_dict.items():
-                if goods_no in _x:
-                    goods_no = _x[goods_no]
-                if goods_no in goods_no_dict:
-                    # =====移动到错误文件夹======
-                    for _folder_name in [
-                        x["文件夹名称"] for x in goods_no_dict[goods_no]["货号资料"]
-                    ]:
-                        error_folder_list.append(
-                            {
-                                "folder_name": _folder_name,
-                                "folder_path": "{}\{}".format(
-                                    image_dir, _folder_name
-                                ),
-                            }
-                        )
-                        return_data["message"] += "文件夹:{};{}\n".format(
-                            _folder_name, value["message"]
-                        )
-                    # 从 正确 款下面进行数据剔除
-                    goods_no_dict.pop(goods_no)
-
-        print("-----------------1goods_no_dict---------------")
-        print(json.dumps(goods_no_dict, ensure_ascii=False))
-        print("-----------------1goods_no_dict---------------")
-
-        # 如果没有有效数据则进行退出
-        if not goods_no_dict:
-            return_data["message"] += "没有任何有效数据\n"
-            return return_data
-
-        # 校验无误的文件夹数据  goods_no_dict为最终有效数据
-        for goods_no, value in goods_no_dict.items():
-            return_data["data"]["succeed_folder_list"].extend(
-                [x["文件夹名称"] for x in goods_no_dict[goods_no]["货号资料"]]
-            )
-
-        # 如果是表格数据,则获取表格数据中需要生成的货号
-        # 数据结构
-        # {“款号1”:
-        # {“模板名称1”:data_dict1,
-        # “模板名称2”:data_dict2,
-        # }}
-
-        if is_use_excel:
-            excel_temp_goods_no_data = self.data_mode_generate_detail.get_basic_template_information(
-                _goods_no_dict=goods_no_dict, excel_path=excel_path)
-        else:
-            excel_temp_goods_no_data = {}
-
-        print("731===================excel_temp_goods_no_data,is_use_excel:{}".format(is_use_excel))
-        print(json.dumps(excel_temp_goods_no_data))
-
-        # ===========数据组装,统计每个款需要生成哪些模板==============
-        # 不适用表格指定模板
-        goods_no_need_temps = {}
-        # isUseTemplate 为false 表示使用excel表格数据
-        if not is_use_excel:
-            for i in goods_no_dict:
-                goods_no_need_temps[i] = [temp_name]
-        else:
-            for i in goods_no_dict:
-                # i 为款号
-                if i in excel_temp_goods_no_data:
-                    # 获取 某个款号的所有允许生成的模板列表
-                    goods_no_need_temps[i] = list(excel_temp_goods_no_data[i].keys())
-
-        # ========开始执行详情图生成===================
-        # _goods_no_dict = goods_no_dict
-        _goods_no_dict = {}
-
-        # assigned_page_dict 如存在对应模板的,则不管是否有过滤都需要生成
-        # 检查是否已存在模板,已存在的需要进行跳过;可能部分模板已存在,部分不存在。
-        finally_goods_no_need_temps = {}
-        for goods_no, value in goods_no_dict.items():
-            if goods_no not in goods_no_need_temps:
-                continue
-            for __temp_name in goods_no_need_temps[goods_no]:
-                _path = "{}/{}/{}/{}".format(image_dir, "软件-详情图生成", __temp_name, goods_no)
-                if not os.path.exists(_path):
-                    print("款号详情图不存在", _path)
-                    if goods_no not in finally_goods_no_need_temps:
-                        finally_goods_no_need_temps[goods_no] = []
-                        _goods_no_dict[goods_no] = value  # 需要生成的数据
-                    finally_goods_no_need_temps[goods_no].append(__temp_name)
-                else:
-                    print("款号详情图存在", _path)
-                    # 如果在指定模板中存在,则也需要生成
-                    if __temp_name in assigned_page_dict:
-                        print("指定模板需要更新", _path)
-                        if goods_no not in finally_goods_no_need_temps:
-                            finally_goods_no_need_temps[goods_no] = []
-                            _goods_no_dict[goods_no] = value  # 需要生成的数据
-                        finally_goods_no_need_temps[goods_no].append(__temp_name)
-                    else:
-                        if detail_is_pass:
-                            return_data["message"] += "\n款号:{},模板:{} 已存在".format(goods_no, __temp_name)
-                        else:
-                            if goods_no not in finally_goods_no_need_temps:
-                                finally_goods_no_need_temps[goods_no] = []
-                                _goods_no_dict[goods_no] = value  # 需要生成的数据
-                            finally_goods_no_need_temps[goods_no].append(__temp_name)
-
-            pass
-            # _path = "{}/{}".format(self.image_dir, "软件-详情图生成")
-            # if os.path.exists(_path):
-            #     _goods_no_dict = {}
-            #     # 数据返回为 已有的款数据,为款号列表
-            #     is_pass_goods_no = detail_func.get_all_detail_info(_path)
-            #     for goods_no, value in goods_no_dict.items():
-            #         if "软件" in goods_no:
-            #             continue
-            #
-            #         if value["模板名称"] in assigned_page_dict:
-            #             need_todo = True
-            #         else:
-            #             if goods_no in is_pass_goods_no:
-            #                 need_todo = False
-            #             else:
-            #                 need_todo = True
-            #         if need_todo:
-            #             _goods_no_dict[goods_no] = value
-
-        print("-----------------2goods_no_dict---------------")
-        print(json.dumps(_goods_no_dict, ensure_ascii=False))
-        print("-----------------2goods_no_dict---------------")
-        return_data["data"]["error_folder_list"] = error_folder_list
-
-        if len(_goods_no_dict) == 0:
-            return_data["message"] += "\n没有任何文件夹需要执行"
-
-        return_data["data"]["goods_no_dict"] = _goods_no_dict
-        return_data["data"]["excel_temp_goods_no_data"] = excel_temp_goods_no_data
-        return_data["data"]["finally_goods_no_need_temps"] = finally_goods_no_need_temps
-
-        return_data["code"] = 0
-        return return_data
-
-    def move_error_folders(self, one_path, target_folder, message=""):
-        if os.path.exists(one_path):
-            check_path(target_folder)
-            move_folders(path_list=[one_path], target_folder=target_folder)
-
-    def check_for_detail_first_call_back(self, data):
-        # 首次数据校验的信息返回
-        # self.show_message(text="22222222222222222222222")
-        # QMessageBox.critical(self, "警告", "1111111", QMessageBox.Ok)
-        code = data["code"]
-        config_data = data["data"]["config_data"]
-        target_error_folder = config_data["target_error_folder"]
-        print("635  check_for_detail_first_call_back")
-        print(data)
-        if code != 0:
-            # self.windows.show_message(data["message"])
-            # my_dialog = DialogShow(self.windows.windows, text=data["message"])
-            # ret = my_dialog.exec()
-            self.show_progress_detail(text=data["message"])
-            _dialog_dict = {"text": data["message"],
-                            "windows": self,
-                            }
-            self.show_dialog_sign.emit(_dialog_dict)
-            self.event.wait()
-
-            # self.windows.set_state(2)
-            config_data["sign_text"] = "已结束详情处理"
-            self.run_end_sign.emit(config_data)
-            return
-
-        do_next = False
-        if data["message"]:
-            button_1, button_2, button_3 = None, None, None
-            text = data["message"]
-            if code == 0:
-                if data["data"]:
-                    if data["data"]["error_folder_list"]:
-                        print("22----------error_folder_list------------")
-                        print(json.dumps(data["data"]["error_folder_list"]))
-                        button_2 = "移除错误文件"
-                    if data["data"]["goods_no_dict"]:
-                        if button_2:
-                            button_1 = "移除并继续"
-                            button_3 = "继续(忽略其他)"
-                        else:
-                            button_1 = "继续"
-                    if data["data"]["succeed_folder_list"]:
-                        text += "\n==================\n校验无误数据:{}个文件夹".format(
-                            len(data["data"]["succeed_folder_list"])
-                        )
-            self.show_progress_detail(text=data["message"])
-            if button_1 is None and button_2 is None and button_3 is None:
-                pass
-            elif button_1 == "继续" and button_2 is None and button_3 is None:
-                do_next = True
-            else:
-                print("runmain  642----------------")
-                # todo 弹框修改处理等
-                _dialog_dict = {"text": text,
-                                "button_1": button_1,
-                                "button_2": button_2,
-                                "button_3": button_3,
-                                "windows": self,
-                                }
-                self.show_dialog_sign.emit(_dialog_dict)
-                # 等待事件被设置
-                self.event.wait()
-                print("self.dialog_result", self.dialog_result)
-
-                # my_dialog = DialogShow(
-                #     self.windows, text=text, button_1=button_1, button_2=button_2, button_3=button_3
-                # )
-                print("my_dialog.flag_name", self.dialog_result)
-                if "移除" in self.dialog_result:
-                    for error_folder_data in data["data"]["error_folder_list"]:
-                        self.move_error_folders(
-                            one_path=error_folder_data["folder_path"],
-                            target_folder=target_error_folder,
-                        )
-                if "继续" in self.dialog_result:
-                    do_next = True
-
-        if data["data"]["goods_no_dict"] and not data["data"]["error_folder_list"]:
-            do_next = True
-
-        if do_next:
-            # self.set_state(state_value=1)
-            getAllData = data["data"]
-            base_temp_name = getAllData["temp_name"]
-            set_temp_name = getAllData.get("template_name", "")
-            kwargs = {
-                "config_data": config_data,
-                "_goods_no_dict": data["data"]["goods_no_dict"],
-                "temp_name": base_temp_name,
-                "temp_name_list": data["data"]["temp_name_list"],
-                "assigned_page_dict": data["data"]["assigned_page_dict"],
-                "excel_temp_goods_no_data": data["data"]["excel_temp_goods_no_data"],
-                # 表格数据可能存在多模板,数据结构为一个款号下的多个模板的数据列表
-                "finally_goods_no_need_temps": data["data"]["finally_goods_no_need_temps"],  # 每个款号需要生成的模板数据
-            }
-            # todo work
-            new_func = partial(self.detail_run_by_thread,
-                               config_data=kwargs["config_data"],
-                               _goods_no_dict=kwargs["_goods_no_dict"],
-                               temp_name=kwargs["temp_name"],
-                               temp_name_list=kwargs["temp_name_list"],
-                               assigned_page_dict=kwargs["assigned_page_dict"],
-                               excel_temp_goods_no_data=kwargs["excel_temp_goods_no_data"],
-                               finally_goods_no_need_temps=kwargs["finally_goods_no_need_temps"])
-            self._w_3 = WorkerOneThread(func=new_func, name="_w_3")
-            self._w_3.start()
-            # threading.Thread(target=self.detail_run_by_thread, kwargs=kwargs).start()
-        else:
-            config_data["sign_text"] = "已结束详情处理"
-            self.run_end_sign.emit(config_data)
-
-    def detail_run_by_thread(self, config_data, _goods_no_dict, temp_name, temp_name_list, assigned_page_dict,
-                             excel_temp_goods_no_data,
-                             finally_goods_no_need_temps):
-        """
-        excel_temp_goods_no_data: {},  # 表格数据可能存在多模板,数据结构为一个款号下的多个模板的数据列表
-        finally_goods_no_need_temps: {},  # 每个款号需要生成的模板数据
-        """
-
-        # 开始处理
-        self.n = 0
-        self.total_num = len(_goods_no_dict)
-        self.fail_num = 0
-        is_use_excel = config_data["is_use_excel"]
-        image_dir = config_data["image_dir"]
-
-        # 详情图生成结果文件夹
-        out_put_dir = "{}\软件-详情图生成".format(image_dir)
-        if settings.IS_TEST:
-            print("==============_goods_no_dict  打印=================")
-
-            print(json.dumps(_goods_no_dict))
-
-            print("==============_goods_no_dict  打印-end=================")
-
-        all_detail_path_list = []
-        for goods_no, temp_name_list in finally_goods_no_need_temps.items():
-            try:
-                for _temp_name in temp_name_list:
-                    # if _temp_name != "xiaosushuoxie-4":
-                    #     continue
-
-                    assigned_page_list = []
-                    if _temp_name in assigned_page_dict:
-                        assigned_page_list = assigned_page_dict[_temp_name]
-                    # 如果为使用表格,则获取表格中的数据作为款号的基础数据
-                    temp_info_data = copy.copy(_goods_no_dict[goods_no])
-                    if is_use_excel:
-                        # 将表格中的数据进行替换
-                        if goods_no in excel_temp_goods_no_data:
-                            if _temp_name in excel_temp_goods_no_data[goods_no]:
-                                # 将表格中的特定的模板的行,替换到goods_no的data中,因为不同的模板有数据特殊性
-                                for _key, _key_value in excel_temp_goods_no_data[goods_no][_temp_name].items():
-                                    if _key in temp_info_data:
-                                        temp_info_data[_key] = _key_value
-
-                    print("temp_info_data")
-                    print("goods_no:{},_temp_name:{}".format(goods_no, _temp_name))
-                    all_detail_path_list.append("{}/{}/".format(out_put_dir, _temp_name, goods_no))
-                    # continue
-                    self.detail_deal_one_data(goods_no=goods_no,
-                                              value=temp_info_data,
-                                              out_put_dir=out_put_dir,
-                                              temp_name=_temp_name,
-                                              assigned_page_list=assigned_page_list)
-            except BaseException as e:
-                self.show_progress_detail(
-                    "款:{}生成详情异常:{}".format(goods_no, e))
-                print(e)
-
-        # ==============完成处理==============
-        self.set_state(state_value=2)
-        if self.total_num:
-            if self.fail_num:
-                self.show_progress_detail("处理完成,-----处理失败数据:{}个款".format(self.fail_num))
-            else:
-                self.show_progress_detail("处理完成")
-        else:
-            self.show_progress_detail("没有任何数据")
-
-        config_data["sign_text"] = "已结束详情处理"
-        config_data["all_detail_path_list"] = all_detail_path_list
-        # 打开文件夹
-        os.startfile(out_put_dir)
-
-        self.run_end_sign.emit(config_data)
-
-    def detail_run_by_thread11111(self, config_data, _goods_no_dict, temp_name, temp_name_list, assigned_page_dict,
-                                  excel_temp_goods_no_data,
-                                  finally_goods_no_need_temps):
-        """
-        excel_temp_goods_no_data: {},  # 表格数据可能存在多模板,数据结构为一个款号下的多个模板的数据列表
-        finally_goods_no_need_temps: {},  # 每个款号需要生成的模板数据
-        """
-
-        # 开始处理
-        self.n = 0
-        self.total_num = len(_goods_no_dict)
-        self.fail_num = 0
-        is_use_excel = config_data["is_use_excel"]
-        image_dir = config_data["image_dir"]
-
-        # 详情图生成结果文件夹
-        out_put_dir = "{}\软件-详情图生成".format(image_dir)
-        if settings.IS_TEST:
-            print("==============_goods_no_dict  打印=================")
-
-            print(json.dumps(_goods_no_dict))
-
-            print("==============_goods_no_dict  打印-end=================")
-
-        if settings.IS_TEST:
-            max_workers = 1
-        else:
-            max_workers = 1
-
-        all_detail_path_list = []
-
-        with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
-            futures = []
-            for goods_no, temp_name_list in finally_goods_no_need_temps.items():
-                for _temp_name in temp_name_list:
-                    # if _temp_name != "xiaosushuoxie-4":
-                    #     continue
-
-                    assigned_page_list = []
-                    if _temp_name in assigned_page_dict:
-                        assigned_page_list = assigned_page_dict[_temp_name]
-                    # 如果为使用表格,则获取表格中的数据作为款号的基础数据
-                    temp_info_data = copy.copy(_goods_no_dict[goods_no])
-                    if is_use_excel:
-                        # 将表格中的数据进行替换
-                        if goods_no in excel_temp_goods_no_data:
-                            if _temp_name in excel_temp_goods_no_data[goods_no]:
-                                # 将表格中的特定的模板的行,替换到goods_no的data中,因为不同的模板有数据特殊性
-                                for _key, _key_value in excel_temp_goods_no_data[goods_no][_temp_name].items():
-                                    if _key in temp_info_data:
-                                        temp_info_data[_key] = _key_value
-
-                    print("temp_info_data")
-                    print("goods_no:{},_temp_name:{}".format(goods_no, _temp_name))
-                    all_detail_path_list.append("{}/{}/".format(out_put_dir, _temp_name, goods_no))
-                    # continue
-                    futures.append(executor.submit(
-                        self.detail_deal_one_data,
-                        goods_no=goods_no,
-                        value=temp_info_data,
-                        out_put_dir=out_put_dir,
-                        temp_name=_temp_name,
-                        assigned_page_list=assigned_page_list,
-                    ))
-
-            # for goods_no, value in _goods_no_dict.items():
-            #     _temp_name = temp_name
-            #     # 使用自定义的表格数据
-            #     if self.isUseTemplate is False:
-            #         if "模板名称" in value:
-            #             if value["模板名称"] in temp_name_list:
-            #                 _temp_name = value["模板名称"]
-            #     assigned_page_list = []
-            #     if _temp_name in assigned_page_dict:
-            #         assigned_page_list = assigned_page_dict[_temp_name]
-            #
-            #     futures.append(executor.submit(
-            #         self.deal_one_data,
-            #         goods_no=goods_no,
-            #         value=value,
-            #         out_put_dir=out_put_dir,
-            #         temp_name=_temp_name,
-            #         assigned_page_list=assigned_page_list,
-            #     ))
-
-            # 使用 wait 方法等待所有任务完成
-            done, not_done = concurrent.futures.wait(futures)
-
-            # 处理完成的任务
-            for future in done:
-                if settings.IS_TEST:
-                    result = future.result()
-
-        # ==============完成处理==============
-        self.set_state(state_value=2)
-        if self.total_num:
-            if self.fail_num:
-                self.show_progress_detail(
-                    "处理完成,-----------处理失败数据:{}个款".format(self.fail_num)
-                )
-            else:
-                self.show_progress_detail("处理完成")
-        else:
-            self.show_progress_detail("没有任何数据")
-
-        config_data["sign_text"] = "已结束详情处理"
-        config_data["all_detail_path_list"] = all_detail_path_list
-        self.run_end_sign.emit(config_data)
-
-    def show_progress_detail(self, text):
-        self.show_progress_detail_sign.emit(text)
-        # self.windows.show_progress_detail(text)
-
-    def detail_deal_one_data(self, goods_no, value, out_put_dir, temp_name, assigned_page_list):
-        if self.windows.state == 99:
-            self.show_progress_detail("用户主动取消:{}".format(goods_no))
-            return
-
-        self.show_progress_detail("正在生成:{},模板:{}".format(goods_no, temp_name))
-        is_deal_success = False
-        print("=================deal_one_data=====================")
-        print("goods_no", goods_no)
-        print("模板:", temp_name)
-        print("value:", value)
-
-        if settings.IS_TEST:
-            d = self.windows.temp_class[temp_name](goods_no, value,
-                                                   out_put_dir=out_put_dir,
-                                                   windows=self.windows,
-                                                   assigned_page_list=assigned_page_list)
-            is_deal_success = True
-        else:
-            try:
-                # # 处理图片详情图生成
-                d = self.windows.temp_class[temp_name](goods_no, value,
-                                                       out_put_dir=out_put_dir,
-                                                       windows=self.windows,
-                                                       assigned_page_list=assigned_page_list)
-                is_deal_success = True
-            except BaseException as e:
-                self.show_progress_detail("{}处理失败".format(goods_no))
-                error_text = "{}".format(e)
-                if "Unable to allocate" in error_text:
-                    error_text = "电脑内存不足,生成失败"
-
-                self.show_progress_detail("失败原因:{}".format(error_text))
-                self.fail_num += 1
-
-        self.n += 1
-
-        if not is_deal_success:
-            goods_art_no_list = value["货号资料"]
-            self.show_progress_detail("处理失败")
-            self.show_progress_detail(
-                "相关货号:{}".format([x["货号"] for x in goods_art_no_list])
-            )
-            # 将相关的文件夹统一移动至错误文件夹
-            detail_func.move_folders(
-                path_list=[
-                    "{}/{}".format(self.windows.image_dir, x)
-                    for x in [x["文件夹名称"] for x in goods_art_no_list]
-                ],
-                target_folder=self.windows.target_error_folder,
-            )
-            pass
-        # 更新进度
-        print(self.n, self.total_num)
-        self.windows.progress_sign.emit(
-            {
-                "type": "详情图生成",
-                "progress_bar_value": int(self.n / self.total_num * 100),
-            }
-        )
-
-    def check_serializable(self, obj):  # 检查某个对象其中的属性哪些不能被序列化
-        for attr_name in dir(obj):
-            if not attr_name.startswith('__'):
-                try:
-                    attr_value = getattr(obj, attr_name)
-                    serialized = pickle.dumps(attr_value)
-                    print(f"属性 {attr_name} 是可序列化的。")
-                except (TypeError, pickle.PicklingError):
-                    print(f"属性 {attr_name} 不可序列化。")
-
-    def on_dialog_result(self, result):
-        """处理对话框结果"""
-        self.dialog_result = result
-        print("972  处理对话框结果:{}".format(result))
-        # self.quit()  # 结束事件循
-        self.event.set()

+ 0 - 1
python/service/base_deal.py

@@ -10,7 +10,6 @@ from .remove_bg_ali import RemoveBgALi, Picture
 from .deal_cutout import DealCutout
 
 
-# from data import DataModeAutoDealPics
 import time
 from .image_pic_deal import OnePicDeal
 

+ 0 - 2
python/service/data.py

@@ -181,7 +181,6 @@ class DataModeGenerateDetail(DataBaseModel):
         _df = _df.loc[~duplicates]
         _df = _df.fillna(value="")
         _df = _df.astype(str)
-
         # 数据匹配关联,左关联
         need_df = pd.merge(
             need_df,
@@ -224,7 +223,6 @@ class DataModeGenerateDetail(DataBaseModel):
                     }
 
         print("return_dict", return_dict)
-
         if not return_dict:
             message += "\n没有找到任何匹配的数据"
             return {"code": 99, "message": message, "data": return_dict}

+ 0 - 28
python/service/deal_image.py

@@ -219,34 +219,6 @@ class DealImage(BaseDealImage):
         if not original_photo_list:
             raise UnicornException("没有任何匹配的图片")
             return False, "没有任何匹配的图片"
-        # 暂不处理红蜻蜓
-        # if settings.PROJECT == "红蜻蜓":
-        #     # 批量请求货号图信息
-        #     goods_art_no_list = [x["goods_art_no"] for x in original_photo_list]
-        #     goods_art_no_list = list(set(goods_art_no_list))
-        #     goods_art_no_list = [x for x in goods_art_no_list if "NUM" not in x]
-
-        #     if goods_art_no_list:
-        #         goods_art_no_dict = self.get_data_from_hqt_with_goods_art_no(
-        #             goods_art_no_list=goods_art_no_list)
-
-        #         for i in original_photo_list:
-        #             if i["goods_art_no"] in goods_art_no_dict:
-        #                 i["real_goods_art_no"] = i["goods_art_no"]
-        #                 i["real_goods_number"] = "NUM{}".format(goods_art_no_dict[i["goods_art_no"]]["编号"])
-
-        #     # 批量请求编号对应信息
-        #     goods_number_list = [x["goods_art_no"] for x in original_photo_list]
-        #     goods_number_list = list(set(goods_number_list))
-        #     goods_number_list = [x for x in goods_number_list if "NUM" in x]
-
-        #     if goods_number_list:
-        #         goods_number_dict = self.get_data_from_hqt(goods_number_list=goods_number_list)
-        #         for i in original_photo_list:
-        #             if i["goods_art_no"] in goods_number_dict:
-        #                 i["real_goods_number"] = i["goods_art_no"]
-        #                 i["real_goods_art_no"] = goods_number_dict[i["goods_art_no"]]["商品货号"]
-
         # 排序需要基于拍照的文件序号进行处理
         original_photo_list.sort(
             key=lambda x: "{}-{}-{}".format(x["goods_art_no"], x["image_index"], x["file"]))

+ 27 - 1
python/service/detail_func.py

@@ -9,6 +9,31 @@ def get_all_dir_info(image_dir, goods_art_nos):
     folder_name_list = []
     for folder_name in os.listdir(image_dir):
         _path = "{}/{}".format(image_dir, folder_name)
+        print("_path===============>", _path)
+        if not os.path.isdir(_path):
+            continue
+        if "无法对应" in folder_name:
+            continue
+        if "软件" in folder_name:
+            if len(os.listdir(_path)) == 0:
+                # 删除空文件夹
+                os.rmdir(_path)
+            continue
+        print("folder_name====>", folder_name)
+        print("goods_art_no====>", goods_art_nos)
+        for goods_art_no in goods_art_nos:
+            # 有原始图子文件夹就认为是一个正常的货号文件夹
+            print("图片地址=====>>>>>",f"{_path}/{goods_art_no}/原始图")
+            if os.path.exists(f"{_path}/{goods_art_no}/原始图"):
+                folder_name_list.append(f"{goods_art_no}")
+
+    return folder_name_list
+"""
+def get_all_dir_info(image_dir):
+    # 遍历货号获取所有货号--可能为编号
+    folder_name_list = []
+    for folder_name in os.listdir(image_dir):
+        _path = "{}/{}".format(image_dir, folder_name)
         if not os.path.isdir(_path):
             continue
         if "无法对应" in folder_name:
@@ -22,9 +47,10 @@ def get_all_dir_info(image_dir, goods_art_nos):
         print("goods_art_no====>", goods_art_nos)
         if folder_name in goods_art_nos:
             folder_name_list.append(folder_name)
-
     return folder_name_list
 
+"""
+
 
 def get_all_detail_info(image_dir):
     # 遍历货号获取所有货号--可能为编号

+ 0 - 913
python/service/generate_goods_no_detail_pic/module_generate_goods_no_detail_pics.py

@@ -1,913 +0,0 @@
-# from UI.generate_goods_no_detail_pic.generate_goods_no_detail_pic_ui import Ui_Form as generate_goods_no_detail_pic_Ui_Form
-import json
-from UI.generate_goods_no_detail_pic.new_generate_goods_no_detail_pic_ui import (
-    Ui_Form as generate_goods_no_detail_pic_Ui_Form,
-)
-from UI.generate_goods_no_detail_pic.temp_item import (
-    Ui_Form as UI_temp_item,
-)
-from import_qt_mode import *
-
-import settings
-import threading
-import os
-import shutil
-from PIL import Image
-
-# from module.view_control.generate_goods_no_detail_pic.goods_detail_pics import DetailPicGetHqt, DetailPicGetHLM
-from module.view_control.generate_goods_no_detail_pic.detail_xiaosushuoxie import (
-    DetailPicGetXiaoSuShuoXie,
-)
-from module.view_control.generate_goods_no_detail_pic.detail_xiaosushuoxie2 import (
-    DetailPicGetXiaoSuShuoXie2,
-)
-from module.view_control.generate_goods_no_detail_pic.detail_xiaosushuoxie3 import (
-    DetailPicGetXiaoSuShuoXie3,
-)
-from module.view_control.generate_goods_no_detail_pic.detail_hlm_2 import (
-    DetailPicGetHLM2,
-)
-from module.view_control.generate_goods_no_detail_pic.detail_hlm_3 import (
-    DetailPicGetHLM3,
-)
-from module.view_control.generate_goods_no_detail_pic.detail_xiaosushuoxie4 import DetailPicGetXiaoSuShuoXie4
-from module.view_control.generate_goods_no_detail_pic.detail_xiaosushuoxie5 import DetailPicGetXiaoSuShuoXie5
-from module.view_control.generate_goods_no_detail_pic.detail_xiaosushuoxie6 import DetailPicGetXiaoSuShuoXie6
-from module.view_control.generate_goods_no_detail_pic.detial_hqt import DetailPicGetHqt
-
-from concurrent.futures import ThreadPoolExecutor
-from threading import Lock
-from module.view_control.generate_goods_no_detail_pic.data import DataModeGenerateDetail
-from module.view_control.generate_goods_no_detail_pic import detail_func
-from module.view_control.MineQWidget import MineQWidget, DialogShow, MessageShow
-import time
-from functools import partial
-import io
-import concurrent.futures
-
-"""
-照片自动货号匹配 将图片放置在指定文件夹下,并自动对应不同的货号进行整理
-"""
-
-
-class GenerateDetailPic(MineQWidget):
-    progress_sign = Signal(dict)
-    info_sign = Signal(str)
-    text_show = Signal(str)
-    isUseTemplate = True
-
-    def __init__(self, windows=None):
-        super().__init__()
-        self.windows = windows
-
-        self.ui = generate_goods_no_detail_pic_Ui_Form()
-        self.ui.setupUi(self)
-        # 线程锁
-        self.lock = Lock()
-
-        # 0禁用  1进行中  2已结束 99等待结束
-        self.state = 2
-        self.data_mode_generate_detail = DataModeGenerateDetail()
-
-        # 使用使用表格数据
-        self.is_use_excel = settings.GOODS_DETAIL_IS_USE_EXCEL
-        self.excel_path = settings.GOODS_DETAIL_EXCEL_PATH
-
-        # 目标文件夹
-        self.image_dir = settings.GOODS_DETAIL_LAST_IMAGE_PATH
-        # 对应的错误文件夹目录
-        if self.image_dir and os.path.exists(self.image_dir):
-            self.target_error_folder = "{}/软件-生成详情错误".format(self.image_dir)
-        else:
-            self.target_error_folder = ""
-
-        # 检查颜色是否齐全
-        self.is_check_color_is_all = settings.GOODS_DETAIL_IS_CHECK_COLOR_IS_ALL
-        # 已生成主图的自动过滤
-        self.is_check_is_pass = settings.GOODS_DETAIL_IS_PASS
-
-        # 上次使用的详情模板
-        self.last_temp = settings.GOODS_DETAIL_LAST_TEMP
-
-        # 注册模板
-        self.temp_class = {
-            "hqt-1": DetailPicGetHqt,
-            "hlm-1": DetailPicGetHLM2,
-            "hlm-2": DetailPicGetHLM3,
-            "xiaosushuoxie-1": DetailPicGetXiaoSuShuoXie,
-            "xiaosushuoxie-2": DetailPicGetXiaoSuShuoXie2,
-            "xiaosushuoxie-3": DetailPicGetXiaoSuShuoXie3,
-            "xiaosushuoxie-4": DetailPicGetXiaoSuShuoXie4,
-            "xiaosushuoxie-5": DetailPicGetXiaoSuShuoXie5,
-            "xiaosushuoxie-6": DetailPicGetXiaoSuShuoXie6,
-        }
-        self.init()
-        self.show()
-
-    def change_temp_mode(self, *args, **kwargs):
-        # 输出按钮1与按钮2的状态,选中还是没选中
-        if self.ui.radioButton.isChecked():
-            self.isUseTemplate = True
-            self.ui.scrollArea.show()
-        else:
-            self.isUseTemplate = False
-            self.ui.scrollArea.hide()
-
-    def init(self):
-        self.show_img_dir()
-        self.ui.stackedWidget.setCurrentIndex(0)
-        print("配置打印")
-        print(self.is_use_excel)
-        print(self.excel_path)
-        print(self.image_dir)
-        print(self.is_check_color_is_all)
-        print(self.is_check_is_pass)
-
-        self.ui.reload_func.hide()
-        # -------初始化页面--------
-        if self.is_use_excel:
-            self.ui.check_use_excel.setChecked(True)
-        else:
-            self.ui.check_use_excel.setChecked(False)
-
-        if self.excel_path:
-            self.ui.excel_path_show.setText(self.excel_path)
-
-        if self.image_dir:
-            self.ui.path_name.setText(self.image_dir)
-
-        if self.is_check_color_is_all:
-            self.ui.check_image_total.setChecked(True)
-        else:
-            self.ui.check_image_total.setChecked(False)
-
-        if self.is_check_is_pass:
-            self.ui.check_is_pass.setChecked(True)
-        else:
-            self.ui.check_is_pass.setChecked(False)
-
-        # 是否开启使用外部数据
-        self.ui.check_use_excel.toggled.connect(self.check_box_change)
-        self.ui.check_image_total.toggled.connect(self.check_box_change)
-        self.ui.check_is_pass.toggled.connect(self.check_box_change)
-        self.check_box_change()
-
-        self.text_show.connect(self.append_text_to_browser)
-        self.ui.select_path.mousePressEvent = self.change_img_dir
-        self.ui.select_excel.mousePressEvent = self.select_excel_path
-
-        # ====================================
-        self.ui.progressBar.setValue(0)
-        self.ui.progressBar.setMaximum(100)
-        self.ui.progressBar.setValue(0)
-        self.ui.progressBar.hide()
-        self.progress_sign.connect(self.show_progress)
-
-        self.ui.back.clicked.connect(lambda x: self.ui.stackedWidget.setCurrentIndex(0))
-        self.ui.stop.clicked.connect(self.to_stop)
-        self.ui.run.clicked.connect(self.run)
-
-        # 复制Excel模板
-        self.ui.get_excel_temp.mousePressEvent = self.copy_excel
-        self.test_1 = 0
-
-        self.ui.radioButton.toggled.connect(self.change_temp_mode)
-        self.ui.radioButton_2.toggled.connect(self.change_temp_mode)
-
-        if settings.GOODS_DETAIL_TEMP_MODE_LAST == '选择模板':
-            self.ui.radioButton.setChecked(True)
-            self.change_temp_mode()
-        else:
-            self.ui.radioButton_2.setChecked(True)
-            self.change_temp_mode()
-
-        # 加载模板
-        self.temp_list = []
-        self.load_temp_list()
-
-    def load_temp_list(self):
-        if settings.PROJECT == "红蜻蜓":
-            self.temp_list = ["hqt-1"]
-        elif settings.PROJECT == "惠利玛":
-            if "惠利玛" in settings.Company:
-                self.temp_list = ["hlm-1"]
-            if "小苏" in settings.Company:
-                self.temp_list = [
-                    "xiaosushuoxie-1",
-                    "xiaosushuoxie-2",
-                    "xiaosushuoxie-3",
-                    "xiaosushuoxie-4",
-                    "xiaosushuoxie-5",
-                    "xiaosushuoxie-6",
-                ]
-
-        for i in self.ui.scrollArea.findChildren(QPushButton):
-            i.deleteLater()
-        # 模板列表
-        for temp_name in self.temp_list:
-            _class = self.temp_class[temp_name]
-            _d = _class.get_temp_pic_info(_class.root)
-            temp_image_path = _d["temp_pic_path"]
-            temp_item = TempItem(self.ui.scrollArea, temp_name, temp_image_path)
-            temp_item.select_sign.connect(self.change_temp_select)
-            self.ui.horizontalLayout_10.insertWidget(
-                self.ui.horizontalLayout_10.count() - 1, temp_item
-            )
-
-        # 设置默认值
-        if self.last_temp not in self.temp_list:
-            self.last_temp = self.temp_list[0]
-        # 设置值
-        for temp_item in self.ui.scrollArea.findChildren(TempItem):
-            temp_item.select()
-            break
-
-    def change_temp_select(self, _id):
-        self.last_temp = _id
-        print("已设置模板的值为:{}".format(self.last_temp))
-        for temp_item in self.ui.scrollArea.findChildren(TempItem):
-            if temp_item.id != _id:
-                temp_item.cancel_select()
-
-    def copy_excel(self, *args, **kwargs):
-        excel_path = r"{}\resources\init\goods_excel_temp.xlsx".format(os.getcwd())
-        if not os.path.exists(excel_path):
-            return
-
-        self.check_path(r"{}\temp".format(os.getcwd()))
-        self.check_path(r"{}\temp\excel_temp".format(os.getcwd()))
-        new_excel_path = r"{}\temp\excel_temp\goods_excel_temp.xlsx".format(os.getcwd())
-        if not os.path.exists(new_excel_path):
-            shutil.copy(excel_path, new_excel_path)
-        # 打开文件夹
-        os.startfile(r"{}\temp\excel_temp".format(os.getcwd()))
-
-    def check_box_change(self, *args):
-        if self.ui.check_use_excel.isChecked():
-            self.is_use_excel = True
-            self.ui.widget.show()
-        else:
-            self.is_use_excel = False
-            self.ui.widget.hide()
-
-        if self.ui.check_image_total.isChecked():
-            self.is_check_color_is_all = True
-        else:
-            self.is_check_color_is_all = False
-
-        if self.ui.check_is_pass.isChecked():
-            self.is_check_is_pass = True
-        else:
-            self.is_check_is_pass = False
-
-    def to_stop(self, *args):
-        if self.state == 1:
-            self.state = 99
-
-    def select_excel_path(self, *args, **kwargs):
-        folder = QFileDialog.getOpenFileName(self, "选取excel", "./")[0]
-        if "xlsx" in folder:
-            # if len(folder) > 20:
-            #     text = folder[-20:]
-            # else:
-            #     text = folder
-
-            self.ui.excel_path_show.setText(folder)
-            self.excel_path = folder
-            print("folder", folder)
-
-    def change_img_dir(self, *args):
-        folder = QFileDialog.getExistingDirectory(self, "选取文件夹", "./")
-        self.image_dir = folder
-        self.target_error_folder = "{}/软件-生成详情错误".format(self.image_dir)
-        self.show_img_dir()
-
-    def show_img_dir(self):
-        self.ui.path_name.setText(self.image_dir)
-
-    def show_progress(self, data):
-        progress_bar_value = data["progress_bar_value"]
-        self.ui.progressBar.setValue(progress_bar_value)
-        pass
-
-    def set_state(self, state_value: int):
-        # 0禁用  1进行中  2已结束
-        if state_value not in [0, 1, 2]:
-            return
-        self.state = state_value
-        if self.state == 0:
-            self.ui.stackedWidget.setCurrentIndex(0)
-        if self.state == 1:
-            self.ui.stackedWidget.setCurrentIndex(1)
-            self.ui.back.hide()
-            self.ui.stop.show()
-            self.ui.info_text.setEnabled(False)
-            self.ui.info_text.clear()
-
-        if self.state == 2:
-            self.ui.stackedWidget.setCurrentIndex(1)
-            self.ui.back.show()
-            self.ui.stop.hide()
-
-    def check_path(self, _path):
-        if not os.path.exists(_path):
-            os.mkdir(_path)
-        return True
-
-    def run(self):
-        # self.image_dir = r"D:\MyDocuments\PythonCode\MyPython\red_dragonfly\deal_pics\auto_capture_V2\auto_photo\out_put\测试文件夹"
-        # self.target_error_folder = r"D:\MyDocuments\PythonCode\MyPython\red_dragonfly\deal_pics\auto_capture_V2\auto_photo\out_put\测试文件夹\软件-错误"
-        # self.is_use_excel = True
-        # self.excel_path = r"D:\MyDocuments\PythonCode\MyPython\red_dragonfly\deal_pics\auto_capture_V2\auto_photo\qt_test\商品基础信息.xlsx"
-        # 保存为配置
-
-        a = QMessageBox.question(
-            self, "确认", "是否进行详情图生成", QMessageBox.Yes | QMessageBox.No
-        )
-        if a != QMessageBox.Yes:
-            return
-
-        settings.GOODS_DETAIL_IS_USE_EXCEL = self.is_use_excel
-        settings.GOODS_DETAIL_EXCEL_PATH = self.excel_path
-        settings.GOODS_DETAIL_LAST_IMAGE_PATH = self.image_dir
-        settings.GOODS_DETAIL_IS_CHECK_COLOR_IS_ALL = self.is_check_color_is_all
-        settings.GOODS_DETAIL_IS_PASS = self.is_check_is_pass
-        settings.GOODS_DETAIL_LAST_TEMP = self.last_temp
-
-        if self.ui.radioButton.isChecked():
-            settings.GOODS_DETAIL_TEMP_MODE_LAST = "选择模板"
-        else:
-            settings.GOODS_DETAIL_TEMP_MODE_LAST = "根据EXCEL"
-
-        data_dict = {
-            "is_use_excel": "是" if self.is_use_excel else "否",
-            "excel_path": self.excel_path if self.excel_path else "",
-            "last_image_path": self.image_dir if self.image_dir else "",
-            "is_check_color_is_all": "是" if self.is_check_color_is_all else "否",
-            "is_pass": "是" if self.is_check_is_pass else "否",
-            "last_temp": self.last_temp,
-            "goods_detail_temp_mode_last": settings.GOODS_DETAIL_TEMP_MODE_LAST,
-        }
-
-        settings.set_config(data_dict=data_dict, section="goods_detail")
-
-        # 红蜻蜓/惠利玛,且为非表格数据必须需要登录处理
-        if not self.is_use_excel:
-            if not settings.IsLogin:
-                self.WaringMessage("请先登录账号")
-                return
-
-        if not self.image_dir:
-            self.WaringMessage("请选择货号文件夹集合")
-            return
-        else:
-            if "失败" in self.image_dir:
-                self.WaringMessage("文件夹路径不能含有 失败 字样")
-                return
-
-        assigned_page = self.ui.assigned_page.text()
-        if assigned_page:
-            assigned_page_dict = self.check_assigned_page(assigned_page)
-            if not assigned_page_dict:
-                self.WaringMessage("指定模板填写格式不合规")
-        else:
-            assigned_page_dict = {}
-
-        # 先做整体校验
-        func = partial(self.check_folder, temp_name=self.last_temp, temp_name_list=self.temp_list,
-                       assigned_page_dict=assigned_page_dict)
-        self.do_thread_run(func=func, call_back=self.check_first_call_back, time_out=30)
-        # self.t = threading.Thread(target=self.check_folder, args=())
-        # self.t.start()
-
-    # 解析指定模板页面数据
-    def check_assigned_page(self, text: str):
-
-        try:
-            temp_dict = {}
-            for i in self.temp_list:
-                temp_dict[i[-1]] = i
-
-            text = text.replace(" ", "")
-            text = text.replace(",", ",")
-            text = text.replace(":", ":")
-            text = text.replace(";", ",")
-            assigned_page_list = text.split(",")
-            assigned_page_dict = {}
-            for i in assigned_page_list:
-                if not i:
-                    continue
-                _k, _v = i.split(":")
-                _k = temp_dict[_k]
-                if _k not in assigned_page_dict:
-                    assigned_page_dict[_k] = []
-                if _v not in assigned_page_dict[_k]:
-                    assigned_page_dict[_k].append(_v)
-
-            return assigned_page_dict
-        except:
-            return {}
-
-    def check_first_call_back(self, data):
-        # 首次数据校验的信息返回
-        print(json.dumps(data))
-        # self.show_message(text="22222222222222222222222")
-        # QMessageBox.critical(self, "警告", "1111111", QMessageBox.Ok)
-        code = data["code"]
-        if code != 0:
-            self.show_message(data["message"])
-            return
-
-        do_next = False
-        if data["message"]:
-            button_1, button_2, button_3 = None, None, None
-            text = data["message"]
-            if code == 0:
-                if data["data"]:
-                    if data["data"]["error_folder_list"]:
-                        print("22----------error_folder_list------------")
-                        print(json.dumps(data["data"]["error_folder_list"]))
-                        button_2 = "移除错误文件"
-                    if data["data"]["goods_no_dict"]:
-                        if button_2:
-                            button_1 = "移除并继续"
-                            button_3 = "继续(忽略其他)"
-                        else:
-                            button_1 = "继续"
-                    if data["data"]["succeed_folder_list"]:
-                        text += "\n==================\n校验无误数据:{}个文件夹".format(
-                            len(data["data"]["succeed_folder_list"])
-                        )
-
-            my_dialog = DialogShow(
-                self, text=text, button_1=button_1, button_2=button_2, button_3=button_3
-            )
-            ret = my_dialog.exec()
-            print(my_dialog.flag_name)
-            if "移除" in my_dialog.flag_name:
-                for error_folder_data in data["data"]["error_folder_list"]:
-                    self.move_error_folders(
-                        one_path=error_folder_data["folder_path"],
-                        target_folder=self.target_error_folder,
-                    )
-            if "继续" in my_dialog.flag_name:
-                do_next = True
-
-        if data["data"]["goods_no_dict"] and not data["data"]["error_folder_list"]:
-            do_next = True
-
-        if do_next:
-            self.set_state(state_value=1)
-            getAllData = data["data"]
-            base_temp_name = getAllData["temp_name"]
-            set_temp_name = getAllData.get("template_name", "")
-
-            kwargs = {
-                "_goods_no_dict": data["data"]["goods_no_dict"],
-                "temp_name": base_temp_name,
-                "temp_name_list": data["data"]["temp_name_list"],
-                "assigned_page_dict": data["data"]["assigned_page_dict"]
-            }
-            # else:
-            #     print("data", data)
-            #     kwargs = {
-            #         "_goods_no_dict": data["data"]["goods_no_dict"],
-            #         "temp_name": (
-            #             base_temp_name if set_temp_name == "" else set_temp_name
-            #         ),  # 模板名称
-            #     }
-            threading.Thread(target=self.run_by_thread, kwargs=kwargs).start()
-
-    def show_progress_detail(self, text):
-        self.text_show.emit(text)
-
-    def append_text_to_browser(self, text):
-        self.ui.info_text.append(text)
-
-    def change_to_cm(self, value):
-        if not value:
-            return ""
-        try:
-            value = "{}CM".format(int(value) / 10)
-            return value
-        except:
-            return ""
-
-    def check_folder(self, temp_name, temp_name_list, assigned_page_dict=None):
-        # =============
-        # 整体数据校验,返回错误内容,以及
-        # temp_name:模板名称
-        """
-        步骤:
-        1、 整体文件夹检查,并输出数据结构
-        2、数据进行对应规整(可能有excel,红蜻蜓等)
-        3、执行单个款数据处理
-        """
-        return_data = {
-            "code": 99,
-            "message": "",
-            "data": {
-                "error_folder_list": [],
-                "goods_no_dict": {},
-                "succeed_folder_list": [],
-                "temp_name": temp_name,
-                "temp_name_list": temp_name_list,
-                "assigned_page_dict": assigned_page_dict,
-            },
-        }
-        error_folder_list = []
-        print("--------------------------------------", self.image_dir)
-        # 遍历货号获取所有货号--可能为编号
-        folder_name_list = detail_func.get_all_dir_info(image_dir=self.image_dir)
-        if not folder_name_list:
-            return_data["message"] = "不存在任何货号/编号文件夹"
-            return return_data
-
-        # =========================组装数据---数据来源多种途径=========================
-        _result = {"code": 99, "message": "无法解析到数据,请检查登录企业"}
-        if not self.is_use_excel:
-            if settings.PROJECT == "红蜻蜓":
-                # goods_no_dict输出为文件夹下涉及到的所有款为key的字典,后续通过解析字典,进行提取对应文件夹
-                _result = self.data_mode_generate_detail.get_basic_goods_art_data_by_hqt_and_hlm(
-                    folder_name_list
-                )
-
-            elif settings.PROJECT == "惠利玛":
-                if settings.Company:
-                    if "惠利玛" in settings.Company:
-                        _result = self.data_mode_generate_detail.get_basic_goods_art_data_by_hqt_and_hlm(
-                            folder_name_list
-                        )
-        else:
-            keys = settings.keys
-            _result = (
-                self.data_mode_generate_detail.get_basic_goods_art_data_form_excel(
-                    folder_name_list,
-                    self.excel_path,
-                    keys,
-                )
-            )
-
-        if _result["code"] == 0:
-            remote_data = _result["data"]
-        else:
-
-            return_data["message"] = _result["message"]
-            return return_data
-
-        # print(json.dumps(remote_data))
-        # =========================拼接数据组合为款数据=========================
-        """
-        1、获取所有文件夹基础数据内容
-        2、结合上述返回结果进行数据组合拼接
-        3、输出结果为按款为主键信息
-        4、注意模板ID
-        """
-        # 获取所有文件夹基础数据内容  检查不满足要求的文件不满足要求移动到错误文件夹
-        need_view_list = self.temp_class[temp_name].need_view
-        _all_dir_info_data = detail_func.get_all_dir_info_and_pic_info(
-            self.image_dir, folder_name_list, need_view_list
-        )
-        all_dir_info_data = {}
-        for one_folder, value in _all_dir_info_data.items():
-            if "message" in value:
-                if value["message"]:
-                    error_folder_list.append(
-                        {
-                            "folder_name": one_folder,
-                            "folder_path": "{}/{}".format(self.image_dir, one_folder),
-                        }
-                    )
-                    return_data["message"] += "文件夹:{} 结构错误:{}\n".format(
-                        one_folder, value["message"]
-                    )
-                    continue
-
-            # 符合要求的数据处理
-            all_dir_info_data[one_folder] = value
-
-        # 结合上述返回结果进行数据组合拼接
-        # 返回可能存在的情况:1、存在文件夹不匹配数据,2、存在货号数据缺失
-        goods_no_dict, error_folder_name_list = detail_func.merge_local_and_remote_data(
-            all_dir_info_data=all_dir_info_data, remote_data=remote_data
-        )
-        # 文件在系统中没有匹配的结果
-        if error_folder_name_list:
-            for one_folder in error_folder_name_list:
-                error_folder_list.append(
-                    {
-                        "folder_name": one_folder,
-                        "folder_path": "{}/{}".format(self.image_dir, one_folder),
-                    }
-                )
-                return_data["message"] += "文件夹:{} 找不到对应数据\n".format(
-                    one_folder
-                )
-
-        print("===============goods_no_dict==================")
-        if settings.IS_TEST:
-            _text = json.dumps(goods_no_dict)
-            with open("qt_test/goods_no_dict.txt", 'w', encoding='utf-8') as file:
-                file.write(_text)
-        print("===============goods_no_dict==================")
-
-        # ===================================是否齐色检查=============================================
-        # 如为红蜻蜓企业则还需要检查同款下是否齐全;数据返回结果为款号列表
-        error_data_dict = {}
-        if self.is_check_color_is_all:
-            if not self.is_use_excel:
-                if settings.PROJECT == "红蜻蜓":
-                    error_data_dict = (
-                        self.data_mode_generate_detail.check_goods_is_not_deficiency(
-                            goods_no_dict
-                        )
-                    )
-            else:
-                error_data_dict = self.data_mode_generate_detail.check_goods_is_not_deficiency_form_excel(
-                    goods_no_dict, self.excel_path
-                )
-
-        if error_data_dict:
-            print("----error_data_dict----")
-            print(json.dumps(error_data_dict))
-
-            # 款号反向映射;因为部分key键格式为KUM9999999
-            _x = {}
-            for i, v in goods_no_dict.items():
-                _x[v["款号"]] = i
-
-            for goods_no, value in error_data_dict.items():
-                if goods_no in _x:
-                    goods_no = _x[goods_no]
-                if goods_no in goods_no_dict:
-                    # =====移动到错误文件夹======
-                    for _folder_name in [
-                        x["文件夹名称"] for x in goods_no_dict[goods_no]["货号资料"]
-                    ]:
-                        error_folder_list.append(
-                            {
-                                "folder_name": _folder_name,
-                                "folder_path": "{}\{}".format(
-                                    self.image_dir, _folder_name
-                                ),
-                            }
-                        )
-                        return_data["message"] += "文件夹:{};{}\n".format(
-                            _folder_name, value["message"]
-                        )
-                    # 从 正确 款下面进行数据剔除
-                    goods_no_dict.pop(goods_no)
-
-        print("-----------------1goods_no_dict---------------")
-        print(json.dumps(goods_no_dict, ensure_ascii=False))
-        print("-----------------1goods_no_dict---------------")
-
-        # 校验无误的文件夹数据  goods_no_dict为最终有效数据
-        for goods_no, value in goods_no_dict.items():
-            return_data["data"]["succeed_folder_list"].extend(
-                [x["文件夹名称"] for x in goods_no_dict[goods_no]["货号资料"]]
-            )
-
-        # ========开始执行详情图生成===================
-        _goods_no_dict = goods_no_dict
-        # assigned_page_dict 如存在对应模板的,则不管是否有过滤都需要生成
-
-        if self.is_check_is_pass:
-            _path = "{}/{}".format(self.image_dir, "软件-详情图生成")
-            if os.path.exists(_path):
-                _goods_no_dict = {}
-                # 数据返回为 已有的款数据,为款号列表
-                is_pass_goods_no = detail_func.get_all_detail_info(_path)
-                for goods_no, value in goods_no_dict.items():
-                    if "软件" in goods_no:
-                        continue
-
-                    if value["模板名称"] in assigned_page_dict:
-                        need_todo = True
-                    else:
-                        if goods_no in is_pass_goods_no:
-                            need_todo = False
-                        else:
-                            need_todo = True
-
-                    if need_todo:
-                        _goods_no_dict[goods_no] = value
-
-        print("-----------------2goods_no_dict---------------")
-        print(json.dumps(_goods_no_dict, ensure_ascii=False))
-        print("-----------------2goods_no_dict---------------")
-        return_data["data"]["error_folder_list"] = error_folder_list
-
-        if len(_goods_no_dict) == 0:
-            return_data["message"] += "\n没有任何文件夹需要执行"
-        return_data["data"]["goods_no_dict"] = _goods_no_dict
-
-        return_data["code"] = 0
-        return return_data
-
-    def run_by_thread(self, _goods_no_dict, temp_name, temp_name_list, assigned_page_dict):
-        # 开始处理
-        self.n = 0
-        self.total_num = len(_goods_no_dict)
-        self.fail_num = 0
-
-        # 详情图生成结果文件夹
-        out_put_dir = "{}\软件-详情图生成".format(self.image_dir)
-        if settings.IS_TEST:
-            print("==============_goods_no_dict  打印=================")
-
-            print(json.dumps(_goods_no_dict))
-
-            print("==============_goods_no_dict  打印-end=================")
-
-        if settings.IS_TEST:
-            max_workers = 1
-        else:
-            max_workers = 2
-
-        with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
-            futures = []
-            for goods_no, value in _goods_no_dict.items():
-                _temp_name = temp_name
-                # 使用自定义的表格数据
-                if self.isUseTemplate is False:
-                    if "模板名称" in value:
-                        if value["模板名称"] in temp_name_list:
-                            _temp_name = value["模板名称"]
-                assigned_page_list = []
-                if _temp_name in assigned_page_dict:
-                    assigned_page_list = assigned_page_dict[_temp_name]
-
-                futures.append(executor.submit(
-                    self.deal_one_data,
-                    goods_no=goods_no,
-                    value=value,
-                    out_put_dir=out_put_dir,
-                    temp_name=_temp_name,
-                    assigned_page_list=assigned_page_list,
-                ))
-
-            # 使用 wait 方法等待所有任务完成
-            done, not_done = concurrent.futures.wait(futures)
-
-            # 处理完成的任务
-            for future in done:
-                if settings.IS_TEST:
-                    result = future.result()
-
-        # ==============完成处理==============
-        self.set_state(state_value=2)
-        if self.total_num:
-            if self.fail_num:
-                self.show_progress_detail(
-                    "处理完成,-----------处理失败数据:{}个款".format(self.fail_num)
-                )
-            else:
-                self.show_progress_detail("处理完成")
-        else:
-            self.show_progress_detail("没有任何数据")
-
-    def move_error_folders(self, one_path, target_folder, message=""):
-        if os.path.exists(one_path):
-            if message:
-                self.show_progress_detail(message)
-                error_file = open(target_folder + "/错误明细.txt", "a")
-                error_file.write(f"{message}\n")
-                error_file.close()
-            self.check_path(target_folder)
-            detail_func.move_folders(path_list=[one_path], target_folder=target_folder)
-
-    def deal_one_data(self, goods_no, value, out_put_dir, temp_name, assigned_page_list):
-        if self.state == 99:
-            self.show_progress_detail("用户主动取消:{}".format(goods_no))
-            return
-
-        self.show_progress_detail("正在生成:{}".format(goods_no))
-        is_deal_success = False
-        print("模板:", temp_name)
-        if settings.IS_TEST:
-            d = self.temp_class[temp_name](goods_no, value, out_put_dir=out_put_dir, windows=self,
-                                           assigned_page_list=assigned_page_list)
-            # if d.run():
-            is_deal_success = True
-        else:
-            try:
-                # # 处理图片详情图生成
-                d = self.temp_class[temp_name](goods_no, value,
-                                               out_put_dir=out_put_dir,
-                                               assigned_page_list=assigned_page_list)
-                # if settings.PROJECT == "红蜻蜓":
-                #     d = DetailPicGetHqt(goods_no, value, out_put_dir=out_put_dir)
-                # elif settings.PROJECT == "惠利玛":
-                #     if "惠利玛" in settings.Company:
-                #         d = DetailPicGetHLM(goods_no, value, out_put_dir=out_put_dir)
-                #     if "小苏" in settings.Company:
-                #         d = DetailPicGetXiaoSuShuoXie(
-                #             goods_no, value, out_put_dir=out_put_dir
-                #         )
-                # if d.run():
-                #     is_deal_success = True
-                is_deal_success = True
-            except BaseException as e:
-                self.show_progress_detail("{}处理失败".format(goods_no))
-                self.show_progress_detail("失败原因:{}".format(e))
-                self.fail_num += 1
-
-        self.lock.acquire()
-        self.n += 1
-        self.lock.release()
-
-        if not is_deal_success:
-            goods_art_no_list = value["货号资料"]
-            self.show_progress_detail("处理失败")
-            self.show_progress_detail(
-                "相关货号:{}".format([x["货号"] for x in goods_art_no_list])
-            )
-            # 将相关的文件夹统一移动至错误文件夹
-            detail_func.move_folders(
-                path_list=[
-                    "{}/{}".format(self.image_dir, x)
-                    for x in [x["文件夹名称"] for x in goods_art_no_list]
-                ],
-                target_folder=self.target_error_folder,
-            )
-            pass
-        # 更新进度
-        print(self.n, self.total_num)
-        self.progress_sign.emit(
-            {
-                "type": "详情图生成",
-                "progress_bar_value": int(self.n / self.total_num * 100),
-            }
-        )
-
-
-class TempItem(QWidget):
-    select_sign = Signal(str)
-
-    def __init__(self, parent, _id, image_path):
-        super().__init__(parent)
-        self.ui = UI_temp_item()
-        self.ui.setupUi(self)
-        self.image_path = image_path
-        self.id = _id
-        self.is_select = False
-        self.init()
-
-    def init(self):
-        self.ui.label.mousePressEvent = self.pic_show
-        self.ui.radioButton.clicked.connect(self.select)
-        self.set_label_image()
-
-    def cancel_select(self, *args):
-        self.is_select = False
-        self.ui.radioButton.setChecked(False)
-
-    def select(self, *args):
-        self.is_select = True
-        self.ui.radioButton.setChecked(True)
-        self.select_sign.emit(self.id)
-
-    def pic_show(self, *args, **kwargs):
-        if os.path.exists(self.image_path):
-            im = Image.open(self.image_path)
-            threading.Thread(target=im.show, args=()).start()
-
-    def set_label_image(self):
-        if not os.path.exists(self.image_path):
-            return
-        try:
-            bytes_io = io.BytesIO()
-            w, h = self.ui.image_show.width(), self.ui.image_show.height()
-            _img_raw = Image.open(self.image_path)
-            _img_raw = self.to_resize(_img_raw, width=w * 2)
-            _img_raw = _img_raw.crop(box=(0, 0, w * 2, h * 2))
-            # _img_raw.thumbnail((w * 2, int(_img_raw.height * w * 2 / _img_raw.width)))
-            # img_raw = _img_raw.resize(size=(w, h))
-            _img_raw.save(bytes_io, "JPEG")
-            icon = QPixmap()
-            # icon.loadFromData(img)
-            icon.loadFromData(bytes_io.getvalue())
-            icon = icon.scaled(
-                self.ui.image_show.size(), Qt.KeepAspectRatio, Qt.SmoothTransformation
-            )
-            self.ui.image_show.setPixmap(icon)
-            # self.mousePressEvent = lambda x: self.show_one_data(row)
-        except:
-            pass
-
-    def to_resize(self, _im, width=None, high=None):
-        _im_x, _im_y = _im.size
-        if width and high:
-            if _im_x >= _im_y:
-                high = None
-            else:
-                width = None
-        if width:
-            re_x = int(width)
-            re_y = int(_im_y * re_x / _im_x)
-        else:
-            re_y = int(high)
-            re_x = int(_im_x * re_y / _im_y)
-        _im = _im.resize((re_x, re_y))
-        return _im

+ 1 - 1
python/service/run_main.py

@@ -379,6 +379,7 @@ class RunMain():
 
         # =========================组装数据---数据来源多种途径=========================
         _result = {"code": 99, "message": "无法解析到数据,请检查登录企业"}
+        print("is_use_excel", is_use_excel)
         if not is_use_excel:
             if settings.PROJECT == "红蜻蜓":
                 # goods_no_dict输出为文件夹下涉及到的所有款为key的字典,后续通过解析字典,进行提取对应文件夹
@@ -392,7 +393,6 @@ class RunMain():
                         _result = self.data_mode_generate_detail.get_basic_goods_art_data_by_hqt_and_hlm(
                             folder_name_list
                         )
-            # print("is_use_excel")
         else:
             keys = settings.keys
             _result = (