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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

Browse Source
This commit is contained in:
jinling.yang
2024-11-26 16:47:22 +08:00
parent d91c7b22d7 afa5ad36f2
commit 40ddfdd48f
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_manufacturing/models/mrp_workorder.py
View File

@@ -141,8 +141,8 @@ class ResMrpWorkOrder(models.Model):
# 是否绑定托盘 # 是否绑定托盘
is_trayed = fields.Boolean(string='是否绑定托盘', default=False) is_trayed = fields.Boolean(string='是否绑定托盘', default=False)
tag_type = fields.Selection([("重新加工", "重新加工")], string="标签", tracking=True)
tag_type = fields.Selection([("重新加工", "重新加工")], string="标签", tracking=True)
technology_design_id = fields.Many2one('sf.technology.design') technology_design_id = fields.Many2one('sf.technology.design')
def _compute_default_construction_period_status(self): def _compute_default_construction_period_status(self):
@@ -305,6 +305,7 @@ class ResMrpWorkOrder(models.Model):
domain = [('origin', '=', self.production_id.origin)] domain = [('origin', '=', self.production_id.origin)]
production_programming = self.env['mrp.production'].search(domain, order='name asc') production_programming = self.env['mrp.production'].search(domain, order='name asc')
production_list = [production.name for production in production_programming] production_list = [production.name for production in production_programming]
production_no_remanufacture = production_programming.filtered(lambda a: a.is_remanufacture is False)
# technology_design = self.env['sf.technology.design'].search( # technology_design = self.env['sf.technology.design'].search(
# [('process_parameters_id', '=', self.surface_technics_parameters_id.id), # [('process_parameters_id', '=', self.surface_technics_parameters_id.id),
# ('production_id', '=', self.production_id.id)]) # ('production_id', '=', self.production_id.id)])
@@ -318,7 +319,6 @@ class ResMrpWorkOrder(models.Model):
if line.product_id.server_product_process_parameters_id == self.surface_technics_parameters_id: if line.product_id.server_product_process_parameters_id == self.surface_technics_parameters_id:
if line.product_qty == len(production_no_remanufacture): if line.product_qty == len(production_no_remanufacture):
purchase_orders_id = line.order_id.id purchase_orders_id = line.order_id.id
order.surface_technics_purchase_count = purchase_num
result = { result = {
"type": "ir.actions.act_window", "type": "ir.actions.act_window",
"res_model": "purchase.order", "res_model": "purchase.order",

2
sf_manufacturing/wizard/production_technology_wizard.py
View File

@@ -47,7 +47,7 @@ class ProductionTechnologyWizard(models.TransientModel):
domain += [('process_parameters_id', '=', ro.process_parameters_id.id)] domain += [('process_parameters_id', '=', ro.process_parameters_id.id)]
elif ro.route_id.routing_tag == 'special' and ro.is_auto is False: elif ro.route_id.routing_tag == 'special' and ro.is_auto is False:
# display_name = ro.route_id.display_name # display_name = ro.route_id.display_name
domain += [('id', '=', ro.route_id.id)] domain += [('id', '=', ro.id)]
elif ro.panel is not False: elif ro.panel is not False:
domain += [('panel', '=', ro.panel)] domain += [('panel', '=', ro.panel)]
td_upd = self.env['sf.technology.design'].sudo().search(domain) td_upd = self.env['sf.technology.design'].sudo().search(domain)

3
sf_manufacturing/wizard/rework_wizard.py
View File

@@ -15,8 +15,7 @@ class ReworkWizard(models.TransientModel):
production_id = fields.Many2one('mrp.production', string='制造订单号') production_id = fields.Many2one('mrp.production', string='制造订单号')
workorder_ids = fields.Many2many('mrp.workorder', 'rework_wizard_to_work_order', string='所有工单', workorder_ids = fields.Many2many('mrp.workorder', 'rework_wizard_to_work_order', string='所有工单',
domain="[('production_id', '=', production_id),('state','=','done')]") domain="[('production_id', '=', production_id),('state','=','done')]")
hidden_workorder_ids = fields.Many2many('mrp.workorder', 'rework_wizard_to_work_order_hidden', hidden_workorder_ids = fields.Char('')
string='所有工单(hidden)')
rework_reason = fields.Selection( rework_reason = fields.Selection(
[("programming", "编程"), ("cutter", "刀具"), ("clamping", "装夹"), [("programming", "编程"), ("cutter", "刀具"), ("clamping", "装夹"),
("operate computer", "操机"), ("operate computer", "操机"),

4
sf_manufacturing/wizard/rework_wizard_views.xml
View File

@@ -12,9 +12,9 @@
<field name="tool_state" invisible="True"/> <field name="tool_state" invisible="True"/>
<field name="routing_type" invisible="True"/> <field name="routing_type" invisible="True"/>
<field name="processing_panel_id" invisible="1"/> <field name="processing_panel_id" invisible="1"/>
<field name="hidden_workorder_ids" invisible="1"/> <field name="hidden_workorder_ids" class="css_not_available_msg"/>
<group> <group>
<field name="workorder_ids" string="工序" attrs='{"invisible": [("routing_type","=","装夹预调")]}'> <field readonly="1" name="workorder_ids" widget="jikimo_subtree_selector_field" jikimo_selector="True" replace_context="hidden_workorder_ids" string="工序" attrs='{"invisible": [("routing_type","=","装夹预调")]}'>
<tree create="0" editable='bottom' delete="0"> <tree create="0" editable='bottom' delete="0">
<field name="processing_panel" readonly="1"/> <field name="processing_panel" readonly="1"/>
<field name="name" readonly="1"/> <field name="name" readonly="1"/>