diff --git a/sf_machine_connect/views/WorkCenterBarcodes.xml b/sf_machine_connect/views/WorkCenterBarcodes.xml
index a1a5a5ea..103a6b7f 100644
--- a/sf_machine_connect/views/WorkCenterBarcodes.xml
+++ b/sf_machine_connect/views/WorkCenterBarcodes.xml
@@ -13,6 +13,7 @@
+
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 8b290312..7fca3c81 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -20,7 +20,7 @@ class MrpProduction(models.Model):
_description = "制造订单"
_order = 'create_date desc'
sale_order_id = fields.Many2one('sale.order', string='销售订单', compute='_compute_sale_order_id', store=True)
- deadline_of_delivery = fields.Date('订单交期', tracking=True, compute='_compute_deadline_of_delivery')
+ deadline_of_delivery = fields.Date('订单交期', tracking=True, compute='_compute_deadline_of_delivery', store=True)
# tray_ids = fields.One2many('sf.tray', 'production_id', string="托盘")
maintenance_count = fields.Integer(compute='_compute_maintenance_count', string="Number of maintenance requests")
request_ids = fields.One2many('maintenance.request', 'production_id')
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 6d4a0c73..702c54dc 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -40,6 +40,11 @@ class ResMrpWorkOrder(models.Model):
# workcenter_id = fields.Many2one('mrp.workcenter', string='工作中心', required=False)
users_ids = fields.Many2many("res.users", 'users_workorder', related="workcenter_id.users_ids")
processing_panel = fields.Char('加工面')
+ processing_panel_selection = fields.Selection([
+ ('ZM', 'ZM'),
+ ('FM', 'FM'),
+ ('YC', 'YC'),
+ ('QC', 'QC')], string="加工面", compute='_compute_processing_panel_selection', store=True)
sequence = fields.Integer(string='工序')
routing_type = fields.Selection([
('装夹预调', '装夹预调'),
@@ -63,6 +68,14 @@ class ResMrpWorkOrder(models.Model):
delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效',
tracking=True)
+ @api.depends('processing_panel')
+ def _compute_processing_panel_selection(self):
+ for record in self:
+ if record.processing_panel in ['ZM', 'FM', 'YC', 'QC']:
+ record.processing_panel_selection = record.processing_panel
+ else:
+ record.processing_panel_selection = False
+
@api.depends('production_id.manual_quotation')
def _compute_manual_quotation(self):
for item in self:
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 8a44b621..8e46b256 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -554,6 +554,27 @@
mrp.production
+
+ 单据编码
+
+
+
+
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 09bd790c..cf57b355 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -160,8 +160,11 @@
-
-
+
+
+
+
+
@@ -176,6 +179,7 @@
+
diff --git a/sf_plan/wizard/action_plan_some.py b/sf_plan/wizard/action_plan_some.py
index 86b3f1ac..f27f4dad 100644
--- a/sf_plan/wizard/action_plan_some.py
+++ b/sf_plan/wizard/action_plan_some.py
@@ -20,10 +20,15 @@ class Action_Plan_All_Wizard(models.TransientModel):
logging.info('计划开始时间: %s', planned_start_date)
return planned_start_date
+ def _get_production_line_id(self):
+ sf_production_line = self.env['sf.production.line'].sudo().search(
+ [('name', '=', '1#CNC自动生产线')], limit=1)
+ return sf_production_line.id
+
# 选择生产线
- production_line_id = fields.Many2one('sf.production.line', string=u'生产线', required=True)
- date_planned_start = fields.Datetime(string='计划开始时间', index=True, copy=False,
- default=_get_date_planned_start)
+ production_line_id = fields.Many2one('sf.production.line', string=u'生产线', required=True,
+ default=_get_production_line_id)
+ date_planned_start = fields.Datetime(string='计划开始时间', index=True, copy=False, required=True)
# 接收传递过来的计划ID
plan_ids = fields.Many2many('sf.production.plan', string=u'计划ID')
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 092e0113..8f986858 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -770,6 +770,7 @@
+