new_sanwei
chaopower 2024-09-12 09:37:35 +08:00
parent abbef53bc3
commit 3f3c890eea
1 changed files with 43 additions and 41 deletions

View File

@ -521,8 +521,8 @@ class AutoLayout:
self.no_assign_data.extend(no_ori_data.to_dict('records'))
# 包lane的剔除
orderlane_mask = ori_library_df['productname'].str.contains('包lane')
# orderlane_mask = ori_library_df['lanepackcode'].str.contains('包lane')
orderlane_mask = ori_library_df['lanepackcode'] != ''
self.order_assign_data = ori_library_df[orderlane_mask].to_dict('records')
# 使用布尔索引筛选出不是数字和非日期的行包lane的
@ -549,46 +549,48 @@ class AutoLayout:
continue
# 不平衡文库 大于250G 的数据 先进行拆分
if is_balance_lib == '' and size > 250:
self.return_log.append(f'文库{library} 是不平衡文库, 数据为{size}, 大于250G, 已做拆分处理, 请注意!!! ')
data_needed = library_df['orderdatavolume'].copy()
for num in range(int(size), 0, -200):
addnum = 200
if num <= 200:
addnum = num
library_df['orderdatavolume'] = (addnum / size) * data_needed
# 取消 20240912
# if is_balance_lib == '否' and size > 250:
# self.return_log.append(f'文库{library} 是不平衡文库, 数据为{size}, 大于250G, 已做拆分处理, 请注意!!! ')
# data_needed = library_df['orderdatavolume'].copy()
# for num in range(int(size), 0, -200):
# addnum = 200
# if num <= 200:
# addnum = num
# library_df['orderdatavolume'] = (addnum / size) * data_needed
#
# self.ori_lib_data.append(dict(
# library=library,
# sample_code=library_df['sampleCode'].values[0],
# is_balance_lib=library_df['librarybalancedflag'].values[0],
# size=library_df['orderdatavolume'].sum(),
# split_method=library_df['cycletype'].values[0],
# time=library_df['receivedtime'].values[0],
# level=1950,
# customer=library_df['companynamea'].values[0],
# classification=library_df['classification'].values[0],
# data=library_df.to_dict('records')
# ))
# self.split_lib.add(library)
# continue
self.ori_lib_data.append(dict(
library=library,
sample_code=library_df['sampleCode'].values[0],
is_balance_lib=library_df['librarybalancedflag'].values[0],
size=library_df['orderdatavolume'].sum(),
split_method=library_df['cycletype'].values[0],
time=library_df['receivedtime'].values[0],
level=1950,
customer=library_df['companynamea'].values[0],
classification=library_df['classification'].values[0],
data=library_df.to_dict('records')
))
self.split_lib.add(library)
continue
# 拆分处理 分为了2个大文库
if size > self.data_limit / 2:
library_df['orderdatavolume'] = library_df['orderdatavolume'] / 2
self.return_log.append(f'文库{library} 已做拆分处理, 请注意!!! ')
self.ori_lib_data.append(dict(
library=library,
sample_code=library_df['sampleCode'].values[0],
is_balance_lib=library_df['librarybalancedflag'].values[0],
size=library_df['orderdatavolume'].sum(),
split_method=library_df['cycletype'].values[0],
time=library_df['receivedtime'].values[0],
level=library_df['level'].values[0],
customer=library_df['companynamea'].values[0],
classification=library_df['classification'].values[0],
data=library_df.to_dict('records')
))
# # 拆分处理 分为了2个大文库
# 取消 20240912
# if size > self.data_limit / 2:
# library_df['orderdatavolume'] = library_df['orderdatavolume'] / 2
# self.return_log.append(f'文库{library} 已做拆分处理, 请注意!!! ')
# self.ori_lib_data.append(dict(
# library=library,
# sample_code=library_df['sampleCode'].values[0],
# is_balance_lib=library_df['librarybalancedflag'].values[0],
# size=library_df['orderdatavolume'].sum(),
# split_method=library_df['cycletype'].values[0],
# time=library_df['receivedtime'].values[0],
# level=library_df['level'].values[0],
# customer=library_df['companynamea'].values[0],
# classification=library_df['classification'].values[0],
# data=library_df.to_dict('records')
# ))
self.ori_lib_data.append(dict(
library=library,