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

1.修复同步刀具标准库相关接口2.修复产品存档权限问题

Browse Source
This commit is contained in:
jinling.yang
2024-02-05 10:57:57 +08:00
parent f1335e8252
commit f05d0461c3
2 changed files with 603 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_manufacturing/security/ir.model.access.csv
View File

@@ -40,6 +40,10 @@ access_mrp_workcenter_manager,mrp.workcenter.manager,mrp.model_mrp_workcenter,sf
access_mrp_routing_workcenter_manager,mrp.routing.workcenter.manager,mrp.model_mrp_routing_workcenter,sf_base.group_sf_mrp_user,1,1,1,0
access_mrp_bom_manager,mrp.bom.manager,mrp.model_mrp_bom,sf_base.group_sf_mrp_user,1,1,1,0
access_mrp_bom_line_manager,mrp.bom.line.manager,mrp.model_mrp_bom_line,sf_base.group_sf_mrp_user,1,1,1,0
access_mrp_bom_line_group_plan_director,mrp_bom_line_group_plan_director,mrp.model_mrp_bom_line,sf_base.group_plan_director,1,1,1,0
access_mrp_bom_line_group_sale_director,mrp_bom_line_group_sale_director,mrp.model_mrp_bom_line,sf_base.group_sale_director,1,1,1,0
access_mrp_bom_line_group_purchase_director,mrp_bom_line_group_purchase_director,mrp.model_mrp_bom_line,sf_base.group_purchase_director,1,1,1,0
access_mrp_bom_byproduct_manager,mrp.bom.byproduct manager,mrp.model_mrp_bom_byproduct,sf_base.group_sf_mrp_user,1,1,1,0
access_mrp_production_stock_worker,mrp.production stock_worker,mrp.model_mrp_production,stock.group_stock_user,1,0,0,0
access_product_product_user,product.product user,product.model_product_product,sf_base.group_sf_mrp_user,1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
40 access_mrp_routing_workcenter_manager mrp.routing.workcenter.manager mrp.model_mrp_routing_workcenter sf_base.group_sf_mrp_user 1 1 1 0
41 access_mrp_bom_manager mrp.bom.manager mrp.model_mrp_bom sf_base.group_sf_mrp_user 1 1 1 0
42 access_mrp_bom_line_manager mrp.bom.line.manager mrp.model_mrp_bom_line sf_base.group_sf_mrp_user 1 1 1 0
43 access_mrp_bom_line_group_plan_director mrp_bom_line_group_plan_director mrp.model_mrp_bom_line sf_base.group_plan_director 1 1 1 0
44 access_mrp_bom_line_group_sale_director mrp_bom_line_group_sale_director mrp.model_mrp_bom_line sf_base.group_sale_director 1 1 1 0
45 access_mrp_bom_line_group_purchase_director mrp_bom_line_group_purchase_director mrp.model_mrp_bom_line sf_base.group_purchase_director 1 1 1 0
46 access_mrp_bom_byproduct_manager mrp.bom.byproduct manager mrp.model_mrp_bom_byproduct sf_base.group_sf_mrp_user 1 1 1 0
47 access_mrp_bom_byproduct_manager access_mrp_production_stock_worker mrp.bom.byproduct manager mrp.production stock_worker mrp.model_mrp_bom_byproduct mrp.model_mrp_production sf_base.group_sf_mrp_user stock.group_stock_user 1 1 0 1 0 0
48 access_mrp_production_stock_worker access_product_product_user mrp.production stock_worker product.product user mrp.model_mrp_production product.model_product_product stock.group_stock_user sf_base.group_sf_mrp_user 1 0 0 0
49 access_product_product_user access_product_template_user product.product user product.template user product.model_product_product product.model_product_template sf_base.group_sf_mrp_user 1 0 0 0

45
sf_mrs_connect/models/sync_common.py
View File

