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

1、去除工单页面的时效状态自动筛选项；2、坯料制造订单添加批量确认加工工艺功能；3、处理返工新生成的工单工序错误问题；4、采购、销售页面优化

Browse Source
This commit is contained in:
yuxianghui
2024-12-11 10:33:10 +08:00
parent 1c4a6ca85e
commit 179ce86bef
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -104,8 +104,7 @@
<!-- <field name="target">fullscreen</field>-->
<field name="target">current</field>
<field name="domain">[('state', '!=', 'cancel'),('schedule_state', '=', '已排')]</field>
<field name="context">{'search_default_product': 1, 'search_default_workcenter_id':
active_id,'search_default_filter_order_warning':1,'search_default_filter_order_overdue':1,'search_default_filter_order_normal':1}
<field name="context">{'search_default_product': 1, 'search_default_workcenter_id': active_id}
</field>
<field name="help" type="html">
<p class="o_view_nocontent_workorder">

2
sf_manufacturing/wizard/production_technology_wizard.py
View File

@@ -14,7 +14,7 @@ class ProductionTechnologyWizard(models.TransientModel):
is_technology_confirm = fields.Boolean(default=False)
def confirm(self):
if self.is_technology_confirm is True and self.production_id.product_id.categ_id.type == '成品':
if self.is_technology_confirm is True and self.production_id.product_id.categ_id.type in ['成品', '坯料']:
domain = [('origin', '=', self.origin), ('state', '=', 'technology_to_confirmed'),
('product_id', '=', self.production_id.product_id.id)]
else:

2
sf_manufacturing/wizard/rework_wizard.py
View File

@@ -119,7 +119,7 @@ class ReworkWizard(models.TransientModel):
and item.panel == work.processing_panel))
if route:
work_list = self.env['mrp.workorder'].json_workorder_str(self.production_id, route[0])
work_list[2].update({'tag_type': '重新加工'})
work_list[2].update({'tag_type': '重新加工', 'sequence': 0})
workorders_values.append(work_list)
# 创建新工单，并进行返工配置的相关操作
if workorders_values:

22
sf_sale/views/sale_order_view.xml
View File

@@ -169,6 +169,9 @@
<field name="manual_quotation" />
<field name="is_incoming_material"/>
</xpath>
<xpath expr="//field[@name='date_order']" position="attributes">
<attribute name="string">下单时间</attribute>
</xpath>
</field>
</record>
@@ -215,8 +218,14 @@
<attribute name="string">订单号</attribute>
</field>
<field name="create_date" position="attributes">
<attribute name="string">下单时间</attribute>
<attribute name="string">下单日期</attribute>
</field>
<xpath expr="//field[@name='activity_ids']" position="attributes">
<attribute name="optional">hide</attribute>
</xpath>
<xpath expr="//field[@name='create_date']" position="after">
<field name="deadline_of_delivery"/>
</xpath>
<!-- <field name="state" position="after">
<field name="check_status" widget="badge"
decoration-success="check_status == 'approved'"
@@ -258,6 +267,15 @@
<field name="amount_total" position="after">
<field name="delivery_warning" invisible="1"/>
</field>
<xpath expr="//field[@name='date_order']" position="after">
<field name="deadline_of_delivery"/>
</xpath>
<xpath expr="//field[@name='activity_ids']" position="attributes">
<attribute name="optional">hide</attribute>
</xpath>
<xpath expr="//field[@name='invoice_status']" position="after">
<field name="state"/>
</xpath>
</field>
</record>
@@ -293,7 +311,7 @@
<record id="sale.action_orders" model="ir.actions.act_window">
<field name="search_view_id" ref="sale_order_view_search_inherit_sale_message"/>
<field name="context">{ 'search_default_filter_order_warning':1,'search_default_filter_order_overdue':1}
<field name="context">{}
</field>
</record>
</data>