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

1、删除功能刀具tree视图图片字段；2、修改货位看板关联展示字段；3、获取编程单接口调用cnc用刀校验方法添加报错处理；

Browse Source
This commit is contained in:
yuxianghui
2024-10-11 17:53:12 +08:00
parent 25a90f3966
commit 70b3daad73
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_mrs_connect/controllers/controllers.py
View File

@@ -98,7 +98,11 @@ class Sf_Mrs_Connect(http.Controller):
}) })
# 对制造订单所以面的cnc工单的程序用刀进行校验 # 对制造订单所以面的cnc工单的程序用刀进行校验
productions.production_cnc_tool_checkout() try:
productions.production_cnc_tool_checkout()
except Exception as e:
logging.info(f'对cnc工单的程序用刀进行校验报错：{e}')
return json.JSONEncoder().encode(res)
return json.JSONEncoder().encode(res) return json.JSONEncoder().encode(res)
else: else:

1
sf_tool_management/views/functional_tool_views.xml
View File

@@ -10,7 +10,6 @@
<field name="barcode_id" invisible="1"/> <field name="barcode_id" invisible="1"/>
<field name="rfid"/> <field name="rfid"/>
<field name="tool_name_id"/> <field name="tool_name_id"/>
<field name="image" widget='image'/>
<field name="tool_groups_id"/> <field name="tool_groups_id"/>
<field name="functional_tool_diameter"/> <field name="functional_tool_diameter"/>
<field name="knife_tip_r_angle"/> <field name="knife_tip_r_angle"/>

2
sf_warehouse/models/model.py
View File

@@ -338,7 +338,7 @@ class ShelfLocation(models.Model):
_name = 'sf.shelf.location' _name = 'sf.shelf.location'
_inherit = ['printing.utils'] _inherit = ['printing.utils']
_description = '货位' _description = '货位'
_rec_name = 'barcode' # _rec_name = 'barcode'
_order = 'id asc, create_date asc' _order = 'id asc, create_date asc'
# current_location_id = fields.Many2one('sf.shelf.location', string='当前位置') # current_location_id = fields.Many2one('sf.shelf.location', string='当前位置')