diff --git a/sf_plan/models/custom_plan.py b/sf_plan/models/custom_plan.py index d4402c98..5f0d254b 100644 --- a/sf_plan/models/custom_plan.py +++ b/sf_plan/models/custom_plan.py @@ -44,8 +44,9 @@ class sf_production_plan(models.Model): production_id = fields.Many2one('mrp.production', '关联制造订单') product_qty = fields.Float(string='数量', digits='Product Unit of Measure', required=True, default=0.0) production_line_id = fields.Many2one('sf.production.line', string='生产线') - date_planned_start = fields.Datetime(string='计划开始时间', required=True, index=True, copy=False, - default=fields.Datetime.now) + # date_planned_start = fields.Datetime(string='计划开始时间', required=True, index=True, copy=False, + # default=fields.Datetime.now) + date_planned_start = fields.Datetime(string='计划开始时间') date_planned_finished = fields.Datetime(string='计划结束时间') # 排程设置selection(倒排,顺排,默认倒排) schedule_setting = fields.Selection([ @@ -80,7 +81,7 @@ class sf_production_plan(models.Model): def _compute_production_line_id(self): for item in self: item.sudo().production_id.production_line_id = item.production_line_id.id - item.sudo().production_id.plan_start_processing_time = item.date_planned_start + # item.sudo().production_id.plan_start_processing_time = item.date_planned_start # @api.onchange('state') # def _onchange_state(self): @@ -198,7 +199,9 @@ class sf_production_plan(models.Model): for item in record.production_id.workorder_ids: if item.name == 'CNC加工': item.date_planned_finished = datetime.now() + timedelta(days=100) - item.date_planned_start = record.date_planned_start + # item.date_planned_start = record.date_planned_start + item.date_planned_start = datetime.now() + record.sudo().production_id.plan_start_processing_time = item.date_planned_start item.date_planned_finished = item.date_planned_start + timedelta( minutes=record.env['mrp.routing.workcenter'].sudo().search( [('name', '=', 'CNC加工')]).time_cycle) @@ -291,6 +294,7 @@ class sf_production_plan(models.Model): print('时间设置失败,请检查是否为工序分配工作中心,%s' % e) def cancel_production_schedule(self): + self.date_planned_start = False self.date_planned_finished = False self.state = 'draft' self.production_line_id = False diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml index 38c7f4f8..1e7ff0f6 100644 --- a/sf_plan/views/view.xml +++ b/sf_plan/views/view.xml @@ -88,7 +88,7 @@ - +