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

修改工单显隐控制逻辑

Browse Source
This commit is contained in:
mgw
2024-03-11 10:56:03 +08:00
parent 0f2e6b165c
commit 8a800e909f
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_manufacturing/controllers/controllers.py
View File

@@ -210,7 +210,7 @@ class Manufacturing_Connect(http.Controller):
'state': 'finished'}) 'state': 'finished'})
production_obj = request.env['mrp.production'].sudo().search([('name', '=', production_id)]) production_obj = request.env['mrp.production'].sudo().search([('name', '=', production_id)])
if production_obj: if production_obj:
production_obj.sudo().schedule_state = '已完成' production_obj.sudo().work_order_state = '已完成'
production_obj.write({'state': 'completed'}) production_obj.write({'state': 'completed'})
request.env['sale.order'].sudo().search( request.env['sale.order'].sudo().search(
[('name', '=', production_obj.origin)]).write({'schedule_status': 'to deliver'}) [('name', '=', production_obj.origin)]).write({'schedule_status': 'to deliver'})

9
sf_manufacturing/models/mrp_production.py
View File

@@ -20,6 +20,8 @@ class MrpProduction(models.Model):
model_file = fields.Binary('模型文件', related='product_id.model_file') model_file = fields.Binary('模型文件', related='product_id.model_file')
schedule_state = fields.Selection([('未排', '未排'), ('已排', '已排'), ('已完成', '已完成')], schedule_state = fields.Selection([('未排', '未排'), ('已排', '已排'), ('已完成', '已完成')],
string='排程状态', default='未排') string='排程状态', default='未排')
work_order_state = fields.Selection([('未排', '未排'), ('已排', '已排'), ('已完成', '已完成')],
string='工单状态', default='未排')
# state = fields.Selection(selection_add=[ # state = fields.Selection(selection_add=[
# ('pending_scheduling', '待排程'), # ('pending_scheduling', '待排程'),
@@ -53,8 +55,7 @@ class MrpProduction(models.Model):
production_line_id = fields.Many2one('sf.production.line', string='生产线') production_line_id = fields.Many2one('sf.production.line', string='生产线')
plan_start_processing_time = fields.Datetime('计划开始加工时间') plan_start_processing_time = fields.Datetime('计划开始加工时间')
production_line_state = fields.Selection([('待上产线', '待上产线'), ('已上产线', '已上产线'), ('已下产线', '已下产线')], production_line_state = fields.Selection([('待上产线', '待上产线'), ('已上产线', '已上产线'), ('已下产线', '已下产线')],
string='上/下产线', default='待上产线') string='上/下产线', default='待上产线')
@api.depends( @api.depends(
'move_raw_ids.state', 'move_raw_ids.quantity_done', 'move_finished_ids.state', 'move_raw_ids.state', 'move_raw_ids.quantity_done', 'move_finished_ids.state',
@@ -94,9 +95,9 @@ class MrpProduction(models.Model):
production.state = 'pending_processing' production.state = 'pending_processing'
# elif production.state == 'progress' and production.schedule_state == '已完成': # elif production.state == 'progress' and production.schedule_state == '已完成':
# production.state = 'completed' # production.state = 'completed'
elif production.state == 'pending_processing' and production.schedule_state == '已完成': elif production.state == 'pending_processing' and production.work_order_state == '已完成':
production.state = 'completed' production.state = 'completed'
elif production.state == 'progress' and production.schedule_state == '已完成': elif production.state == 'progress' and production.work_order_state == '已完成':
production.state = 'completed' production.state = 'completed'
def action_check(self): def action_check(self):

2
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -105,7 +105,7 @@
<field name='name' invisible="1"/> <field name='name' invisible="1"/>
<field name='is_delivery' invisible="1"/> <field name='is_delivery' invisible="1"/>
<!-- 工单form页面的开始停工按钮等 --> <!-- 工单form页面的开始停工按钮等 -->
<button name="button_start" type="object" string="开始12" class="btn-success" <button name="button_start" type="object" string="开始" class="btn-success"
attrs="{'invisible': ['|', '|', '|', '|','|', ('production_state','in', ('draft', 'done', attrs="{'invisible': ['|', '|', '|', '|','|', ('production_state','in', ('draft', 'done',
'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')),
('is_user_working', '!=', False),('user_permissions','=',False), ('routing_type', '=', 'CNC加工')]}" ('is_user_working', '!=', False),('user_permissions','=',False), ('routing_type', '=', 'CNC加工')]}"