Iss update
This commit is contained in:
		
						commit
						49020043db
					
				|  | @ -69,10 +69,17 @@ class InventorySystem(ap.Agent): | |||
|         self.ev_int_order_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): | ||||
|         # 读取Oss决定的生产状态,根据生产状态所需的原材料进行汇总 | ||||
|         # self. ev_ary_material_state_to_use = np.multiply(self.xv_array_dlv_product, 原材料表 ) | ||||
|         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] | ||||
|         for plan in produce_plan: | ||||
|             for bom in self.xv_ary_bom: | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue