Commit 2ebdc9ca authored by rico.liu's avatar rico.liu

update

parent 8fda62fe
Pipeline #182 failed with stages
...@@ -15,8 +15,6 @@ from public_function import * ...@@ -15,8 +15,6 @@ from public_function import *
import uuid import uuid
import datetime import datetime
#from delCalPrice_UpdatePriceDiff import check_configure_price,create_price_difference_single
#初始化数据 #初始化数据
def InitializeData(path): def InitializeData(path):
...@@ -25,6 +23,10 @@ def InitializeData(path): ...@@ -25,6 +23,10 @@ def InitializeData(path):
df_product = pd.read_excel(path,sheet_name = '产品表模板') df_product = pd.read_excel(path,sheet_name = '产品表模板')
df_product = df_product.fillna('无') df_product = df_product.fillna('无')
if df_product['操作人'].unique().tolist()[0] == '无':
print("请填写操作人信息,eg:CL-MBJK")
return False
df_price = pd.read_excel(path,sheet_name = '价格表模板') df_price = pd.read_excel(path,sheet_name = '价格表模板')
df_price = df_price.fillna('无') df_price = df_price.fillna('无')
...@@ -1720,7 +1722,6 @@ path = "/Users/rico/project/模板建库v2/CL-MBJK建库产品参数确认2020-1 ...@@ -1720,7 +1722,6 @@ path = "/Users/rico/project/模板建库v2/CL-MBJK建库产品参数确认2020-1
##校验参数数据 ##校验参数数据
std_value_dict = CheckParamsData(path) std_value_dict = CheckParamsData(path)
##导入补充的数据字典 ##导入补充的数据字典
data_dict_path = "/Users/rico/project/模板建库v2/CL-MBJK建库产品参数确认2020-11-20(1)(数据字典补充).xlsx" data_dict_path = "/Users/rico/project/模板建库v2/CL-MBJK建库产品参数确认2020-11-20(1)(数据字典补充).xlsx"
ComplicatedDataDict(data_dict_path) ComplicatedDataDict(data_dict_path)
...@@ -1731,7 +1732,6 @@ if std_value_dict: ...@@ -1731,7 +1732,6 @@ if std_value_dict:
##产品名称 ##产品名称
product_named(batch,channel_alias,std_value_dict) product_named(batch,channel_alias,std_value_dict)
#导出建库前确认数据 #导出建库前确认数据
df = LoadData(batch,channel_alias,'collectDataConfirm') df = LoadData(batch,channel_alias,'collectDataConfirm')
df.to_excel(f"{channel_alias}建库信息确认{batch}.xlsx") df.to_excel(f"{channel_alias}建库信息确认{batch}.xlsx")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment