Merge remote-tracking branch 'origin/master'

python/api.py

@@ -88,6 +88,7 @@ async def forwardRequest(request: HlmForwardRequest):
 
 def fromExcelHandler(params: HandlerDetail):
     excel_path = params.excel_path
+    token = "Bearer " + params.token
     excel_df = pd.read_excel(excel_path, sheet_name=0, header=0)
     handler_result = []
     handler_result_folder = ""
@@ -95,27 +96,41 @@ def fromExcelHandler(params: HandlerDetail):
         raise UnicornException("缺失 [文件夹名称] 列")
     if "商品货号" not in excel_df.columns:
         raise UnicornException("缺失 [商品货号] 列")
+    if "款号" not in excel_df.columns:
+        raise UnicornException("缺失 [款号] 列")
+    goods_art_dirs = excel_df.groupby(excel_df["款号"])
+    obj = None
+    run_main = RunMain(obj, token)
     for index, row in excel_df.iterrows():
         goods_art_no_image_dir = str(row["文件夹名称"])
         goods_art_no = str(row["商品货号"])
+        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("货号不能为空")
-            token = "Bearer " + params.token
             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()).replace("\\", "/")
+            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 os.path.exists(image_dir + "/" + os.path.basename(itemImg.image_path)):
-                    shutil.copy(itemImg.image_path, image_dir)
+                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,
@@ -135,6 +150,7 @@ def fromExcelHandler(params: HandlerDetail):
                 "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,
@@ -165,8 +181,6 @@ def fromExcelHandler(params: HandlerDetail):
                 temp_class_dict[key] = cls
 
             config_data["temp_class"] = temp_class_dict
-            obj = None
-            run_main = RunMain(obj, token)
             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
@@ -246,10 +260,15 @@ async def handle_detail(request: Request, params: HandlerDetail):
             for itemImg in images:
                 if itemImg.image_path == "" or itemImg.image_path == None:
                     raise UnicornException(
-                            f"货号【{goods_art_no}】存在没有拍摄完成的图片,请重拍或删除后重试"
-                        )
-                if not os.path.exists(image_dir + "/" + os.path.basename(itemImg.image_path)):
-                    shutil.copy(itemImg.image_path, image_dir)
+                        f"货号【{goods_art_no}】存在没有拍摄完成的图片,请重拍或删除后重试"
+                    )
+                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
@@ -270,6 +289,7 @@ async def handle_detail(request: Request, params: HandlerDetail):
                     else params.template_image_order
                 ),
                 "goods_art_no": goods_art_no,
+                "goods_art_nos": [goods_art_no],
                 "is_check_number": False,
                 "resize_image_view": "后跟",
                 "cutout_mode": settings.CUTOUT_MODE,

python/custom_plugins/plugins/detail_template/xinjunlue/detail_xinjunlue1.py

@@ -9,7 +9,7 @@ import os
 from PIL import ImageFont, ImageDraw
 import sys
 import settings
-
+from middleware import UnicornException
 # from PIL import Image, ImageDraw, ImageFont
 
 # from module.view_control.generate_goods_no_detail_pic.detail_generate_base import DetailBase
@@ -67,16 +67,31 @@ class DetailPicGet(DetailBase):
         print(f"run {template_name} ")
         self.base_bg_color = (255, 255, 255)
         self.deal_pic_func_list = [
-            self.deal_pic_1,
+            self.deal_pic_1(),
+            self.deal_pic_2(),
         ]
