jikimo/test
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-08 17:24:41 +08:00
parent 45b9177da4
commit 4399700c3d
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sf_manufacturing/views/mrp_production_addional_change.xml
View File

@@ -7,10 +7,10 @@
<field name="model">mrp.production</field> <field name="model">mrp.production</field>
<field name="inherit_id" ref="mrp.mrp_production_tree_view"/> <field name="inherit_id" ref="mrp.mrp_production_tree_view"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<!-- <xpath expr="//button[@name='do_unreserve']" position="after">--> <!-- <xpath expr="//button[@name='do_unreserve']" position="after">-->
<!-- <button name="do_update_program" type="object" string="更新程序"--> <!-- <button name="do_update_program" type="object" string="更新程序"-->
<!-- groups="sf_base.group_sf_mrp_user"/>--> <!-- groups="sf_base.group_sf_mrp_user"/>-->
<!-- </xpath>--> <!-- </xpath>-->
<xpath expr="//field[@name='product_id']" position="replace"/> <xpath expr="//field[@name='product_id']" position="replace"/>
<xpath expr="//field[@name='product_qty']" position="replace"/> <xpath expr="//field[@name='product_qty']" position="replace"/>
<xpath expr="//field[@name='product_uom_id']" position="replace"/> <xpath expr="//field[@name='product_uom_id']" position="replace"/>
@@ -70,7 +70,7 @@
<!-- <attribute name="statusbar_visible">draft,confirmed,progress,pending_processing,completed,done --> <!-- <attribute name="statusbar_visible">draft,confirmed,progress,pending_processing,completed,done -->
<!-- </attribute> --> <!-- </attribute> -->
<attribute name="statusbar_visible"> <attribute name="statusbar_visible">
confirmed,pending_cam,progress,done confirmed,pending_cam,progress,rework,scrapdone
</attribute> </attribute>
</xpath> </xpath>
<xpath expr="//sheet//group//group[2]//label" position="before"> <xpath expr="//sheet//group//group[2]//label" position="before">
@@ -121,17 +121,17 @@
string="验证" type="object" data-hotkey="g" string="验证" type="object" data-hotkey="g"
groups="sf_base.group_sf_mrp_user"/> groups="sf_base.group_sf_mrp_user"/>
</xpath> </xpath>
<!-- <xpath expr="(//header//button[@name='button_scrap'])" position="replace">--> <xpath expr="(//header//button[@name='button_scrap'])" position="replace">
<!-- <button name="button_scrap" invisible="1"/>--> <button name="button_scrap" invisible="1"/>
<!-- <button name="do_update_program" string="更新程序" type="object" groups="sf_base.group_sf_mrp_user"--> <button name="do_update_program" string="更新程序" type="object" groups="sf_base.group_sf_mrp_user"
<!-- confirm="是否确认更新程序"--> confirm="是否确认更新程序"
<!-- attrs="{'invisible': ['|',('state', '!=', 'rework'),('programming_state', '!=', '已编程未下发')]}"/>--> attrs="{'invisible': ['|',('state', '!=', 'rework'),('programming_state', '!=', '已编程未下发')]}"/>
<!-- <button name="button_rework" string="返工" type="object" groups="sf_base.group_sf_mrp_user"--> <button name="button_rework" string="返工" type="object" groups="sf_base.group_sf_mrp_user"
<!-- attrs="{'invisible': ['|',('state', '!=', 'rework') ,('programming_state', '!=', '已编程')]}"/>--> attrs="{'invisible': ['|',('state', '!=', 'rework') ,('programming_state', '!=', '已编程')]}"/>
<!-- <button name="%(sf_manufacturing.action_sf_production_wizard)d" string="报废" type="action"--> <button name="%(sf_manufacturing.action_sf_production_wizard)d" string="报废" type="action"
<!-- groups="sf_base.group_sf_mrp_user"--> groups="sf_base.group_sf_mrp_user"
<!-- attrs="{'invisible': [('is_scrap', '=', False)]}"/>--> attrs="{'invisible': [('is_scrap', '=', False)]}"/>
<!-- </xpath>--> </xpath>
<xpath expr="(//header//button[@name='button_mark_done'])[3]" position="replace"> <xpath expr="(//header//button[@name='button_mark_done'])[3]" position="replace">
<button name="button_mark_done" attrs="{'invisible': [ <button name="button_mark_done" attrs="{'invisible': [
'|', '|',
@@ -460,6 +460,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//filter[@name='filter_in_progress']" position="before"> <xpath expr="//filter[@name='filter_in_progress']" position="before">
<filter string="返工" name="filter_rework" domain="[('state', '=', 'rework')]"/> <filter string="返工" name="filter_rework" domain="[('state', '=', 'rework')]"/>
<filter string="报废" name="filter_scrap" domain="[('state', '=', 'scrap')]"/>
</xpath> </xpath>
<xpath expr="//filter[@name='planning_issues']" position="before"> <xpath expr="//filter[@name='planning_issues']" position="before">
<separator/> <separator/>

9
sf_manufacturing/wizard/production_wizard.py
View File

@@ -18,4 +18,11 @@ class ProductionWizard(models.TransientModel):
if self.is_reprogramming is True: if self.is_reprogramming is True:
self.production_id.update_programming_state() self.production_id.update_programming_state()
self.production_id.action_cancel() self.production_id.action_cancel()
self.production_id.detection_result_ids.write({'handle_result': '已处理'})
self.production_id.write({'scrap_ids': [(0, 0, {
'product_id': self.production_id.product_id.id,
'scrap_qty': 1,
'lot_id': self.production_id.move_line_raw_ids.lot_id.id,
'location_id': self.production_id.move_raw_ids.filtered(lambda x: x.state not in (
'done', 'cancel')) and self.production_id.location_src_id.id or self.production_id.location_dest_id.id,
'scrap_location_id': self.env['stock.scrap']._get_default_scrap_location_id(), 'state': 'done'})]})