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

Accept Merge Request #1508: (feature/sale_order_route_pick -> develop)

Browse Source 
Merge Request: 增加制造类型

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1508?initial=true
This commit is contained in:
胡尧
2024-11-14 15:15:22 +08:00
committed by Coding
parent 6b184d7df3 a75269b3a3
commit cf7756f51e
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_manufacturing/__manifest__.py
View File

@@ -10,7 +10,7 @@
""", """,
'category': 'sf', 'category': 'sf',
'website': 'https://www.sf.jikimo.com', 'website': 'https://www.sf.jikimo.com',
'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse','jikimo_attachment_viewer'], 'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse','jikimo_attachment_viewer', 'jikimo_sale_multiple_supply_methods'],
'data': [ 'data': [
'data/stock_data.xml', 'data/stock_data.xml',
'data/empty_racks_data.xml', 'data/empty_racks_data.xml',

22
sf_manufacturing/models/mrp_production.py
View File

@@ -1300,18 +1300,18 @@ class MrpProduction(models.Model):
'user_id': production.user_id.id} 'user_id': production.user_id.id}
return production_values_str return production_values_str
# 增加制造订单类型 增加制造订单类型
# production_type = fields.Selection( production_type = fields.Selection(
# [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')], [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')],
# string='制造类型', string='制造类型',
# compute='_compute_production_type', compute='_compute_production_type',
# store=True store=True
# ) )
# @api.depends('product_id.is_manual_processing') @api.depends('product_id.is_manual_processing')
# def _compute_production_type(self): def _compute_production_type(self):
# for production in self: for production in self:
# production.production_type = '自动化产线加工' if not production.product_id.is_manual_processing else '人工线下加工' production.production_type = '自动化产线加工' if not production.product_id.is_manual_processing else '人工线下加工'
class sf_detection_result(models.Model): class sf_detection_result(models.Model):

6
sf_manufacturing/views/mrp_production_addional_change.xml
View File

@@ -36,8 +36,8 @@
decoration-success="reservation_state == 'assigned'"/> decoration-success="reservation_state == 'assigned'"/>
</xpath> </xpath>
<xpath expr="//field[@name='state']" position="before"> <xpath expr="//field[@name='state']" position="before">
<!-- <field name="production_type" widget="badge" decoration-warning="production_type == '人工线下加工'" <field name="production_type" widget="badge" decoration-warning="production_type == '人工线下加工'"
decoration-success="production_type == '自动化产线加工'" optional="show"/> --> decoration-success="production_type == '自动化产线加工'" optional="show"/>
</xpath> </xpath>
<xpath expr="//field[@name='activity_ids']" position="replace"> <xpath expr="//field[@name='activity_ids']" position="replace">
<field name="activity_ids" string="下一个活动" widget="list_activity" optional="hide"/> <field name="activity_ids" string="下一个活动" widget="list_activity" optional="hide"/>
@@ -91,7 +91,7 @@
</xpath> </xpath>
<xpath expr="//sheet//group//group//div[3]" position="after"> <xpath expr="//sheet//group//group//div[3]" position="after">
<!-- <field name="production_type" readonly="1"/> --> <field name="production_type" readonly="1"/>
<field name="manual_quotation" readonly="1"/> <field name="manual_quotation" readonly="1"/>
<field name="programming_no" readonly="1"/> <field name="programming_no" readonly="1"/>
<field name="programming_state" readonly="1" <field name="programming_state" readonly="1"

12
sf_plan/models/custom_plan.py
View File

@@ -417,12 +417,12 @@ class sf_production_plan(models.Model):
raise UserError(e) raise UserError(e)
# 增加制造订单类型 # 增加制造订单类型
# production_type = fields.Selection( production_type = fields.Selection(
# [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')], [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')],
# string='制造类型', string='制造类型',
# related='production_id.production_type', related='production_id.production_type',
# store=True store=True
# ) )
# 机台作业计划 # 机台作业计划

2
sf_plan/views/view.xml
View File

@@ -22,7 +22,7 @@
<field name="production_line_id"/> <field name="production_line_id"/>
<field name="date_planned_start"/> <field name="date_planned_start"/>
<field name="date_planned_finished"/> <field name="date_planned_finished"/>
<!-- <field name="production_type" widget="badge" decoration-warning="production_type == '人工线下加工'" decoration-success="production_type == '自动化产线加工'"/> --> <field name="production_type" widget="badge" decoration-warning="production_type == '人工线下加工'" decoration-success="production_type == '自动化产线加工'"/>
<field name="actual_start_time" optional='hide'/> <field name="actual_start_time" optional='hide'/>
<field name="actual_end_time" optional='hide'/> <field name="actual_end_time" optional='hide'/>
<field name="actual_process_time" optional='hide'/> <field name="actual_process_time" optional='hide'/>