更新制造订单生成工单时的工序字段
This commit is contained in:
@@ -82,7 +82,7 @@ class MrpWorkOrder(models.Model):
|
||||
_inherit = 'mrp.workorder'
|
||||
_description = '工单'
|
||||
|
||||
tray_ids = fields.One2many('sf.tray', 'workorder_id', string='托盘')
|
||||
|
||||
# def get_tray_info(self):
|
||||
# @api.onchange('X_axis', 'Y_axis', 'Z_axis')
|
||||
# def get_center_point(self):
|
||||
@@ -241,7 +241,7 @@ class MrpWorkOrder(models.Model):
|
||||
productions = self.production_id
|
||||
self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
|
||||
self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
|
||||
productions.create_workorder1(self.processing_panel)
|
||||
productions._create_workorder2(self.processing_panel)
|
||||
return ""
|
||||
|
||||
def fetchCNC(self):
|
||||
@@ -279,7 +279,26 @@ class MrpProduction(models.Model):
|
||||
'user_id': production.user_id.id}
|
||||
return production_values_str
|
||||
|
||||
def create_workorder1(self, k):
|
||||
def _reset_work_order_sequence1(self,k):
|
||||
for rec in self:
|
||||
current_sequence = 1
|
||||
for work in rec.workorder_ids:
|
||||
if work.processing_panel == '':
|
||||
work.sequence = current_sequence
|
||||
current_sequence += 1
|
||||
for work in rec.workorder_ids:
|
||||
if work.processing_panel == k:
|
||||
work.sequence = current_sequence
|
||||
current_sequence += 1
|
||||
for work in rec.workorder_ids:
|
||||
if work.processing_panel != k and work.processing_panel != "":
|
||||
work.sequence = current_sequence
|
||||
current_sequence += 1
|
||||
|
||||
|
||||
|
||||
|
||||
def _create_workorder1(self, k):
|
||||
for production in self:
|
||||
if not production.bom_id or not production.product_id:
|
||||
continue
|
||||
@@ -320,10 +339,12 @@ class MrpProduction(models.Model):
|
||||
i += 1
|
||||
for route in routingworkcenter:
|
||||
|
||||
if route.routing_type == 'CNC加工':
|
||||
workorders_values.append(
|
||||
self.env['mrp.workorder'].json_workorder_str(k, production, route))
|
||||
|
||||
if route.routing_type == '后置三元质量检测':
|
||||
workorders_values.append(
|
||||
self.env['mrp.workorder'].json_workorder_str(k, production, route)
|
||||
)
|
||||
if route.routing_type == 'CNC加工':
|
||||
workorders_values.append(
|
||||
self.env['mrp.workorder'].json_workorder_str(k, production, route))
|
||||
|
||||
@@ -331,6 +352,11 @@ class MrpProduction(models.Model):
|
||||
for workorder in production.workorder_ids:
|
||||
workorder.duration_expected = workorder._get_duration_expected()
|
||||
|
||||
def _create_workorder2(self, k):
|
||||
res = self._create_workorder1(k)
|
||||
self._reset_work_order_sequence1(k)
|
||||
return res
|
||||
|
||||
|
||||
class Attachment(models.Model):
|
||||
_inherit = 'ir.attachment'
|
||||
|
||||
Reference in New Issue
Block a user