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-11-20 17:56:29 +08:00
parent fe4346b802
commit 11866629c5
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sf_bf_connect/models/process_status.py
View File

@@ -49,15 +49,15 @@ class StatusChange(models.Model):
'process_start_time': process_start_time, 'process_start_time': process_start_time,
}, },
} }
url1 = config['bfm_url_new'] + '/api/get/state/get_order' # url1 = config['bfm_url_new'] + '/api/get/state/get_order'
ret = requests.post(url1, json=json1, data=None) # ret = requests.post(url1, json=json1, data=None)
ret = ret.json() # ret = ret.json()
if not ret.get('error'): # if not ret.get('error'):
logging.info('接口已经执行=============') # logging.info('接口已经执行=============')
else: # else:
traceback_error = traceback.format_exc() # traceback_error = traceback.format_exc()
logging.error("bfm订单状态同步失败:%s" % traceback_error) # logging.error("bfm订单状态同步失败:%s" % traceback_error)
raise UserError('工厂加工同步订单状态到bfm失败') # raise UserError('工厂加工同步订单状态到bfm失败')
except UserError as e: except UserError as e:
traceback_error = traceback.format_exc() traceback_error = traceback.format_exc()
logging.error("工厂加工同步订单状态失败:%s " % traceback_error) logging.error("工厂加工同步订单状态失败:%s " % traceback_error)

2
sf_manufacturing/models/sf_technology_design.py
View File

@@ -18,7 +18,7 @@ class sf_technology_design(models.Model):
def json_technology_design_str(self, k, route, i, process_parameter): def json_technology_design_str(self, k, route, i, process_parameter):
workorders_values_str = [0, '', { workorders_values_str = [0, '', {
'route_id': route.id, 'route_id': route.id if route.routing_type == '表面工艺' else route.route_workcenter_id.id,
'panel': k, 'panel': k,
'process_parameters_id': False if route.routing_type != '表面工艺' else self.env[ 'process_parameters_id': False if route.routing_type != '表面工艺' else self.env[
'sf.production.process.parameter'].search( 'sf.production.process.parameter'].search(

2
sf_manufacturing/models/stock.py
View File

@@ -328,7 +328,7 @@ class StockRule(models.Model):
i += 1 i += 1
technology_design_values.append( technology_design_values.append(
self.env['sf.technology.design'].json_technology_design_str(k, route, i, False)) self.env['sf.technology.design'].json_technology_design_str(k, route, i, False))
elif production.product_id.categ_id.type == '坯料': elif production_item.product_id.categ_id.type == '坯料':
embryo_routing_workcenter = self.env['sf.embryo.model.type.routing.sort'].search( embryo_routing_workcenter = self.env['sf.embryo.model.type.routing.sort'].search(
[('embryo_model_type_id', '=', production_item.product_id.embryo_model_type_id.id)], [('embryo_model_type_id', '=', production_item.product_id.embryo_model_type_id.id)],
order='sequence asc' order='sequence asc'