jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单和编程

Browse Source 
# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
This commit is contained in:
jinling.yang
2024-05-11 00:20:08 +08:00
parent 2bffc5964a 7d7096a36c
commit ec01b89242
6 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sf_manufacturing/models/mrp_workorder.py
View File

@@ -412,8 +412,8 @@ class ResMrpWorkOrder(models.Model):
work = workorder.production_id.workorder_ids
work.compensation_value_x = eval(self.material_center_point)[0]
work.compensation_value_y = eval(self.material_center_point)[1]
work.process_state = '待加工'
self.sudo().production_id.state = 'pending_processing'
# work.process_state = '待加工'
# self.sudo().production_id.process_state = '待加工'
self.date_finished = datetime.now()
workorder.button_finish()
@@ -867,6 +867,7 @@ class ResMrpWorkOrder(models.Model):
for move_raw_id in record.production_id.move_raw_ids:
move_raw_id.quantity_done = move_raw_id.product_uom_qty
record.process_state = '已完工'
record.production_id.process_state = '已完工'
record.production_id.button_mark_done1()
# self.production_id.state = 'done'