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

Merge branch 'feature/优化调拨单' into feature/优化工单_6

Browse Source
This commit is contained in:
yuxianghui
2024-07-31 11:02:24 +08:00
parent 11e3bbddd8 bba4e55770
commit 2c15532c73
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_tool_management/wizard/wizard.py
View File

@@ -603,6 +603,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
功能刀具组装 功能刀具组装
:return: :return:
""" """
logging.info('功能刀具开始组装！')
# 获取组装单对象 # 获取组装单对象
functional_tool_assembly = self.env['sf.functional.tool.assembly'].search([ functional_tool_assembly = self.env['sf.functional.tool.assembly'].search([
('assembly_order_code', '=', self.assembly_order_code), ('assembly_order_code', '=', self.assembly_order_code),
@@ -649,6 +650,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
]) ])
cam_plan.write({'plan_execute_status': '2'}) cam_plan.write({'plan_execute_status': '2'})
logging.info('功能刀具组装完成！')
# 关闭弹出窗口 # 关闭弹出窗口
return {'type': 'ir.actions.act_window_close'} return {'type': 'ir.actions.act_window_close'}
@@ -865,6 +868,7 @@ class StockPicking(models.Model):
# 设置数量，并验证完成 # 设置数量，并验证完成
picking_id.action_set_quantities_to_reservation() picking_id.action_set_quantities_to_reservation()
picking_id.button_validate() picking_id.button_validate()
logging.info(f'刀具物料调拨单状态：{picking_id.state}')
def _get_name_stock1(self, picking_type_id): def _get_name_stock1(self, picking_type_id):
name = f'{picking_type_id.sequence_id.prefix}DJ/{date.today().strftime("%y")}' name = f'{picking_type_id.sequence_id.prefix}DJ/{date.today().strftime("%y")}'

3
sf_warehouse/views/view.xml
View File

@@ -2,6 +2,9 @@
<odoo> <odoo>
<data> <data>
<record model="ir.actions.act_window" id="stock.stock_picking_type_action">
<field name="context">{'search_default_groupby_code':1}</field>
</record>
<record id="view_location_form_sf_inherit" model="ir.ui.view"> <record id="view_location_form_sf_inherit" model="ir.ui.view">
<field name="name">stock.location.form.sf.inherit</field> <field name="name">stock.location.form.sf.inherit</field>