申请编程需求
This commit is contained in:
@@ -25,6 +25,7 @@
|
|||||||
'wizard/production_technology_wizard_views.xml',
|
'wizard/production_technology_wizard_views.xml',
|
||||||
'wizard/production_technology_re_adjust_wizard_views.xml',
|
'wizard/production_technology_re_adjust_wizard_views.xml',
|
||||||
'wizard/mrp_workorder_batch_replan_wizard_views.xml',
|
'wizard/mrp_workorder_batch_replan_wizard_views.xml',
|
||||||
|
'wizard/sf_programming_reason_views.xml',
|
||||||
'views/mrp_views_menus.xml',
|
'views/mrp_views_menus.xml',
|
||||||
'views/agv_scheduling_views.xml',
|
'views/agv_scheduling_views.xml',
|
||||||
'views/stock_lot_views.xml',
|
'views/stock_lot_views.xml',
|
||||||
|
|||||||
@@ -1600,6 +1600,57 @@ class MrpProduction(models.Model):
|
|||||||
raise UserError(
|
raise UserError(
|
||||||
_('You must enter a serial number for each line of %s') % sml.product_id.display_name)
|
_('You must enter a serial number for each line of %s') % sml.product_id.display_name)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
reprogramming_count = fields.Integer(string='重新编程次数', default=0)
|
||||||
|
|
||||||
|
# 申请编程
|
||||||
|
def action_apply_programming(self):
|
||||||
|
"""
|
||||||
|
检查前置条件:制造订单【状态】=“待排程、待加工”,制造订单的【编程状态】=“已编程”。
|
||||||
|
"""
|
||||||
|
print('申请编程')
|
||||||
|
if len(self) > 1:
|
||||||
|
raise UserError('仅支持选择单个制造订单进行编程申请,请重新选择')
|
||||||
|
# problem_productions = []
|
||||||
|
# for production in self:
|
||||||
|
# if production.state not in ['待排程', '待加工'] or production.programming_state != '已编程':
|
||||||
|
# problem_productions.append(production.name)
|
||||||
|
# if problem_productions:
|
||||||
|
# raise UserError('以下制造订单状态或编程状态不符合要求: %s' % ', '.join(problem_productions))
|
||||||
|
|
||||||
|
# 上述通过后,返回一个action id为sf_programming_reason_action,用作二次确认wizard,显示“重新编程原因:XXXXX(用户录入)注意:该制造订单产品已申请重新编程次数为N,且当前编程状态为XXX”
|
||||||
|
cloud_programming = self._cron_get_programming_state()
|
||||||
|
return {
|
||||||
|
'type': 'ir.actions.act_window',
|
||||||
|
'res_model': 'sf.programming.reason',
|
||||||
|
'view_mode': 'form',
|
||||||
|
'target': 'new',
|
||||||
|
'context': {
|
||||||
|
'default_production_id': self.id,
|
||||||
|
'active_id': self.id,
|
||||||
|
# 传当前时间
|
||||||
|
'default_apply_time': fields.Datetime.now(),
|
||||||
|
},
|
||||||
|
'view_id': self.env.ref('sf_manufacturing.sf_programming_reason_form_view').id,
|
||||||
|
}
|
||||||
|
|
||||||
|
# 编程记录
|
||||||
|
programming_record_ids = fields.One2many('sf.programming.record', 'production_id')
|
||||||
|
|
||||||
|
# 编程记录
|
||||||
|
class sf_programming_record(models.Model):
|
||||||
|
_name = 'sf.programming.record'
|
||||||
|
_description = "编程记录"
|
||||||
|
|
||||||
|
production_id = fields.Many2one('mrp.production')
|
||||||
|
# 编号、编程原因、编程方式、当前编程次数、目标制造单号、申请时间、下发时间
|
||||||
|
number = fields.Char('编号')
|
||||||
|
reason = fields.Text('重新编程原因')
|
||||||
|
programming_method = fields.Selection([('人工编程', '人工编程'), ('自动编程', '自动编程')], string="编程方式")
|
||||||
|
current_programming_count = fields.Integer('当前编程次数')
|
||||||
|
target_production_id = fields.Char('目标制造单号')
|
||||||
|
apply_time = fields.Datetime('申请时间')
|
||||||
|
send_time = fields.Datetime('下发时间')
|
||||||
|
|
||||||
|
|
||||||
class sf_detection_result(models.Model):
|
class sf_detection_result(models.Model):
|
||||||
|
|||||||
@@ -186,4 +186,7 @@ access_sf_detection_result_manager,sf_detection_result_manager,model_sf_detectio
|
|||||||
access_mrp_workorder_batch_replan_wizard_group_plan_dispatch,mrp_workorder_batch_replan_wizard_group_plan_dispatch,model_mrp_workorder_batch_replan_wizard,sf_base.group_plan_dispatch,1,1,1,0
|
access_mrp_workorder_batch_replan_wizard_group_plan_dispatch,mrp_workorder_batch_replan_wizard_group_plan_dispatch,model_mrp_workorder_batch_replan_wizard,sf_base.group_plan_dispatch,1,1,1,0
|
||||||
|
|
||||||
access_mrp_workorder_group_purchase_director,mrp_workorder,model_mrp_workorder,sf_base.group_purchase_director,1,1,0,0
|
access_mrp_workorder_group_purchase_director,mrp_workorder,model_mrp_workorder,sf_base.group_purchase_director,1,1,0,0
|
||||||
access_mrp_workorder_group_purchase,mrp_workorder,model_mrp_workorder,sf_base.group_purchase,1,1,0,0
|
access_mrp_workorder_group_purchase,mrp_workorder,model_mrp_workorder,sf_base.group_purchase,1,1,0,0
|
||||||
|
|
||||||
|
access_sf_programming_reason,sf_programming_reason,model_sf_programming_reason,base.group_user,1,1,1,0
|
||||||
|
access_sf_programming_record,sf_programming_record,model_sf_programming_record,base.group_user,1,1,1,0
|
||||||
|
@@ -7,6 +7,10 @@
|
|||||||
<field name="model">mrp.production</field>
|
<field name="model">mrp.production</field>
|
||||||
<field name="inherit_id" ref="mrp.mrp_production_tree_view"/>
|
<field name="inherit_id" ref="mrp.mrp_production_tree_view"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
|
<xpath expr="//header//button[last()]" position="after">
|
||||||
|
<button name="action_apply_programming" type="object" string="申请编程" class="oe_highlight"
|
||||||
|
groups="sf_base.group_sf_mrp_user"/>
|
||||||
|
</xpath>
|
||||||
<!-- <xpath expr="//button[@name='do_unreserve']" position="after">-->
|
<!-- <xpath expr="//button[@name='do_unreserve']" position="after">-->
|
||||||
<!-- <button name="do_update_program" type="object" string="更新程序"-->
|
<!-- <button name="do_update_program" type="object" string="更新程序"-->
|
||||||
<!-- groups="sf_base.group_sf_mrp_user"/>-->
|
<!-- groups="sf_base.group_sf_mrp_user"/>-->
|
||||||
@@ -81,6 +85,10 @@
|
|||||||
<field name="model">mrp.production</field>
|
<field name="model">mrp.production</field>
|
||||||
<field name="inherit_id" ref="mrp.mrp_production_form_view"/>
|
<field name="inherit_id" ref="mrp.mrp_production_form_view"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
|
<xpath expr="//header//button[last()]" position="after">
|
||||||
|
<button name="action_apply_programming" type="object" string="申请编程" class="oe_highlight"
|
||||||
|
groups="sf_base.group_sf_mrp_user"/>
|
||||||
|
</xpath>
|
||||||
<xpath expr="//field[@name='state']" position="attributes">
|
<xpath expr="//field[@name='state']" position="attributes">
|
||||||
<!-- <attribute name="statusbar_visible">draft,confirmed,progress,pending_processing,completed,done -->
|
<!-- <attribute name="statusbar_visible">draft,confirmed,progress,pending_processing,completed,done -->
|
||||||
<!-- </attribute> -->
|
<!-- </attribute> -->
|
||||||
@@ -397,6 +405,21 @@
|
|||||||
position="replace">
|
position="replace">
|
||||||
<span class="o_stat_text">子MO</span>
|
<span class="o_stat_text">子MO</span>
|
||||||
</xpath>
|
</xpath>
|
||||||
|
<xpath expr="//sheet//notebook//page[last()]" position="after">
|
||||||
|
<page string="编程记录">
|
||||||
|
<field name="programming_record_ids" widget="one2many" attrs="{'readonly': [('id', '!=', False)]}">
|
||||||
|
<tree>
|
||||||
|
<field name="number"/>
|
||||||
|
<field name="reason"/>
|
||||||
|
<field name="programming_method"/>
|
||||||
|
<field name="current_programming_count"/>
|
||||||
|
<field name="target_production_id"/>
|
||||||
|
<field name="apply_time"/>
|
||||||
|
<field name="send_time"/>
|
||||||
|
</tree>
|
||||||
|
</field>
|
||||||
|
</page>
|
||||||
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|||||||
@@ -4,3 +4,4 @@ from . import production_wizard
|
|||||||
from . import production_technology_wizard
|
from . import production_technology_wizard
|
||||||
from . import production_technology_re_adjust_wizard
|
from . import production_technology_re_adjust_wizard
|
||||||
from . import mrp_workorder_batch_replan_wizard
|
from . import mrp_workorder_batch_replan_wizard
|
||||||
|
from . import sf_programming_reason
|
||||||
|
|||||||
55
sf_manufacturing/wizard/sf_programming_reason.py
Normal file
55
sf_manufacturing/wizard/sf_programming_reason.py
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
from odoo import models, fields, api
|
||||||
|
|
||||||
|
class sf_programming_reason(models.TransientModel):
|
||||||
|
_name = 'sf.programming.reason'
|
||||||
|
_description = '重新编程原因'
|
||||||
|
|
||||||
|
production_id = fields.Many2one('mrp.production')
|
||||||
|
reason = fields.Text('重新编程原因')
|
||||||
|
reprogramming_count = fields.Integer(string='重新编程次数')
|
||||||
|
programming_state = fields.Char(string='编程状态')
|
||||||
|
|
||||||
|
@api.model
|
||||||
|
def default_get(self, fields):
|
||||||
|
res = super(sf_programming_reason, self).default_get(fields)
|
||||||
|
if self._context.get('active_id'):
|
||||||
|
production = self.env['mrp.production'].browse(self._context.get('active_id'))
|
||||||
|
res.update({
|
||||||
|
'reprogramming_count': production._cron_get_programming_state()['reprogramming_num'],
|
||||||
|
'programming_state': production.programming_state, # 假设制造订单模型中有这个字段
|
||||||
|
})
|
||||||
|
return res
|
||||||
|
|
||||||
|
def action_confirm(self):
|
||||||
|
print('self.production_id.programming_state:', self.production_id.programming_state)
|
||||||
|
self.production_id.update_programming_state()
|
||||||
|
self.production_id.write(
|
||||||
|
{'programming_state': '编程中', 'work_state': '编程中'})
|
||||||
|
|
||||||
|
cloud_programming = self.production_id._cron_get_programming_state()
|
||||||
|
|
||||||
|
self.production_id.programming_record_ids.create({
|
||||||
|
'number': len(self.production_id.programming_record_ids) + 1,
|
||||||
|
'production_id': self.production_id.id,
|
||||||
|
'reason': self.reason,
|
||||||
|
'programming_method': cloud_programming['programme_way'],
|
||||||
|
'current_programming_count': cloud_programming['reprogramming_num'],
|
||||||
|
'target_production_id': cloud_programming['production_order_no'],
|
||||||
|
'apply_time': self._context.get('apply_time'),
|
||||||
|
'send_time': cloud_programming['programming_time'],
|
||||||
|
})
|
||||||
|
|
||||||
|
# 返回弹窗提示“已下达编程任务和消息,请等待编程单下发”
|
||||||
|
return {
|
||||||
|
'type': 'ir.actions.act_window',
|
||||||
|
'res_model': 'sf.programming.reason',
|
||||||
|
'view_mode': 'form',
|
||||||
|
'target': 'new',
|
||||||
|
'context': {
|
||||||
|
'default_production_id': self.production_id.id,
|
||||||
|
'active_id': self.production_id.id,
|
||||||
|
},
|
||||||
|
'view_id': self.env.ref('sf_manufacturing.sf_programming_reason_message_view').id,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
44
sf_manufacturing/wizard/sf_programming_reason_views.xml
Normal file
44
sf_manufacturing/wizard/sf_programming_reason_views.xml
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<odoo>
|
||||||
|
<record model="ir.ui.view" id="sf_programming_reason_form_view">
|
||||||
|
<field name="name">sf.programming.reason.form.view</field>
|
||||||
|
<field name="model">sf.programming.reason</field>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<form>
|
||||||
|
<group>
|
||||||
|
<label for="reason" string="重新编程原因:"/>
|
||||||
|
<field name="reason" widget="textarea" nolabel="1"/>
|
||||||
|
<p class="text-muted">注意:该制造订单产品已申请重新编程次数为<field name="reprogramming_count" readonly="1" nolabel="1" class="oe_inline"/>,且当前编程状态为<field name="programming_state" readonly="1" nolabel="1" class="oe_inline"/></p>
|
||||||
|
</group>
|
||||||
|
<field name="production_id" invisible="True"/>
|
||||||
|
<footer>
|
||||||
|
<button name="action_confirm" string="确认" type="object" class="btn-primary"/>
|
||||||
|
<button string="丢弃" special="cancel" class="btn-secondary"/>
|
||||||
|
</footer>
|
||||||
|
</form>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
<!-- 弹窗提示“已下达编程任务和消息,请等待编程单下发” -->
|
||||||
|
<record model="ir.ui.view" id="sf_programming_reason_message_view">
|
||||||
|
<field name="name">sf.programming.reason.message.view</field>
|
||||||
|
<field name="model">sf.programming.reason</field>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<form>
|
||||||
|
<p>已下达编程任务和消息,请等待编程单下发!</p>
|
||||||
|
</form>
|
||||||
|
<footer>
|
||||||
|
<button string="关闭" special="cancel" class="btn-secondary"/>
|
||||||
|
</footer>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
<!-- 重新编程原因弹窗 -->
|
||||||
|
<record id="sf_programming_reason_action" model="ir.actions.act_window">
|
||||||
|
<field name="name">重新编程原因</field>
|
||||||
|
<field name="type">ir.actions.act_window</field>
|
||||||
|
<field name="res_model">sf.programming.reason</field>
|
||||||
|
<field name="view_mode">form</field>
|
||||||
|
<field name="view_id" ref="sf_programming_reason_form_view"/>
|
||||||
|
<field name="target">new</field>
|
||||||
|
</record>
|
||||||
|
</odoo>
|
||||||
|
|
||||||
Reference in New Issue
Block a user