diff --git a/sf_dlm_management/models/sf_production_common.py b/sf_dlm_management/models/sf_production_common.py index 0c937175..484295ae 100644 --- a/sf_dlm_management/models/sf_production_common.py +++ b/sf_dlm_management/models/sf_production_common.py @@ -13,10 +13,10 @@ class SfProductionProcessParameter(models.Model): def create(self, vals): # if vals.get('code', '/') == '/' or vals.get('code', '/') is False: # vals['code'] = '101'+self.routing_id.code +self.env['ir.sequence'].next_by_code('sf.production.process.parameter') - if not vals.get('process_id') and vals.get('routing_id'): - vals['gain_way'] = '外协' + if vals.get('routing_id'): + # vals['gain_way'] = '外协' routing_id = self.env['mrp.routing.workcenter'].browse(vals.get('routing_id')) - if routing_id.surface_technics_id: + if routing_id.surface_technics_id and not vals.get('process_id'): vals['process_id'] = routing_id.surface_technics_id.id if vals.get('code', '/') == '/' or vals.get('code', '/') is False: vals['code'] = '101' + routing_id.code + self.env['ir.sequence'].next_by_code( diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index b2b65e29..4202e200 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -1148,10 +1148,12 @@ class sfProductionProcessParameter(models.Model): "process_id": process.id, 'materials_model_ids': self.env['sf.materials.model'].search( [('materials_no', 'in', item['materials_model_ids_codes'])]), - 'processing_mm': item['processing_mm'] + 'processing_mm': item['processing_mm'], + 'gain_way':'外协', }) production_process_parameter.create_service_product() else: + production_process_parameter.gain_way = '外协' production_process_parameter.name = item['name'] production_process_parameter.process_description = item['process_description'] production_process_parameter.processing_day = item['processing_day']