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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版返工

Browse Source 
# Conflicts:
#	sf_manufacturing/models/mrp_production.py
This commit is contained in:
jinling.yang
2024-07-16 17:25:24 +08:00
parent c536dde2cc 801ff9e076
commit 6c820ead44
5 changed files with 71 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sf_mrs_connect/models/sync_common.py
View File

@@ -326,6 +326,8 @@ class sfProductionProcess(models.Model):
production_process.name = item['name']
production_process.category_id = category.id
production_process.remark = item['remark']
production_process.processing_day = item['processing_day']
production_process.travel_day = item['travel_day']
production_process.active = item['active']
else:
self.create({
@@ -333,6 +335,8 @@ class sfProductionProcess(models.Model):
"category_id": category.id,
"code": item['code'],
"remark": item['remark'],
"processing_day": item['processing_day'],
"travel_day": item['travel_day'],
"active": item['active'],
})
else:
@@ -358,12 +362,16 @@ class sfProductionProcess(models.Model):
"category_id": category.id,
"code": item['code'],
"remark": item['remark'],
"processing_day": item['processing_day'],
"travel_day": item['travel_day'],
"active": item['active'],
})
else:
production_process.name = item['name']
production_process.category_id = category.id
production_process.remark = item['remark']
production_process.processing_day = item['processing_day']
production_process.travel_day = item['travel_day']
production_process.active = item['active']
else:
raise ValidationError("表面工艺认证未通过")
@@ -1073,6 +1081,9 @@ class sfProductionProcessParameter(models.Model):
[('code', '=', item['process_id_code'])])
if production_process_parameter:
production_process_parameter.name = item['name']
production_process_parameter.process_description = item['process_description']
production_process_parameter.processing_day = item['processing_day']
production_process_parameter.travel_day = item['travel_day']
production_process_parameter.active = item['active']
production_process_parameter.process_id = process.id
production_process_parameter.materials_model_ids = self.env['sf.materials.model'].search(
@@ -1080,6 +1091,9 @@ class sfProductionProcessParameter(models.Model):
else:
self.create({
"name": item['name'],
"process_description": item['process_description'],
"processing_day": item['processing_day'],
"travel_day": item['travel_day'],
"code": item['code'],
"active": item['active'],
"process_id": process.id,
@@ -1107,6 +1121,9 @@ class sfProductionProcessParameter(models.Model):
if not production_process_parameter:
self.create({
"name": item['name'],
"process_description": item['process_description'],
"processing_day": item['processing_day'],
"travel_day": item['travel_day'],
"code": item['code'],
"active": item['active'],
"process_id": process.id,
@@ -1115,6 +1132,9 @@ class sfProductionProcessParameter(models.Model):
})
else:
production_process_parameter.name = item['name']
production_process_parameter.process_description = item['process_description']
production_process_parameter.processing_day = item['processing_day']
production_process_parameter.travel_day = item['travel_day']
production_process_parameter.process_id = process.id
production_process_parameter.materials_model_ids = self.env['sf.materials.model'].search(
[('materials_no', 'in', item['materials_model_ids_codes'])])