1、返工向导模型添加新的工单字段;2、工单tree视图添加重新加工分类
This commit is contained in:
@@ -141,8 +141,8 @@ class ResMrpWorkOrder(models.Model):
|
||||
|
||||
# 是否绑定托盘
|
||||
is_trayed = fields.Boolean(string='是否绑定托盘', default=False)
|
||||
|
||||
tag_type = fields.Selection([("重新加工", "重新加工")], string="标签", tracking=True)
|
||||
|
||||
technology_design_id = fields.Many2one('sf.technology.design')
|
||||
|
||||
def _compute_default_construction_period_status(self):
|
||||
@@ -281,7 +281,7 @@ class ResMrpWorkOrder(models.Model):
|
||||
# if technology_design.is_auto is False:
|
||||
# domain = [('origin', '=', order.production_id.name)]
|
||||
# else:
|
||||
domain = [('purchase_type', '=', 'consignment'),('origin', '=', ','.join(production_list))]
|
||||
domain = [('purchase_type', '=', 'consignment'), ('origin', '=', ','.join(production_list))]
|
||||
purchase = self.env['purchase.order'].search(domain)
|
||||
if not purchase:
|
||||
order.surface_technics_purchase_count = 0
|
||||
@@ -1075,6 +1075,13 @@ class ResMrpWorkOrder(models.Model):
|
||||
if workorder.state != 'pending':
|
||||
workorder.state = 'pending'
|
||||
continue
|
||||
# ================= 如果制造订单制造类型为【人工线下加工】==========================
|
||||
if (workorder.production_id.production_type == '人工线下加工'
|
||||
and workorder.production_id.schedule_state == '已排'
|
||||
and len(workorder.production_id.picking_ids.filtered(
|
||||
lambda w: w.state not in ['done', 'cancel'])) == 0):
|
||||
workorder.state = 'ready'
|
||||
continue
|
||||
# ================= 如果制造订单刀具状态为[无效刀、缺刀] 或者 制造订单状态为[返工]==========================
|
||||
if (workorder.production_id.tool_state in ['1', '2'] or workorder.production_id.state == 'rework'
|
||||
or workorder.production_id.schedule_state != '已排'
|
||||
|
||||
Reference in New Issue
Block a user