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

处理提示词制造订单重复问题；处理获取数据按钮显隐问题

Browse Source
This commit is contained in:
mgw
2024-09-20 11:45:23 +08:00
parent bc888d7984
commit 7d877a0cbb
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_machine_connect/controllers/controllers.py
View File

@@ -623,7 +623,7 @@ class Sf_Dashboard_Connect(http.Controller):
# 未完成订单 # 未完成订单
not_done_orders = plan_obj.search( not_done_orders = plan_obj.search(
[('production_line_id.name', '=', line), ('state', 'not in', ['finished']), [('production_line_id.name', '=', line), ('state', 'not in', ['finished']),
('production_id.state', 'not in', ['cancel']), ('active', '=', True) ('production_id.state', 'not in', ['cancel', 'done']), ('active', '=', True)
]) ])
# print(not_done_orders) # print(not_done_orders)
# 完成订单 # 完成订单

5
sf_manufacturing/models/mrp_workorder.py
View File

@@ -1582,8 +1582,11 @@ class SfWorkOrderBarcodes(models.Model):
[('routing_type', '=', '装夹预调'), ('rfid_code', '=', barcode)]) [('routing_type', '=', '装夹预调'), ('rfid_code', '=', barcode)])
if workorder_olds: if workorder_olds:
name = '' name = ''
tem_list = []
for workorder in workorder_olds: for workorder in workorder_olds:
name = '%s %s' % (name, workorder.production_id.name) tem_list.append(workorder.production_id.name)
for i in list(set(tem_list)):
name = '%s %s' % (name, i)
raise UserError('该托盘已绑定【%s】制造订单，请先解除绑定！！！' % name) raise UserError('该托盘已绑定【%s】制造订单，请先解除绑定！！！' % name)
if workorder: if workorder:
if workorder.routing_type == '装夹预调': if workorder.routing_type == '装夹预调':

2
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -520,7 +520,7 @@
<xpath expr="//form//header" position="inside"> <xpath expr="//form//header" position="inside">
<button type="object" class="oe_highlight jikimo_button_confirm" name="get_three_check_datas" <button type="object" class="oe_highlight jikimo_button_confirm" name="get_three_check_datas"
string="获取数据" attrs='{"invisible": [("state","!=","progress")]}'/> string="获取数据" attrs='{"invisible": [("state","!=","progress"), ("routing_type","!=","装夹预调")]}'/>
</xpath> </xpath>