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

修复报废

Browse Source
This commit is contained in:
jinling.yang
2024-08-26 17:31:14 +08:00
parent f1780181fa
commit e662490cb5
7 changed files with 137 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sf_manufacturing/wizard/production_wizard.py
View File

@@ -16,7 +16,7 @@ class ProductionWizard(models.TransientModel):
reprogramming_num = fields.Integer('重新编程次数', default=0)
is_reprogramming = fields.Boolean(string='申请重新编程', default=False)
is_remanufacture = fields.Boolean(string='重新生成制造订单', default=True)
programming_state = fields.Selection(
programming_states = fields.Selection(
[('待编程', '待编程'), ('编程中', '编程中'), ('已编程', '已编程'), ('已编程未下发', '已编程未下发'),
('已下发', '已下发')],
string='编程状态')
@@ -27,6 +27,8 @@ class ProductionWizard(models.TransientModel):
self.is_reprogramming = False
def confirm(self):
if self.programming_state != '已下发':
self.programming_state = '编程中'
self.production_id.action_cancel()
self.production_id.detection_result_ids.write({'handle_result': '已处理'})
self.production_id.write({'state': 'cancel', 'scrap_ids': [(0, 0, {
@@ -79,6 +81,7 @@ class ProductionWizard(models.TransientModel):
ret['programming_list'].append(vals)
new_production = self.production_id.recreateManufacturing(ret)
self.production_id.write({'remanufacture_production_id': new_production.id})
if self.is_reprogramming is False:
for panel in new_production.product_id.model_processing_panel.split(','):
scrap_cnc_workorder = max(

14
sf_manufacturing/wizard/production_wizard_views.xml
View File

@@ -7,7 +7,7 @@
<form>
<sheet>
<field name="production_id" invisible="1"/>
<field name="programming_state" invisible="1"/>
<field name="programming_states" invisible="1"/>
<div>
重新生成制造订单
<field name="is_remanufacture" force_save="1"/>
@@ -17,16 +17,16 @@
name="reprogramming_num" string=""
readonly="1"
style='color:red;'/>,且当前编程状态为
<field name="programming_state" string=""
decoration-info="programming_state == '待编程'"
decoration-success="programming_state == '已下发'"
decoration-warning="programming_state =='编程中'"
decoration-danger="programming_state =='已编程'" readonly="1"/>
<field name="programming_states" string=""
decoration-info="programming_states == '待编程'"
decoration-success="programming_states == '已下发'"
decoration-warning="programming_states =='编程中'"
decoration-danger="programming_states =='已编程'" readonly="1"/>
</div>
<div attrs='{"invisible": [("is_remanufacture","=",False)]}'>
<span style='font-weight:bold;'>申请重新编程
<field name="is_reprogramming" force_save="1"
attrs='{"readonly": [("programming_state","not in",["已下发"])]}'/>
attrs='{"readonly": [("programming_states","not in",["已下发"])]}'/>
</span>
</div>
<footer>