jikimo/test
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/stock.py
#	sf_mrs_connect/controllers/controllers.py
This commit is contained in:
jinling.yang
2024-08-27 11:34:39 +08:00
parent f5e36f601c 01d9d4a636
commit a3357e01aa
37 changed files with 541 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sf_mrs_connect/models/sync_common.py
View File

@@ -329,6 +329,7 @@ class sfProductionProcess(models.Model):
production_process.processing_day = item['processing_day']
production_process.travel_day = item['travel_day']
production_process.active = item['active']
production_process.sequence = item['sequence']
else:
self.create({
"name": item['name'],
@@ -338,6 +339,7 @@ class sfProductionProcess(models.Model):
"processing_day": item['processing_day'],
"travel_day": item['travel_day'],
"active": item['active'],
"sequence": item['sequence']
})
else:
raise ValidationError("表面工艺认证未通过")
@@ -365,6 +367,7 @@ class sfProductionProcess(models.Model):
"processing_day": item['processing_day'],
"travel_day": item['travel_day'],
"active": item['active'],
"sequence": item['sequence']
})
else:
production_process.name = item['name']
@@ -373,6 +376,7 @@ class sfProductionProcess(models.Model):
production_process.processing_day = item['processing_day']
production_process.travel_day = item['travel_day']
production_process.active = item['active']
production_process.sequence = item['sequence']
else:
raise ValidationError("表面工艺认证未通过")
@@ -1088,6 +1092,7 @@ class sfProductionProcessParameter(models.Model):
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'])])
production_process_parameter.processing_mm = item['processing_mm']
else:
self.create({
"name": item['name'],
@@ -1099,6 +1104,7 @@ 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']
})
else:
raise ValidationError("表面工艺可选参数认证未通过") # 定时同步表面工艺
@@ -1129,6 +1135,7 @@ 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']
})
else:
production_process_parameter.name = item['name']
@@ -1139,6 +1146,7 @@ class sfProductionProcessParameter(models.Model):
production_process_parameter.materials_model_ids = self.env['sf.materials.model'].search(
[('materials_no', 'in', item['materials_model_ids_codes'])])
production_process_parameter.active = item['active']
production_process_parameter.processing_mm = item['processing_mm']
else:
raise ValidationError("表面工艺可选参数认证未通过")

2
sf_mrs_connect/views/res_config_settings_views.xml
View File

@@ -76,7 +76,7 @@
</div>
<div>
<h2>AGV参数配置</h2>
<div class="row mt16 o_settings_container">
<div class="row mt16 o_settings_container" id="agv_config">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">