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
2023-11-20 15:10:01 +08:00
parent 7ceaadb9c4
commit 04e63dcc59
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_bf_connect/controllers/controllers.py
View File

@@ -59,7 +59,7 @@ class Sf_Bf_Connect(http.Controller):
self_machining_bom_line = self_machining_bom.with_user( self_machining_bom_line = self_machining_bom.with_user(
request.env.ref("base.user_admin")).bom_create_line( request.env.ref("base.user_admin")).bom_create_line(
self_machining_embryo) self_machining_embryo)
if self_machining_bom_line == False: if self_machining_bom_line is False:
res['status'] = 2 res['status'] = 2
res['message'] = '该订单模型的材料型号在您分配的工厂里暂未有原材料,请先配置再进行分配' res['message'] = '该订单模型的材料型号在您分配的工厂里暂未有原材料,请先配置再进行分配'
request.cr.rollback() request.cr.rollback()
@@ -84,7 +84,7 @@ class Sf_Bf_Connect(http.Controller):
# 创建坯料的bom的组件 # 创建坯料的bom的组件
outsource_bom_line = outsource_bom.with_user( outsource_bom_line = outsource_bom.with_user(
request.env.ref("base.user_admin")).bom_create_line(outsource_embryo) request.env.ref("base.user_admin")).bom_create_line(outsource_embryo)
if outsource_bom_line == False: if outsource_bom_line is False:
res['status'] = 2 res['status'] = 2
res['message'] = '该订单模型的材料型号在您分配的工厂里暂未有原材料,请先配置再进行分配' res['message'] = '该订单模型的材料型号在您分配的工厂里暂未有原材料,请先配置再进行分配'
request.cr.rollback() request.cr.rollback()

2
sf_manufacturing/models/mrp_production.py
View File

@@ -120,7 +120,7 @@ class MrpProduction(models.Model):
if i == 1 and route.routing_type == '获取CNC加工程序': if i == 1 and route.routing_type == '获取CNC加工程序':
workorders_values.append( workorders_values.append(
self.env['mrp.workorder'].json_workorder_str('', production, route)) self.env['mrp.workorder'].json_workorder_str('', production, route))
if route.is_repeat == True: if route.is_repeat is True:
workorders_values.append( workorders_values.append(
self.env['mrp.workorder'].json_workorder_str(k, production, route)) self.env['mrp.workorder'].json_workorder_str(k, production, route))
if i == processing_panel_len and route.routing_type == '解除装夹': if i == processing_panel_len and route.routing_type == '解除装夹':

4
sf_sale/models/quick_easy_order.py
View File

@@ -212,7 +212,7 @@ class QuickEasyOrder(models.Model):
self_machining_bom = self.env['mrp.bom'].bom_create(self_machining_embryo, 'normal', False) self_machining_bom = self.env['mrp.bom'].bom_create(self_machining_embryo, 'normal', False)
# 创建坯料里bom的组件 # 创建坯料里bom的组件
self_machining_bom_line = self_machining_bom.bom_create_line(self_machining_embryo) self_machining_bom_line = self_machining_bom.bom_create_line(self_machining_embryo)
if self_machining_bom_line == False: if self_machining_bom_line is False:
self.cr.rollback() self.cr.rollback()
return UserError('该订单模型的材料型号在您分配的工厂里暂未有原材料,请先配置再进行分配') return UserError('该订单模型的材料型号在您分配的工厂里暂未有原材料,请先配置再进行分配')
# 产品配置bom # 产品配置bom
@@ -228,7 +228,7 @@ class QuickEasyOrder(models.Model):
# 创建坯料的bom的组件 # 创建坯料的bom的组件
outsource_bom_line = outsource_bom.with_user( outsource_bom_line = outsource_bom.with_user(
self.env.ref("base.user_admin")).bom_create_line(outsource_embryo) self.env.ref("base.user_admin")).bom_create_line(outsource_embryo)
if outsource_bom_line == False: if outsource_bom_line is False:
self.cr.rollback() self.cr.rollback()
return UserError('该订单模型的材料型号在您分配的工厂里暂未有原材料,请先配置再进行分配') return UserError('该订单模型的材料型号在您分配的工厂里暂未有原材料,请先配置再进行分配')
# 产品配置bom # 产品配置bom