SongQi
/
HTSim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Iss update

This commit is contained in:
SongQi 2023-07-24 15:17:58 +08:00
parent 7c210b0479 6027857189
commit 49020043db
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
InventorySystem.py
View File

@ -69,10 +69,17 @@ class InventorySystem(ap.Agent):
self.ev_int_order_time = np.zeros((115,)) self.ev_int_order_time = np.zeros((115,))
self.ev_int_arrive_time = np.zeros((115,)) self.ev_int_arrive_time = np.zeros((115,))
<<<<<<< HEAD
def material_state_to_use(self, ev_int_produce_type, xv_plan_excel): def material_state_to_use(self, ev_int_produce_type, xv_plan_excel):
# 读取Oss决定的生产状态，根据生产状态所需的原材料进行汇总 # 读取Oss决定的生产状态，根据生产状态所需的原材料进行汇总
# self. ev_ary_material_state_to_use = np.multiply(self.xv_array_dlv_product, 原材料表 ) # self. ev_ary_material_state_to_use = np.multiply(self.xv_array_dlv_product, 原材料表 )
produce_state = ev_int_produce_type # 获取生产状态 produce_state = ev_int_produce_type # 获取生产状态
=======
def material_state_to_use(self, xv_ary_dlv_product, ev_int_produce_type):
# 读取Oss决定的生产状态，根据生产状态所需的原材料进行汇总
# self. ev_ary_material_state_to_use = np.multiply(self.xv_array_dlv_product, 原材料表 )
produce_state = 1 # 获取生产状态
>>>>>>> 6027857189fa76bd175eb941904972de305532a4
produce_plan = xv_plan_excel[xv_plan_excel[:, 0] == produce_state] produce_plan = xv_plan_excel[xv_plan_excel[:, 0] == produce_state]
for plan in produce_plan: for plan in produce_plan:
for bom in self.xv_ary_bom: for bom in self.xv_ary_bom: