rambo 1 день тому
батько
коміт
cdf6030980
2 змінених файлів з 22 додано та 28 видалено
  1. 15 24
      python/service/data.py
  2. 7 4
      python/service/run_main.py

+ 15 - 24
python/service/data.py

@@ -165,33 +165,24 @@ class DataModeGenerateDetail(DataBaseModel):
                 return_dict.pop(folder_name)
 
         return {"code": 0, "message": "", "data": return_dict}
-    def makeFakeData():
-        return {"code": 0, "message": "", "data": {
-            "A00001": {
+    def makeFakeData(self, folder_name_list):
+        fakeData = {}
+        for folder in folder_name_list:
+            fakeData[folder] = {
                 "type": "goods_art_no",
-                "name": "A00001",
-                "文件夹名称": "A00001",
-                "template_name": "模板1",
+                "name": str(folder).upper(),
+                "商品货号": str(folder),
                 "data": {
-                    "商品货号": "A00001",
-                    "款号": "K0001",
-                    "编号": "NUM0001",
-                    "颜色名称": "红色",
+                    "商品货号": str(folder),
+                    "款号": str(folder),
+                    "性别": "女",
+                    "颜色名称": "白色",
+                    "商品面料": "pvc",
+                    "商品内里": "牛皮",
+                    "商品鞋底": "pvc",
                 },
-            },
-            "A00002": {
-                "type": "goods_art_no",
-                "name": "A00002",
-                "文件夹名称": "A00002",
-                "template_name": "模板2",
-                "data": {
-                    "商品货号": "A00002",
-                    "款号": "K0002",
-                    "编号": "NUM0002",
-                    "颜色名称": "蓝色",
-                },
-            },
-        }}
+            }
+        return {"code": 0, "message": "", "data": fakeData}
     def get_basic_goods_art_data_form_excel(self, folder_name_list, excel_path, keys):
 
         # =====创建虚拟表格并进行连表处理

+ 7 - 4
python/service/run_main.py

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