@@ -382,7 +382,8 @@ class sfProcessingTechnology(models.Model):
if result['status'] == 1:
for item in result['processing_technology_yesterday_list']:
if item:
processing_technology = self.search([("code", '=', item['process_encode']), ('active', 'in', [True, False])])
processing_technology = self.search(
[("code", '=', item['process_encode']), ('active', 'in', [True, False])])
if processing_technology:
processing_technology.name = item['name']
processing_technology.remark = item['remark']
@@ -408,7 +409,8 @@ class sfProcessingTechnology(models.Model):
if result['status'] == 1:
for item in result['processing_technology_all_list']:
if item:
processing_technology = self.search([("code", '=', item['process_encode']), ('active', 'in', [True, False])])
processing_technology = self.search(
[("code", '=', item['process_encode']), ('active', 'in', [True, False])])
if not processing_technology:
self.create({
"name": item['name'],
@@ -2092,7 +2094,7 @@ class CuttingWidthDepth(models.Model):
result = json.loads(r['result'])
if result['status'] == 1:
for item in result['cutting_width_depth_yesterday_list']:
cutting_width_depth = self.search([("name", '=', item['name']), ('active', 'in', [True, False])])
cutting_width_depth = self.search([("name", '=', item['name'])])
if not cutting_width_depth:
self.create({
'name': item['name'],
@@ -2109,7 +2111,7 @@ class CuttingWidthDepth(models.Model):
result = json.loads(r['result'])
if result['status'] == 1:
for item in result['cutting_width_depth_all_list']:
cutting_width_depth = self.search([("name", '=', item['name']), ('active', 'in', [True, False])])
cutting_width_depth = self.search([("name", '=', item['name'])])
if not cutting_width_depth:
self.create({
'name': item['name'],
@@ -2216,8 +2218,8 @@ class Cutting_tool_standard_library(models.Model):
if result['status'] == 1:
for item in result['cutting_tool_standard_library_yesterday_list']:
cutting_tool_standard_library = self.search(
[("code", '=', item['code'].replace("JKM", result['factory_short_name']),
('active', 'in', [True, False]))])
[("code", '=', item['code'].replace("JKM", result['factory_short_name'])),
('active', 'in', [True, False])])
cutting_tool_type = self.env['sf.cutting.tool.type'].search(
[("code", '=', item['cutting_tool_type_code'])])
cutting_tool_material = self.env['sf.cutting.tool.material'].search(
@@ -2323,8 +2325,8 @@ class Cutting_tool_standard_library(models.Model):
if result['status'] == 1:
for item in result['cutting_tool_standard_library_all_list']:
cutting_tool_standard_library = self.search(
[("code", '=', item['code'].replace("JKM", result['factory_short_name']),
('active', 'in', [True, False]))])
[("code", '=', item['code'].replace("JKM", result['factory_short_name'])),
("active", 'in', [True, False])])
cutting_tool_type = self.env['sf.cutting.tool.type'].search(
[("code", '=', item['cutting_tool_type_code'])])
cutting_tool_material = self.env['sf.cutting.tool.material'].search(
@@ -2434,6 +2436,7 @@ class CuttingToolBasicParameters(models.Model):
r = r.json()
result = json.loads(r['result'])
if result['status'] == 1:
if 'basic_parameters_integral_tool' in result['cutting_tool_basic_parameters_all_list']:
basic_parameters_integral_tool_list = json.loads(
result['cutting_tool_basic_parameters_all_list']['basic_parameters_integral_tool'])
if basic_parameters_integral_tool_list:
@@ -2487,6 +2490,7 @@ class CuttingToolBasicParameters(models.Model):
'cutting_depth': integral_tool_item['cutting_depth_max'],
'active': integral_tool_item['active'],
})
if 'basic_parameters_blade' in result['cutting_tool_basic_parameters_all_list']:
basic_parameters_blade_list = json.loads(
result['cutting_tool_basic_parameters_all_list']['basic_parameters_blade'])
if basic_parameters_blade_list:
@@ -2551,6 +2555,7 @@ class CuttingToolBasicParameters(models.Model):
'thickness_tolerance': blade_item['thickness_tolerance'],
'active': blade_item['active'],
})
if 'basic_parameters_chuck' in result['cutting_tool_basic_parameters_all_list']:
basic_parameters_chuck_list = json.loads(
result['cutting_tool_basic_parameters_all_list']['basic_parameters_chuck'])
if basic_parameters_chuck_list:
@@ -2595,6 +2600,7 @@ class CuttingToolBasicParameters(models.Model):
'cooling_jacket': chuck_item['cooling_sleeve_model'],
'active': chuck_item['active'],
})
if 'basic_parameters_cutter_arbor' in result['cutting_tool_basic_parameters_all_list']:
basic_parameters_cutter_arbor_list = json.loads(
result['cutting_tool_basic_parameters_all_list']['basic_parameters_cutter_arbor'])
if basic_parameters_cutter_arbor_list:
@@ -2664,6 +2670,7 @@ class CuttingToolBasicParameters(models.Model):
'spanner': cutter_arbor_item['fit_wrench_model'],
'active': cutter_arbor_item['active'],
})
if 'basic_parameters_cutter_head' in result['cutting_tool_basic_parameters_all_list']:
basic_parameters_cutter_head_list = json.loads(
result['cutting_tool_basic_parameters_all_list']['basic_parameters_cutter_head'])
if basic_parameters_cutter_head_list:
@@ -2719,6 +2726,7 @@ class CuttingToolBasicParameters(models.Model):
'locating_slot_code': cutter_head_item['locator_slot_code'],
'active': cutter_head_item['active'],
})
if 'basic_parameters_knife_handle' in result['cutting_tool_basic_parameters_all_list']:
basic_parameters_knife_handle_list = json.loads(
result['cutting_tool_basic_parameters_all_list']['basic_parameters_knife_handle'])
if basic_parameters_knife_handle_list:
@@ -2787,8 +2795,9 @@ class CuttingToolBasicParameters(models.Model):
r = r.json()
result = json.loads(r['result'])
if result['status'] == 1:
if 'basic_parameters_integral_tool' in result['cutting_tool_basic_parameters_yesterday_list']:
basic_parameters_integral_tool_list = json.loads(
result['cutting_tool_basic_parameters_all_list']['basic_parameters_integral_tool'])
result['cutting_tool_basic_parameters_yesterday_list']['basic_parameters_integral_tool'])
if basic_parameters_integral_tool_list:
for integral_tool_item in basic_parameters_integral_tool_list:
integral_tool = self.search(
@@ -2843,8 +2852,9 @@ class CuttingToolBasicParameters(models.Model):
'cutting_depth': integral_tool_item['cutting_depth_max'],
'active': integral_tool_item['active'],
})
if 'basic_parameters_blade' in result['cutting_tool_basic_parameters_yesterday_list']:
basic_parameters_blade_list = json.loads(
result['cutting_tool_basic_parameters_all_list']['basic_parameters_blade'])
result['cutting_tool_basic_parameters_yesterday_list']['basic_parameters_blade'])
if basic_parameters_blade_list:
for blade_item in basic_parameters_blade_list:
blade = self.search([('code', '=', blade_item['code']), ('active', 'in', [True, False])])
@@ -2903,14 +2913,16 @@ class CuttingToolBasicParameters(models.Model):
'blade_width': blade_item['blade_width'],
'main_included_angle': blade_item['edge_angle'],
'top_angle': blade_item['top_angle'],
'thread_model': '无' if not blade_item['thread_type'] else blade_item['thread_type'],
'thread_model': '无' if not blade_item['thread_type'] else blade_item[
'thread_type'],
'thread_num': blade_item['threads_per_inch'],
'blade_tip_height_tolerance': blade_item['tip_height_tolerance'],
'inscribed_circle_tolerance': blade_item['internal_circle_tolerance'],
'thickness_tolerance': blade_item['thickness_tolerance'],
})
if 'basic_parameters_chuck' in result['cutting_tool_basic_parameters_yesterday_list']:
basic_parameters_chuck_list = json.loads(
result['cutting_tool_basic_parameters_all_list']['basic_parameters_chuck'])
result['cutting_tool_basic_parameters_yesterday_list']['basic_parameters_chuck'])
if basic_parameters_chuck_list:
for chuck_item in basic_parameters_chuck_list:
chuck = self.search([('code', '=', chuck_item['code']), ('active', 'in', [True, False])])
@@ -2955,8 +2967,9 @@ class CuttingToolBasicParameters(models.Model):
'max_load_capacity': chuck_item['load_capacity_max'],
'cooling_jacket': chuck_item['cooling_sleeve_model'],
})
if 'basic_parameters_cutter_arbor' in result['cutting_tool_basic_parameters_yesterday_list']:
basic_parameters_cutter_arbor_list = json.loads(
result['cutting_tool_basic_parameters_all_list']['basic_parameters_cutter_arbor'])
result['cutting_tool_basic_parameters_yesterday_list']['basic_parameters_cutter_arbor'])
if basic_parameters_cutter_arbor_list:
for cutter_arbor_item in basic_parameters_cutter_arbor_list:
cutter_arbor = self.search(
@@ -3026,8 +3039,9 @@ class CuttingToolBasicParameters(models.Model):
'screw': cutter_arbor_item['fit_screw_model'],
'spanner': cutter_arbor_item['fit_wrench_model'],
})
if 'basic_parameters_cutter_head' in result['cutting_tool_basic_parameters_yesterday_list']:
basic_parameters_cutter_head_list = json.loads(
result['cutting_tool_basic_parameters_all_list']['basic_parameters_cutter_head'])
result['cutting_tool_basic_parameters_yesterday_list']['basic_parameters_cutter_head'])
if basic_parameters_cutter_head_list:
for cutter_head_item in basic_parameters_cutter_head_list:
cutter_head = self.search(
@@ -3083,8 +3097,9 @@ class CuttingToolBasicParameters(models.Model):
'is_cooling_hole': cutter_head_item['is_cooling_hole'],
'locating_slot_code': cutter_head_item['locator_slot_code'],
})
if 'basic_parameters_knife_handle' in result['cutting_tool_basic_parameters_yesterday_list']:
basic_parameters_knife_handle_list = json.loads(
result['cutting_tool_basic_parameters_all_list']['basic_parameters_knife_handle'])
result['cutting_tool_basic_parameters_yesterday_list']['basic_parameters_knife_handle'])
if basic_parameters_knife_handle_list:
for knife_handle_item in basic_parameters_knife_handle_list:
knife_handle = self.search(