-        if test:
-            self.run_test()
-        else:
-            self.run_all()
+        img = self.add_pic(self.deal_pic_func_list)
+        file_path = self.get_text_value("图片路径")
+        if file_path == None or file_path == "":
+            raise UnicornException("图片路径不能为空")
+        parent_folder = os.path.dirname(file_path)
+        try:
+            if os.path.exists(parent_folder) == False:
+                # 确保目标目录存在
+                os.makedirs(parent_folder, exist_ok=True)
+            file_extension = file_path.split(".")[-1]
+            format_mapping = {"jpg": "JPEG", "png": "PNG", "webp": "WEBP", "avif": "AVIF"}
+            file_format = format_mapping[file_extension.lower()]
+            img.save(file_path, format=file_format)
+        except KeyError:
+            raise UnicornException(f"不支持的文件格式: {file_extension}")
+        except Exception as e:
+            raise UnicornException(f"保存图片时发生错误: {e},请检查路径")
 
     def run_test(self):
         detailed_images = []
         detailed_images.append(self.deal_pic_1())
+        detailed_images.append(self.deal_pic_2())
         img = self.add_pic(detailed_images)
         if img:
             self.create_folder(r"{}/{}".format(self.out_put_dir, template_name))
@@ -94,7 +109,19 @@ class DetailPicGet(DetailBase):
         base_bg_width = 1200
         base_limit_width = base_bg_width / 2
         font = ImageFont.truetype("msyh.ttc", 20)
-        dataList = ["款号", "面料", "内里", "垫脚", "大底", "饰扣", "客户", "日期"]
+        dataList = [
+            "款号",
+            "楦号",
+            "颜色",
+            "面料",
+            "内里",
+            "垫脚",
+            "大底",
+            "饰扣",
+            "客户",
+            "码数",
+            "日期",
+        ]
         height_total = 0
         text_list = []
         line_space = 15
@@ -103,7 +130,7 @@ class DetailPicGet(DetailBase):
             if info == None or info == "":
                 continue
             _pp = PictureProcessing()
-            text = f"{item}: {self.get_text_value(item)}"
+            text = f"{item}: {info}"
             duanluo = ""
             sum_width = 0
             line_count = 0
@@ -152,12 +179,23 @@ class DetailPicGet(DetailBase):
         detailed_images.append(pp_image_jpg)
         return PictureProcessing(im=self.add_pic(detailed_images))
 
-    def deal_pic_1(self):
+    def deal_pic_2(self):
         detailed_images = []
         base_bg_width = 1200
         base_limit_width = base_bg_width / 2
-        font = ImageFont.truetype("msyh.ttc", 20)
-        dataList = ["款号", "面料", "内里", "垫脚", "大底", "饰扣", "客户", "日期"]
+        font = ImageFont.truetype("arial.ttf", 20)
+        dataList = [
+            "JEFFREY CAMPBELL",
+            "Supplier",
+            "款号",  # Fty No
+            "颜色",  # Fty No
+            "Material",
+            "Lining&Sock",
+            "码数",  # Size
+            "日期",  # Date
+            "Remark",
+            "MADE IN CHINA",
+        ]
         height_total = 0
         text_list = []
         line_space = 15
@@ -165,8 +203,20 @@ class DetailPicGet(DetailBase):
             info = self.get_text_value(item)
             if info == None or info == "":
                 continue
+            mapping = {
+                "JEFFREY CAMPBELL": "",
+                "Supplier": "Supplier:",
+                "款号": "Fty No:",
+                "颜色": "Color:",
+                "Material": "Material:",
+                "Lining&Sock": "Lining&Sock:",
+                "码数": "Size:",
+                "日期": "Date:",
+                "Remark": "Remark:",
+                "MADE IN CHINA": "",
+            }
             _pp = PictureProcessing()
-            text = f"{item}: {self.get_text_value(item)}"
+            text = f"{mapping[item]} {self.get_text_value(item)}"
             duanluo = ""
             sum_width = 0
             line_count = 0
@@ -178,7 +228,11 @@ class DetailPicGet(DetailBase):
                     sum_width = 0
                     duanluo += "\n"
                 duanluo += char
