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

1.注释mrp_workcenter.xml文件和res.config添加不要的字段:lost_agent_id

Browse Source 
2.制造订单新增“重新编程次数”字段,新增更新程序方法及对应的接口,优化返工且编程中的制造订单定时获取Cloud编程单状态的方法
3.优化返工向导页面及新增“重复编程次数”和“编程状态”字段
This commit is contained in:
jinling.yang
2024-07-11 17:37:35 +08:00
parent 9aca786522
commit 0fef714d61
6 changed files with 121 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_manufacturing/wizard/rework_wizard.py
View File

@@ -24,6 +24,9 @@ class ReworkWizard(models.TransientModel):
# 根据工单的加工面来显示
processing_panel_id = fields.Many2one('sf.processing.panel', string="加工面")
is_reprogramming = fields.Boolean(string='申请重新编程', default=False)
reprogramming_num = fields.Integer('重新编程次数', default=0)
programming_state = fields.Selection(
[('编程中', '编程中'), ('已编程', '已编程'), ('已编程未下发', '已编程未下发')], string='编程状态')
def confirm(self):
if self.is_reprogramming is True:
@@ -44,7 +47,8 @@ class ReworkWizard(models.TransientModel):
self.production_id, route, False))
if workorders_values:
self.production_id.write(
{'workorder_ids': workorders_values, 'programming_state': '编程中', 'work_state': '编程中'})
{'workorder_ids': workorders_values, 'programming_state': '编程中', 'work_state': '编程中',
'reprogramming_num': self.production_id.reprogramming_num + 1})
self.production_id._reset_work_order_sequence()
self.production_id.update_programming_state()
else:

14
sf_manufacturing/wizard/rework_wizard_views.xml
View File

@@ -11,8 +11,20 @@
<field name="product_id" invisible="True"/>
<group>
<field name="processing_panel_id" options="{'no_create': True}"/>
</group>
<div>
注意*: 该制造订单的产品已重复编程过<field name="reprogramming_num" string=""
readonly="1"
style='color:red;'/>次,且当前编程状态为
<field name="programming_state" string=""
decoration-success="programming_state == '已编程'"
decoration-warning="programming_state =='编程中'"
decoration-danger="programming_state =='已编程未下发'" readonly="1"/>
</div>
<group>
<field name="is_reprogramming"
attrs='{"invisible": [("is_reprogramming","=",False)],"readonly": [("is_reprogramming","=",True)]}'/>
attrs='{"invisible": [("is_reprogramming","=",False)],"readonly": [("programming_state","in",["编程中","已编程未下发时"])]}'/>
<field name="rework_reason"
attrs='{"invisible": [("is_reprogramming","=",True)],"required": [("is_reprogramming","=",False)]}'/>
<field name="detailed_reason"