rambo před 1 dnem
rodič
revize
b5a1b3da14
3 změnil soubory, kde provedl 39 přidání a 12 odebrání
  1. 11 10
      python/api.py
  2. 27 1
      python/service/data.py
  3. 1 1
      python/service/run_main.py

+ 11 - 10
python/api.py

@@ -212,16 +212,17 @@ async def handle_detail_background(
                 goods_art_no_arrays, excel_df
             )
         else:
-            remote_data = run_main.data_mode_generate_detail.get_goods_art_no_info(goods_art_list=goods_art_no_arrays)
-            if  remote_data == {}:
-                raise UnicornException("所有货号在商品档案资料中不存在,请检查货号是否正确")
-            error_goods_art_no = []
-            for goods_art_no_check in goods_art_no_arrays:
-                check_item = remote_data.get(goods_art_no_check,None)
-                if not check_item:
-                    error_goods_art_no.append(goods_art_no_check)
-            if len(error_goods_art_no) > 0:
-                raise UnicornException("以下货号在商品档案资料中不存在,请检查货号是否正确:{}".format(error_goods_art_no))
+            if is_detail == 1:
+                remote_data = run_main.data_mode_generate_detail.get_goods_art_no_info(goods_art_list=goods_art_no_arrays)
+                if  remote_data == {}:
+                    raise UnicornException("所有货号在商品档案资料中不存在,请检查货号是否正确")
+                error_goods_art_no = []
+                for goods_art_no_check in goods_art_no_arrays:
+                    check_item = remote_data.get(goods_art_no_check,None)
+                    if not check_item:
+                        error_goods_art_no.append(goods_art_no_check)
+                if len(error_goods_art_no) > 0:
+                    raise UnicornException("以下货号在商品档案资料中不存在,请检查货号是否正确:{}".format(error_goods_art_no))
             await _process_non_excel_mode(
                 params, goods_art_no_arrays
             )

+ 27 - 1
python/service/data.py

@@ -165,7 +165,33 @@ class DataModeGenerateDetail(DataBaseModel):
                 return_dict.pop(folder_name)
 
         return {"code": 0, "message": "", "data": return_dict}
-
+    def makeFakeData():
+        return {"code": 0, "message": "", "data": {
+            "A00001": {
+                "type": "goods_art_no",
+                "name": "A00001",
+                "文件夹名称": "A00001",
+                "template_name": "模板1",
+                "data": {
+                    "商品货号": "A00001",
+                    "款号": "K0001",
+                    "编号": "NUM0001",
+                    "颜色名称": "红色",
+                },
+            },
+            "A00002": {
+                "type": "goods_art_no",
+                "name": "A00002",
+                "文件夹名称": "A00002",
+                "template_name": "模板2",
+                "data": {
+                    "商品货号": "A00002",
+                    "款号": "K0002",
+                    "编号": "NUM0002",
+                    "颜色名称": "蓝色",
+                },
+            },
+        }}
     def get_basic_goods_art_data_form_excel(self, folder_name_list, excel_path, keys):
 
         # =====创建虚拟表格并进行连表处理

+ 1 - 1
python/service/run_main.py

@@ -440,7 +440,7 @@ class RunMain:
         # =========================组装数据---数据来源多种途径=========================
         _result = {"code": 99, "message": "无法解析到数据,请检查登录企业"}
         print("is_use_excel", is_use_excel)
-        if not is_use_excel:
+        if not is_use_excel and is_detail == 1:
             _result = self.data_mode_generate_detail.get_basic_goods_art_data_by_hqt_and_hlm(
                             folder_name_list
                         )