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

Accept Merge Request #282: (feature/修复粗心导致的同步bug -> develop)

Browse Source 
Merge Request: 修复同步bug

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/282?initial=true
This commit is contained in:
马广威
2023-07-26 16:53:36 +08:00
parent b1ea52cbe3 7671830648
commit 459a9c3fbb
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_mrs_connect/models/res_config_setting.py
View File

@@ -54,9 +54,9 @@ class ResConfigSettings(models.TransientModel):
_logger.info("同步所有刀具型号...")
self.env['sf.cutting.tool.model'].sync_all_tool_model()
_logger.info("同步所有刀具型号完成")
# _logger.info("同步所有功能刀具列表...")
# self.env['sf.functional.cutting.tool'].sync_all_functional_cutting_tool()
# _logger.info("同步所有功能刀具列表完成")
_logger.info("同步所有功能刀具列表...")
self.env['sf.functional.cutting.tool'].sync_all_functional_cutting_tool()
_logger.info("同步所有功能刀具列表完成")
self.env['sf.fixture.material'].sync_all_fixture_material()
_logger.info("同步夹具物料")
self.env['sf.multi_mounting.type'].sync_all_multi_mounting_type()

8
sf_mrs_connect/models/sync_common.py
View File

@@ -1184,7 +1184,7 @@ class sfSyncFunctional_cutting_tool(models.Model):
"name": item['name'],
"code": item['code'],
# 功能刀具类型
"mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
"mrs_cutting_tool_type_id": self.env['sf.functional.cutting.tool.model'].search(
[('code', '=', item['mrs_cutting_tool_type_id'])]).id,
# # 刀具型号
# "mrs_cutting_tool_model_id": self.env['sf.cutting.tool.model'].search(
@@ -1219,7 +1219,7 @@ class sfSyncFunctional_cutting_tool(models.Model):
"name": item['name'],
"code": item['code'],
# 功能刀具类型
"mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
"mrs_cutting_tool_type_id": self.env['sf.functional.cutting.tool.model'].search(
[('code', '=', item['mrs_cutting_tool_type_id'])]).id,
"mrs_cutting_tool_integral_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_integral_model_ids']),
@@ -1276,7 +1276,7 @@ class sfSyncFunctional_cutting_tool(models.Model):
"name": item['name'],
"code": item['code'],
# 功能刀具类型
"mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
"mrs_cutting_tool_type_id": self.env['sf.functional.cutting.tool.model'].search(
[('code', '=', item['mrs_cutting_tool_type_id'])]).id,
"mrs_cutting_tool_integral_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_integral_model_ids']),
@@ -1308,7 +1308,7 @@ class sfSyncFunctional_cutting_tool(models.Model):
"name": item['name'],
"code": item['code'],
# 功能刀具类型
"mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
"mrs_cutting_tool_type_id": self.env['sf.functional.cutting.tool.model'].search(
[('code', '=', item['mrs_cutting_tool_type_id'])]).id,
"mrs_cutting_tool_integral_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_integral_model_ids']),