+            value = (0,0)
+            if idx ==0 or idx == len(dataList)-1:
+                value = (-5,0)
             _pp = _pp.get_text_image_advanced(
+                value=value,
                 font=font,
                 text=duanluo,
                 spacing=10,

python/custom_plugins/plugins/detail_template/xinnuo/detail_xinnuo2.py

@@ -723,7 +723,7 @@ if __name__ == "__main__":
     d = DetailPicGet(
         goods_no="test",
         goods_no_value={},
-        out_put_dir="./output/xinnuo-1",
+        out_put_dir="./output/xinnuo-2",
         test=True,
     )
     d.run_test()

python/custom_plugins/plugins/detail_template/xinnuo/detail_xinnuo3.py

@@ -103,18 +103,26 @@ class DetailPicGet(DetailBase):
             pp_jpg_1 = pp_jpg_1.resize(value=pp_bg.width/1.1)
             pp_png_1 = pp_png_1.resize(value=pp_bg.width /1.1)
 
-            if self.check_shoe_is_right_by_pixel(im=pp_png_1.im)==False:
+            if self.check_shoe_is_right_by_pixel(im=pp_png_1.im)==True:
                 pp_jpg_1 = pp_jpg_1.transpose()
                 pp_png_1 = pp_png_1.transpose()
 
-            pp_png_1_bg = PictureProcessing("RGBA", (pp_jpg_1.width*1.4, pp_jpg_1.width*1.4), (255,255,255,0))
-            pp_png_1_bg = pp_png_1_bg.paste_img(
-                top_img=pp_png_1,base="nc", value=(0, 0)
-            )
-            pp_png_1_bg = pp_png_1_bg.rotate(0)
+            # pp_png_1_bg = PictureProcessing("RGBA", (pp_jpg_1.width*1.4, pp_jpg_1.width*1.4), (255,255,255,0))
+            # pp_png_1_bg = pp_png_1_bg.paste_img(
+            #     top_img=pp_png_1,base="nc", value=(0, 0)
+            # )
+            # pp_png_1_bg = pp_png_1_bg.rotate(0)
+            #
+            # pp_bg = pp_bg.paste_img(
+            #     top_img=pp_png_1_bg,base="cc", value=(25, 340)
+            # )
 
-            pp_bg = pp_bg.paste_img(
-                top_img=pp_png_1_bg,base="cc", value=(25, 340)
+            pp_bg = pp_bg.to_overlay_pic_advance(
+                mode="pixel",
+                top_img=pp_jpg_1,
+                base="cc",
+                value=(25, 50),
+                top_png_img=pp_png_1,
             )
 
         return pp_bg
@@ -149,7 +157,7 @@ class DetailPicGet(DetailBase):
         gengao = self.get_text_value("跟高")
 
         pp_bg.get_text_image_advanced(
-            value=(264, 681),
+            value=(264, 680),
             font=font,
             text=xiemian,
             align="left",
@@ -161,7 +169,7 @@ class DetailPicGet(DetailBase):
             max_len_one_line=6
         )
         pp_bg.get_text_image_advanced(
-            value=(611, 681),
+            value=(611, 680),
             font=font,
             text=neili,
             align="left",
@@ -173,7 +181,7 @@ class DetailPicGet(DetailBase):
             max_len_one_line=6
         )
         pp_bg.get_text_image_advanced(
-            value=(611, 760),
+            value=(611, 758),
             font=font,
             text=xiedi,
             align="left",
@@ -185,7 +193,7 @@ class DetailPicGet(DetailBase):
             max_len_one_line=6
         )
         pp_bg.get_text_image_advanced(
-            value=(264, 760),
+            value=(264, 758),
             font=font,
             text=xiedian,
             align="left",
@@ -342,11 +350,20 @@ class DetailPicGet(DetailBase):
             # ppw=(pp_png1.width/pp_png1.height)*pph
             pp_png1=pp_png1.resize(value=bg_image.width*1)
             pp_jpg1=pp_jpg1.resize(value=bg_image.width*1)
-            pp_png1 = pp_png1.rotate(30)
+            # pp_png1 = pp_png1.rotate(30)
+
+            temp_pp1_bg=PictureProcessing("RGB",(ppg_width*2,ppg_width*2),(255,255,255))
+            temp_pp1_bg = temp_pp1_bg.paste_img(
+                mode="pixel",top_img=pp_jpg1,base="wc",value=(0, 0)
+            )
+            temp_pp1_bg = temp_pp1_bg.rotate(30)
+
+
+
             new_pp1_bg=PictureProcessing("RGB",(ppg_width,ppg_height),(255,255,255))
 
             new_pp1_bg=new_pp1_bg.paste_img(
-                mode="pixel",top_img=pp_png1,base="en",value=(-140, 0)
+                mode="pixel",top_img=temp_pp1_bg,base="en",value=(-350, -280)
             )
 
             bg_image=bg_image.paste_img(
@@ -439,8 +456,12 @@ class DetailPicGet(DetailBase):
         pp_bg = PictureProcessing(image_path,1600)
         goods_art_no_list = list(self.data.keys())
 
-        # pp_bg_new = copy.deepcopy(pp_bg)
+        font = ImageFont.truetype(
+            r"resources\ttf\puhui\Regular.ttf", 18
+        )
 
+        # pp_bg_new = copy.deepcopy(pp_bg)
+        bg_height=179
         pp_jpg_1, pp_png_1 = self.image_one_pic(
             return_orign=True,
             goods_art_no=goods_art_no_list[0],
@@ -456,6 +477,20 @@ class DetailPicGet(DetailBase):
             pp_bg = pp_bg.to_overlay_pic_advance(
                 top_img=pp_jpg_1, top_png_img=pp_png_1, base="nc", value=(0, 270)
             )
+            bg_height=683
+
+            pp_bg.get_text_image_advanced(
+                value=(310,610),
+                font=font,
+                text="正面45°/ FRONT45°",
+                align="center",
+                # anchor="ma",
+                spacing=5,
+                return_mode="image",
+                margins=(0, 0, 0, 0),
+                max_len_one_line=20
+            )
+
 
         pp_jpg_1, pp_png_1 = self.image_one_pic(
             return_orign=True,
@@ -472,6 +507,18 @@ class DetailPicGet(DetailBase):
             pp_bg = pp_bg.to_overlay_pic_advance(
                 top_img=pp_jpg_1, top_png_img=pp_png_1, base="nc", value=(0, 720)
             )
+            bg_height=1086
+            pp_bg.get_text_image_advanced(
+                value=(315,1020),
+                font=font,
+                text="背面45°/ BACK45°",
+                align="center",
+                # anchor="ma",
+                spacing=5,
+                return_mode="image",
+                margins=(0, 0, 0, 0),
+                max_len_one_line=20
+            )
 
         pp_jpg_1, pp_png_1 = self.image_one_pic(
             return_orign=True,
@@ -496,6 +543,19 @@ class DetailPicGet(DetailBase):
                 top_img=pp_jpg_2, top_png_img=pp_png_2, base="nc", value=(80, 1150)
             )
 
+            bg_height=1600
+            pp_bg.get_text_image_advanced(
+                value=(350,1530),
+                font=font,
+                text="侧面/ SIDE",
+                align="center",
+                # anchor="ma",
+                spacing=5,
+                return_mode="image",
+                margins=(0, 0, 0, 0),
+                max_len_one_line=20
+            )
+
         pp_jpg_1, pp_png_1 = self.image_one_pic(
             return_orign=True,
             goods_art_no=goods_art_no_list[0],
@@ -511,8 +571,28 @@ class DetailPicGet(DetailBase):
             pp_bg = pp_bg.to_overlay_pic_advance(
                 top_img=pp_jpg_1, top_png_img=pp_png_1, base="nc", value=(0, 1750)
             )
+            bg_height=2395
+            pp_bg.get_text_image_advanced(
+                value=(353,2270),
+                font=font,
+                text="顶面/ TOP",
+                align="center",
+                # anchor="ma",
+                spacing=5,
+                return_mode="image",
+                margins=(0, 0, 0, 0),
+                max_len_one_line=20
+            )
+
+
+        temp_pp1_bg=PictureProcessing("RGB",(pp_bg.width,bg_height),(255,255,255))
+
+
+        temp_pp1_bg=temp_pp1_bg.paste_img(
+            mode="pixel",top_img=pp_bg,base="nw",value=(0, 0)
+        )
 
-        detailed_images.append(pp_bg)
+        detailed_images.append(temp_pp1_bg)
 
         return self.pp_pic_subsection(
             PictureProcessing(im=self.add_pic(detailed_images))

python/detail_template_test.py

@@ -4,7 +4,7 @@ import settings
 settings.is_test_plugins = True
 
 
-from custom_plugins.plugins.detail_template.xinnuo.detail_xinnuo3 import (
+from custom_plugins.plugins.detail_template.xinjunlue.detail_xinjunlue1 import (
     DetailPicGet,
 )
 
@@ -14,7 +14,7 @@ for goods_no, value in data.items():
     d = DetailPicGet(
         goods_no=goods_no,
         goods_no_value=value,
-        out_put_dir=r"C:\Development\project\python\CameraMachine\python\output\xinnuo-3",
+        out_put_dir=r"C:\Development\project\python\CameraMachine\python\output\xinjunlue-1",
         test=True,
     )
 print("生成成功")

python/detail_template_test_xinjunlue.json

@@ -60,7 +60,7 @@
             }
         ],
         "文件夹名称": "AC51016112",
-        "图片路径": "休闲运动",
+        "图片路径": "\\\\RAMBO\\Users\\15001\\Desktop\\panpanpan\\E305S\\E305-01003.jpg",
         "楦号": "E305S",
         "内里": "RL203黑色羊皮里+后套里：ZP3002黑色猪皮反面",
         "面料": "RB3721杏色网布+RJ262杏色长毛牛京+RN1982白色荔枝纹皮+RN2586黑色牛皮",
@@ -68,7 +68,13 @@
         "大底": "黑色大底+灰色EVA+白色EVA",
         "饰扣": "黑色松紧+金色日子扣",
         "客户": "strategy",
-        "码数": "",
-        "日期": "2025-6-12"
+        "码数": "7#",
+        "日期": "2025-6-12",
+        "JEFFREY CAMPBELL":"JEFFREY CAMPBELL",
+        "Supplier":"STRATEGY",
+        "Remark":"SHOW SAMPLE",
+        "Material":"RN3371# BROWN COW",
+        "Lining&Sock":"BROWN PU",
+        "MADE IN CHINA":"MADE IN CHINA"
     }
 }

python/service/data.py

@@ -201,6 +201,75 @@ class DataModeGenerateDetail(DataBaseModel):
         # 数据转字典
         return_dict = {}
         message = ""
+        for index, row in need_df.iterrows():
+            if settings.PROJECT == "红蜻蜓":
+                if row["商品货号"] and row["款号"] and row["编号"]:
+                    return_dict[row["文件夹名称"]] = {
+                        "type": "goods_art_no",
+                        "name": row["文件夹名称"].upper(),
+                        "文件夹名称": row["文件夹名称"],
+                        "template_name": row["模板名称"],
+                        "data": row.to_dict(),
+                    }
+                else:
+                    message = "商品货号、款号、编号必须有值"
+            else:
+                if row["商品货号"] and row["款号"]:
+                    return_dict[row["文件夹名称"]] = {
+                        "type": "goods_art_no",
+                        "name": row["文件夹名称"].upper(),
+                        "文件夹名称": row["文件夹名称"],
+                        "template_name": row["模板名称"],
+                        "data": row.to_dict(),
+                    }
+
+        print("return_dict", return_dict)
+
+        if not return_dict:
+            message += "\n没有找到任何匹配的数据"
+            return {"code": 99, "message": message, "data": return_dict}
+        else:
+            return {"code": 0, "message": message, "data": return_dict}
+
+    def get_basic_goods_art_data_form_excel_bak(self, folder_name_list, excel_path, keys):
+
+        # =====创建虚拟表格并进行连表处理
+        need_df = pd.DataFrame(columns=["文件夹名称"])
+        for folder_name in folder_name_list:
+            new_row = {
+                "文件夹名称": str(folder_name),
+            }
+            need_df = need_df._append(new_row, ignore_index=True)
+
+        need_df = need_df.fillna(value="")
+
+        # 打开表格并进行匹配
+        _df = pd.read_excel(excel_path, sheet_name=0, header=0)
+        # 去重数据
+        duplicates = _df.duplicated(subset=["文件夹名称"], keep="first")
+        _df = _df.loc[~duplicates]
+        _df = _df.fillna(value="")
+        _df = _df.astype(str)
+
+        # 数据匹配关联，左关联
+        need_df = pd.merge(
+            need_df,
+            _df,
+            on=["文件夹名称"],
+            how="left",
+            indicator=False,
+        )
+        # 补全字段
+        header_list = need_df.columns.values.tolist()
+        for key in keys:
+            if key not in header_list:
+                need_df[key] = ""
+
+        need_df = need_df.fillna(value="")
+        need_df = need_df.astype(str)
+        # 数据转字典
+        return_dict = {}
+        message = ""
         print("need_df.iterrows()   <=============>      ", need_df.to_json())
         for index, row in need_df.iterrows():
             if settings.PROJECT == "红蜻蜓":

python/service/detail_func.py

@@ -4,7 +4,7 @@ import settings
 import shutil
 
 
-def get_all_dir_info(image_dir, goods_art_no):
+def get_all_dir_info(image_dir, goods_art_nos):
     # 遍历货号获取所有货号--可能为编号
     folder_name_list = []
     for folder_name in os.listdir(image_dir):
@@ -19,8 +19,8 @@ def get_all_dir_info(image_dir, goods_art_no):
                 os.rmdir(_path)
             continue
         print("folder_name====>", folder_name)
-        print("goods_art_no====>", goods_art_no)
-        if goods_art_no == folder_name:
+        print("goods_art_no====>", goods_art_nos)
+        if folder_name in goods_art_nos:
             folder_name_list.append(folder_name)
 
     return folder_name_list

python/service/init_load_source.py

@@ -17,7 +17,7 @@ class init_load_source:
         if response_data:
             for relative_file_path, value in response_data['data'].items():
                 if "new_custom_plugins" in relative_file_path and os.path.exists("lib") == False:
-                    print("主目录不存在，不下载")
+                    # print("主目录不存在，不下载")
                     continue
                 if (
                     "new_custom_plugins" in relative_file_path

python/service/run_main.py

@@ -363,14 +363,15 @@ class RunMain():
         is_use_excel = config_data["is_use_excel"]
         excel_path = config_data["excel_path"]
         temp_class = config_data["temp_class"]
-        goods_art_no = config_data["goods_art_no"]
+        goods_art_nos = config_data["goods_art_nos"]
         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 = get_all_dir_info(
-            image_dir=image_dir, goods_art_no=goods_art_no
+            image_dir=image_dir, goods_art_nos=goods_art_nos
         )
+        print("folder_name_list--folder_name_list===========>>>>", folder_name_list)
         if not folder_name_list:
             return_data["message"] += "不存在任何货号/编号文件夹\n"
             print("不存在任何货号/编号文件夹")
@@ -401,7 +402,7 @@ class RunMain():
                     keys,
                 )
             )
-
+            print("打印=======>>>>>>>_result=============>", _result)
         if _result["code"] == 0:
             remote_data = _result["data"]
         else:
@@ -870,6 +871,7 @@ class RunMain():
                         if goods_no in excel_temp_goods_no_data:
                             if _temp_name in excel_temp_goods_no_data[goods_no]:
                                 # 将表格中的特定的模板的行，替换到goods_no的data中，因为不同的模板有数据特殊性
+                                print("xxxxxx====>", excel_temp_goods_no_data[goods_no])
                                 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